mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-08 13:22:53 +02:00
Move av_log() & friends to libavutil
Originally committed as revision 5781 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Abeni
parent
8b75e45d8c
commit
4b45de0e87
@ -660,19 +660,6 @@ typedef struct AVFrame {
|
||||
|
||||
#define DEFAULT_FRAME_RATE_BASE 1001000
|
||||
|
||||
/**
|
||||
* Used by av_log
|
||||
*/
|
||||
typedef struct AVCLASS AVClass;
|
||||
struct AVCLASS {
|
||||
const char* class_name;
|
||||
const char* (*item_name)(void*); /* actually passing a pointer to an AVCodecContext
|
||||
or AVFormatContext, which begin with an AVClass.
|
||||
Needed because av_log is in libavcodec and has no visibility
|
||||
of AVIn/OutputFormat */
|
||||
struct AVOption *option;
|
||||
};
|
||||
|
||||
/**
|
||||
* main external api structure.
|
||||
*/
|
||||
@ -2632,26 +2619,6 @@ int img_crop(AVPicture *dst, const AVPicture *src,
|
||||
int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt,
|
||||
int padtop, int padbottom, int padleft, int padright, int *color);
|
||||
|
||||
/* av_log API */
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#define AV_LOG_QUIET -1
|
||||
#define AV_LOG_ERROR 0
|
||||
#define AV_LOG_INFO 1
|
||||
#define AV_LOG_DEBUG 2
|
||||
|
||||
#ifdef __GNUC__
|
||||
extern void av_log(void*, int level, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4)));
|
||||
#else
|
||||
extern void av_log(void*, int level, const char *fmt, ...);
|
||||
#endif
|
||||
|
||||
extern void av_vlog(void*, int level, const char *fmt, va_list);
|
||||
extern int av_log_get_level(void);
|
||||
extern void av_log_set_level(int);
|
||||
extern void av_log_set_callback(void (*)(void*, int, const char*, va_list));
|
||||
|
||||
/* endian macros */
|
||||
#if !defined(BE_16) || !defined(BE_32) || !defined(LE_16) || !defined(LE_32)
|
||||
#define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
/*
|
||||
* utils for libavcodec
|
||||
* Copyright (c) 2001 Fabrice Bellard.
|
||||
* Copyright (c) 2003 Michel Bardiaux for the av_log API
|
||||
* Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
@ -1339,57 +1338,6 @@ int av_get_bits_per_sample(enum CodecID codec_id){
|
||||
}
|
||||
}
|
||||
|
||||
/* av_log API */
|
||||
|
||||
static int av_log_level = AV_LOG_INFO;
|
||||
|
||||
static void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
|
||||
{
|
||||
static int print_prefix=1;
|
||||
AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
|
||||
if(level>av_log_level)
|
||||
return;
|
||||
#undef fprintf
|
||||
if(print_prefix && avc) {
|
||||
fprintf(stderr, "[%s @ %p]", avc->item_name(ptr), avc);
|
||||
}
|
||||
#define fprintf please_use_av_log
|
||||
|
||||
print_prefix= strstr(fmt, "\n") != NULL;
|
||||
|
||||
vfprintf(stderr, fmt, vl);
|
||||
}
|
||||
|
||||
static void (*av_log_callback)(void*, int, const char*, va_list) = av_log_default_callback;
|
||||
|
||||
void av_log(void* avcl, int level, const char *fmt, ...)
|
||||
{
|
||||
va_list vl;
|
||||
va_start(vl, fmt);
|
||||
av_vlog(avcl, level, fmt, vl);
|
||||
va_end(vl);
|
||||
}
|
||||
|
||||
void av_vlog(void* avcl, int level, const char *fmt, va_list vl)
|
||||
{
|
||||
av_log_callback(avcl, level, fmt, vl);
|
||||
}
|
||||
|
||||
int av_log_get_level(void)
|
||||
{
|
||||
return av_log_level;
|
||||
}
|
||||
|
||||
void av_log_set_level(int level)
|
||||
{
|
||||
av_log_level = level;
|
||||
}
|
||||
|
||||
void av_log_set_callback(void (*callback)(void*, int, const char*, va_list))
|
||||
{
|
||||
av_log_callback = callback;
|
||||
}
|
||||
|
||||
#if !defined(HAVE_THREADS)
|
||||
int avcodec_thread_init(AVCodecContext *s, int thread_count){
|
||||
return -1;
|
||||
|
||||
@ -14,6 +14,7 @@ OBJS= mathematics.o \
|
||||
md5.o \
|
||||
lls.o \
|
||||
adler32.o \
|
||||
log.o
|
||||
|
||||
HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
|
||||
intfloat_readwrite.h md5.h adler32.h
|
||||
|
||||
@ -26,6 +26,7 @@ extern "C" {
|
||||
#include "rational.h"
|
||||
#include "integer.h"
|
||||
#include "intfloat_readwrite.h"
|
||||
#include "log.h"
|
||||
|
||||
/**
|
||||
* Pixel format. Notes:
|
||||
|
||||
74
libavutil/log.c
Normal file
74
libavutil/log.c
Normal file
@ -0,0 +1,74 @@
|
||||
/*
|
||||
* log functions
|
||||
* Copyright (c) 2003 Michel Bardiaux
|
||||
*
|
||||
* This library 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 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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 library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file log.c
|
||||
* log.
|
||||
*/
|
||||
|
||||
#include "avutil.h"
|
||||
|
||||
static int av_log_level = AV_LOG_INFO;
|
||||
|
||||
static void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
|
||||
{
|
||||
static int print_prefix=1;
|
||||
AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
|
||||
if(level>av_log_level)
|
||||
return;
|
||||
#undef fprintf
|
||||
if(print_prefix && avc) {
|
||||
fprintf(stderr, "[%s @ %p]", avc->item_name(ptr), avc);
|
||||
}
|
||||
#define fprintf please_use_av_log
|
||||
|
||||
print_prefix= strstr(fmt, "\n") != NULL;
|
||||
|
||||
vfprintf(stderr, fmt, vl);
|
||||
}
|
||||
|
||||
static void (*av_log_callback)(void*, int, const char*, va_list) = av_log_default_callback;
|
||||
|
||||
void av_log(void* avcl, int level, const char *fmt, ...)
|
||||
{
|
||||
va_list vl;
|
||||
va_start(vl, fmt);
|
||||
av_vlog(avcl, level, fmt, vl);
|
||||
va_end(vl);
|
||||
}
|
||||
|
||||
void av_vlog(void* avcl, int level, const char *fmt, va_list vl)
|
||||
{
|
||||
av_log_callback(avcl, level, fmt, vl);
|
||||
}
|
||||
|
||||
int av_log_get_level(void)
|
||||
{
|
||||
return av_log_level;
|
||||
}
|
||||
|
||||
void av_log_set_level(int level)
|
||||
{
|
||||
av_log_level = level;
|
||||
}
|
||||
|
||||
void av_log_set_callback(void (*callback)(void*, int, const char*, va_list))
|
||||
{
|
||||
av_log_callback = callback;
|
||||
}
|
||||
37
libavutil/log.h
Normal file
37
libavutil/log.h
Normal file
@ -0,0 +1,37 @@
|
||||
#ifndef LOG_H
|
||||
#define LOG_H
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
/**
|
||||
* Used by av_log
|
||||
*/
|
||||
typedef struct AVCLASS AVClass;
|
||||
struct AVCLASS {
|
||||
const char* class_name;
|
||||
const char* (*item_name)(void*); /* actually passing a pointer to an AVCodecContext
|
||||
or AVFormatContext, which begin with an AVClass.
|
||||
Needed because av_log is in libavcodec and has no visibility
|
||||
of AVIn/OutputFormat */
|
||||
struct AVOption *option;
|
||||
};
|
||||
|
||||
/* av_log API */
|
||||
|
||||
#define AV_LOG_QUIET -1
|
||||
#define AV_LOG_ERROR 0
|
||||
#define AV_LOG_INFO 1
|
||||
#define AV_LOG_DEBUG 2
|
||||
|
||||
#ifdef __GNUC__
|
||||
extern void av_log(void*, int level, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4)));
|
||||
#else
|
||||
extern void av_log(void*, int level, const char *fmt, ...);
|
||||
#endif
|
||||
|
||||
extern void av_vlog(void*, int level, const char *fmt, va_list);
|
||||
extern int av_log_get_level(void);
|
||||
extern void av_log_set_level(int);
|
||||
extern void av_log_set_callback(void (*)(void*, int, const char*, va_list));
|
||||
|
||||
#endif /* LOG_H */
|
||||
Loading…
Reference in New Issue
Block a user