Revision f1b94134a4b879bc55c3dacdb496690c8ebdc03f authored by Vikram Fugro on 11 March 2016, 12:16:11 UTC, committed by Jean-Baptiste Kempf on 11 March 2016, 14:57:34 UTC
Allocate the output vlc pictures with dimensions padded, as requested by the decoder (for alignments). This further increases the chances of direct rendering. Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
1 parent 6c813cb
console.c
/*****************************************************************************
* console.c: console logger
*****************************************************************************
* Copyright © 1998-2005 VLC authors and VideoLAN
* Copyright © 2006-2015 Rémi Denis-Courmont
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdarg.h>
#include <stdio.h>
#include <inttypes.h>
#include <unistd.h> /* isatty(), STDERR_FILNO */
#include <vlc_common.h>
#include <vlc_plugin.h>
static const int ptr_width = 2 * /* hex digits */ sizeof (uintptr_t);
static const char msg_type[4][9] = { "", " error", " warning", " debug" };
#ifndef _WIN32
# define COL(x,y) "\033[" #x ";" #y "m"
# define RED COL(31,1)
# define GREEN COL(32,1)
# define YELLOW COL(0,33)
# define WHITE COL(0,1)
# define GRAY "\033[0m"
static const char msg_color[4][8] = { WHITE, RED, YELLOW, GRAY };
static void LogConsoleColor(void *opaque, int type, const vlc_log_t *meta,
const char *format, va_list ap)
{
FILE *stream = stderr;
int verbose = (intptr_t)opaque;
if (verbose < type)
return;
flockfile(stream);
fprintf(stream, "["GREEN"%0*"PRIxPTR GRAY"] ", ptr_width,
meta->i_object_id);
if (meta->psz_header != NULL)
fprintf(stream, "[%s] ", meta->psz_header);
fprintf(stream, "%s %s%s: %s", meta->psz_module, meta->psz_object_type,
msg_type[type], msg_color[type]);
vfprintf(stream, format, ap);
fputs(GRAY"\n", stream);
funlockfile(stream);
}
#endif /* !_WIN32 */
static void LogConsoleGray(void *opaque, int type, const vlc_log_t *meta,
const char *format, va_list ap)
{
FILE *stream = stderr;
int verbose = (intptr_t)opaque;
if (verbose < type)
return;
flockfile(stream);
fprintf(stream, "[%0*"PRIxPTR"] ", ptr_width, meta->i_object_id);
if (meta->psz_header != NULL)
fprintf(stream, "[%s] ", meta->psz_header);
fprintf(stream, "%s %s%s: ", meta->psz_module, meta->psz_object_type,
msg_type[type]);
vfprintf(stream, format, ap);
putc_unlocked('\n', stream);
funlockfile(stream);
}
static vlc_log_cb Open(vlc_object_t *obj, void **sysp)
{
int verbosity = -1;
if (!var_InheritBool(obj, "quiet"))
{
const char *str = getenv("VLC_VERBOSE");
if (str != NULL)
verbosity = atoi(str);
else
verbosity = var_InheritInteger(obj, "verbose");
}
if (verbosity < 0)
return NULL;
verbosity += VLC_MSG_ERR;
*sysp = (void *)(uintptr_t)verbosity;
#if defined (HAVE_ISATTY) && !defined (_WIN32)
if (isatty(STDERR_FILENO) && var_InheritBool(obj, "color"))
return LogConsoleColor;
#endif
return LogConsoleGray;
}
#define QUIET_TEXT N_("Be quiet")
#define QUIET_LONGTEXT N_("Turn off all messages on the console.")
vlc_module_begin()
set_shortname(N_("Console log"))
set_description(N_("Console logger"))
set_category(CAT_ADVANCED)
set_subcategory(SUBCAT_ADVANCED_MISC)
set_capability("logger", 10)
set_callbacks(Open, NULL)
add_bool("quiet", false, QUIET_TEXT, QUIET_LONGTEXT, false)
change_short('q')
change_volatile()
vlc_module_end ()
Computing file changes ...