Split common.h in two parts, purely internal stuff (internal.h) and things
available to external programs as well. Also make more things available to external programs like GET_UTF8, MKTAG etc. Originally committed as revision 5765 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger
parent
7a5f09f66e
commit
05020c89eb
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* @file common.h
|
||||
* common internal api header.
|
||||
* common internal and external api header.
|
||||
*/
|
||||
|
||||
#ifndef COMMON_H
|
||||
|
|
@ -10,10 +10,6 @@
|
|||
#define M_PI 3.14159265358979323846
|
||||
#endif
|
||||
|
||||
#if ( defined(__PIC__) || defined(__pic__) ) && ! defined(PIC)
|
||||
# define PIC
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_AV_CONFIG_H
|
||||
/* only include the following when compiling package */
|
||||
# include "config.h"
|
||||
|
|
@ -29,31 +25,6 @@
|
|||
# include "berrno.h"
|
||||
# endif
|
||||
# include <math.h>
|
||||
|
||||
# ifndef ENODATA
|
||||
# define ENODATA 61
|
||||
# endif
|
||||
|
||||
#include <stddef.h>
|
||||
#ifndef offsetof
|
||||
# define offsetof(T,F) ((unsigned int)((char *)&((T *)0)->F))
|
||||
#endif
|
||||
|
||||
#define AVOPTION_CODEC_BOOL(name, help, field) \
|
||||
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_BOOL }
|
||||
#define AVOPTION_CODEC_DOUBLE(name, help, field, minv, maxv, defval) \
|
||||
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_DOUBLE, minv, maxv, defval }
|
||||
#define AVOPTION_CODEC_FLAG(name, help, field, flag, defval) \
|
||||
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_FLAG, flag, 0, defval }
|
||||
#define AVOPTION_CODEC_INT(name, help, field, minv, maxv, defval) \
|
||||
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_INT, minv, maxv, defval }
|
||||
#define AVOPTION_CODEC_STRING(name, help, field, str, val) \
|
||||
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_STRING, .defval = val, .defstr = str }
|
||||
#define AVOPTION_CODEC_RCOVERRIDE(name, help, field) \
|
||||
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_RCOVERRIDE, .defval = 0, .defstr = NULL }
|
||||
#define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
|
||||
#define AVOPTION_END() AVOPTION_SUB(NULL)
|
||||
|
||||
#endif /* HAVE_AV_CONFIG_H */
|
||||
|
||||
/* Suppress restrict if it was not defined in config.h. */
|
||||
|
|
@ -177,32 +148,6 @@ typedef uint64_t uint_fast64_t;
|
|||
#define uint64_t_C(c) (c ## ULL)
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_AV_CONFIG_H
|
||||
|
||||
#ifdef __MINGW32__
|
||||
# ifdef _DEBUG
|
||||
# define DEBUG
|
||||
# endif
|
||||
|
||||
# define snprintf _snprintf
|
||||
# define vsnprintf _vsnprintf
|
||||
|
||||
# ifdef CONFIG_WINCE
|
||||
# define perror(a)
|
||||
# endif
|
||||
|
||||
/* __MINGW32__ end */
|
||||
#elif defined (CONFIG_OS2)
|
||||
/* OS/2 EMX */
|
||||
|
||||
#include <float.h>
|
||||
|
||||
#endif /* !__MINGW32__ && CONFIG_OS2 */
|
||||
|
||||
# ifdef USE_FASTMEMCPY
|
||||
# include "fastmemcpy.h"
|
||||
# endif
|
||||
|
||||
#if defined(__MINGW32__) && !defined(BUILD_AVUTIL) && defined(BUILD_SHARED_AV)
|
||||
# define FF_IMPORT_ATTR __declspec(dllimport)
|
||||
#else
|
||||
|
|
@ -212,43 +157,10 @@ typedef uint64_t uint_fast64_t;
|
|||
|
||||
# include "bswap.h"
|
||||
|
||||
// Use rip-relative addressing if compiling PIC code on x86-64.
|
||||
# if defined(__MINGW32__) || defined(__CYGWIN__) || \
|
||||
defined(__OS2__) || (defined (__OpenBSD__) && !defined(__ELF__))
|
||||
# if defined(ARCH_X86_64) && defined(PIC)
|
||||
# define MANGLE(a) "_" #a"(%%rip)"
|
||||
# else
|
||||
# define MANGLE(a) "_" #a
|
||||
# endif
|
||||
# else
|
||||
# if defined(ARCH_X86_64) && defined(PIC)
|
||||
# define MANGLE(a) #a"(%%rip)"
|
||||
# elif defined(CONFIG_DARWIN)
|
||||
# define MANGLE(a) "_" #a
|
||||
# else
|
||||
# define MANGLE(a) #a
|
||||
# endif
|
||||
# endif
|
||||
|
||||
/* debug stuff */
|
||||
|
||||
# if !defined(DEBUG) && !defined(NDEBUG)
|
||||
# define NDEBUG
|
||||
# endif
|
||||
# include <assert.h>
|
||||
|
||||
/* dprintf macros */
|
||||
# ifdef DEBUG
|
||||
# define dprintf(fmt,...) av_log(NULL, AV_LOG_DEBUG, fmt, __VA_ARGS__)
|
||||
# else
|
||||
# define dprintf(fmt,...)
|
||||
# endif
|
||||
|
||||
# ifdef CONFIG_WINCE
|
||||
# define abort()
|
||||
# endif
|
||||
|
||||
# define av_abort() do { av_log(NULL, AV_LOG_ERROR, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0)
|
||||
#ifdef HAVE_AV_CONFIG_H
|
||||
/* only include the following when compiling package */
|
||||
# include "internal.h"
|
||||
#endif
|
||||
|
||||
//rounded divison & shift
|
||||
#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
|
||||
|
|
@ -259,25 +171,6 @@ typedef uint64_t uint_fast64_t;
|
|||
#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
|
||||
#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
|
||||
|
||||
extern const uint32_t inverse[256];
|
||||
|
||||
#if defined(ARCH_X86) || defined(ARCH_X86_64)
|
||||
# define FASTDIV(a,b) \
|
||||
({\
|
||||
int ret,dmy;\
|
||||
asm volatile(\
|
||||
"mull %3"\
|
||||
:"=d"(ret),"=a"(dmy)\
|
||||
:"1"(a),"g"(inverse[b])\
|
||||
);\
|
||||
ret;\
|
||||
})
|
||||
#elif defined(CONFIG_FASTDIV)
|
||||
# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a)*inverse[b])>>32))
|
||||
#else
|
||||
# define FASTDIV(a,b) ((a)/(b))
|
||||
#endif
|
||||
|
||||
/* misc math functions */
|
||||
extern FF_IMPORT_ATTR const uint8_t ff_log2_tab[256];
|
||||
|
||||
|
|
@ -366,33 +259,15 @@ static inline uint8_t clip_uint8(int a)
|
|||
}
|
||||
|
||||
/* math */
|
||||
extern FF_IMPORT_ATTR const uint8_t ff_sqrt_tab[128];
|
||||
|
||||
int64_t ff_gcd(int64_t a, int64_t b);
|
||||
|
||||
static inline int ff_sqrt(int a)
|
||||
{
|
||||
int ret=0;
|
||||
int s;
|
||||
int ret_sq=0;
|
||||
|
||||
if(a<128) return ff_sqrt_tab[a];
|
||||
|
||||
for(s=15; s>=0; s--){
|
||||
int b= ret_sq + (1<<(s*2)) + (ret<<s)*2;
|
||||
if(b<=a){
|
||||
ret_sq=b;
|
||||
ret+= 1<<s;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* converts fourcc string to int
|
||||
*/
|
||||
static inline int ff_get_fourcc(const char *s){
|
||||
#ifdef HAVE_AV_CONFIG_H
|
||||
assert( strlen(s)==4 );
|
||||
#endif
|
||||
|
||||
return (s[0]) + (s[1]<<8) + (s[2]<<16) + (s[3]<<24);
|
||||
}
|
||||
|
|
@ -401,20 +276,6 @@ static inline int ff_get_fourcc(const char *s){
|
|||
#define MKBETAG(a,b,c,d) (d | (c << 8) | (b << 16) | (a << 24))
|
||||
|
||||
|
||||
#if defined(ARCH_X86) || defined(ARCH_X86_64)
|
||||
#define MASK_ABS(mask, level)\
|
||||
asm volatile(\
|
||||
"cdq \n\t"\
|
||||
"xorl %1, %0 \n\t"\
|
||||
"subl %1, %0 \n\t"\
|
||||
: "+a" (level), "=&d" (mask)\
|
||||
);
|
||||
#else
|
||||
#define MASK_ABS(mask, level)\
|
||||
mask= level>>31;\
|
||||
level= (level^mask)-mask;
|
||||
#endif
|
||||
|
||||
#define GET_UTF8(val, GET_BYTE, ERROR)\
|
||||
val= GET_BYTE;\
|
||||
{\
|
||||
|
|
@ -430,25 +291,6 @@ static inline int ff_get_fourcc(const char *s){
|
|||
}\
|
||||
}
|
||||
|
||||
#if __CPU__ >= 686 && !defined(RUNTIME_CPUDETECT)
|
||||
#define COPY3_IF_LT(x,y,a,b,c,d)\
|
||||
asm volatile (\
|
||||
"cmpl %0, %3 \n\t"\
|
||||
"cmovl %3, %0 \n\t"\
|
||||
"cmovl %4, %1 \n\t"\
|
||||
"cmovl %5, %2 \n\t"\
|
||||
: "+r" (x), "+r" (a), "+r" (c)\
|
||||
: "r" (y), "r" (b), "r" (d)\
|
||||
);
|
||||
#else
|
||||
#define COPY3_IF_LT(x,y,a,b,c,d)\
|
||||
if((y)<(x)){\
|
||||
(x)=(y);\
|
||||
(a)=(b);\
|
||||
(c)=(d);\
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(ARCH_X86) || defined(ARCH_X86_64) || defined(ARCH_POWERPC)
|
||||
#if defined(ARCH_X86_64)
|
||||
static inline uint64_t read_time(void)
|
||||
|
|
@ -513,53 +355,4 @@ tend= read_time();\
|
|||
#define STOP_TIMER(id) {}
|
||||
#endif
|
||||
|
||||
/* avoid usage of various functions */
|
||||
#define malloc please_use_av_malloc
|
||||
#define free please_use_av_free
|
||||
#define realloc please_use_av_realloc
|
||||
#define time time_is_forbidden_due_to_security_issues
|
||||
#define rand rand_is_forbidden_due_to_state_trashing
|
||||
#define srand srand_is_forbidden_due_to_state_trashing
|
||||
#define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf
|
||||
#define strcat strcat_is_forbidden_due_to_security_issues_use_pstrcat
|
||||
#if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H))
|
||||
#define printf please_use_av_log
|
||||
#define fprintf please_use_av_log
|
||||
#endif
|
||||
|
||||
#define CHECKED_ALLOCZ(p, size)\
|
||||
{\
|
||||
p= av_mallocz(size);\
|
||||
if(p==NULL && (size)!=0){\
|
||||
perror("malloc");\
|
||||
goto fail;\
|
||||
}\
|
||||
}
|
||||
|
||||
#ifndef HAVE_LRINTF
|
||||
/* XXX: add ISOC specific test to avoid specific BSD testing. */
|
||||
/* better than nothing implementation. */
|
||||
/* btw, rintf() is existing on fbsd too -- alex */
|
||||
static always_inline long int lrintf(float x)
|
||||
{
|
||||
#ifdef __MINGW32__
|
||||
# ifdef ARCH_X86
|
||||
int32_t i;
|
||||
asm volatile(
|
||||
"fistpl %0\n\t"
|
||||
: "=m" (i) : "t" (x) : "st"
|
||||
);
|
||||
return i;
|
||||
# else
|
||||
/* XXX: incorrect, but make it compile */
|
||||
return (int)(x + (x < 0 ? -0.5 : 0.5));
|
||||
# endif /* ARCH_X86 */
|
||||
#else
|
||||
return (int)(rint(x));
|
||||
#endif /* __MINGW32__ */
|
||||
}
|
||||
#endif /* HAVE_LRINTF */
|
||||
|
||||
#endif /* HAVE_AV_CONFIG_H */
|
||||
|
||||
#endif /* COMMON_H */
|
||||
|
|
|
|||
219
libavutil/internal.h
Normal file
219
libavutil/internal.h
Normal file
|
|
@ -0,0 +1,219 @@
|
|||
/**
|
||||
* @file internal.h
|
||||
* common internal api header.
|
||||
*/
|
||||
|
||||
#ifndef INTERNAL_H
|
||||
#define INTERNAL_H
|
||||
|
||||
#if ( defined(__PIC__) || defined(__pic__) ) && ! defined(PIC)
|
||||
# define PIC
|
||||
#endif
|
||||
|
||||
# ifndef ENODATA
|
||||
# define ENODATA 61
|
||||
# endif
|
||||
|
||||
#include <stddef.h>
|
||||
#ifndef offsetof
|
||||
# define offsetof(T,F) ((unsigned int)((char *)&((T *)0)->F))
|
||||
#endif
|
||||
|
||||
#define AVOPTION_CODEC_BOOL(name, help, field) \
|
||||
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_BOOL }
|
||||
#define AVOPTION_CODEC_DOUBLE(name, help, field, minv, maxv, defval) \
|
||||
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_DOUBLE, minv, maxv, defval }
|
||||
#define AVOPTION_CODEC_FLAG(name, help, field, flag, defval) \
|
||||
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_FLAG, flag, 0, defval }
|
||||
#define AVOPTION_CODEC_INT(name, help, field, minv, maxv, defval) \
|
||||
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_INT, minv, maxv, defval }
|
||||
#define AVOPTION_CODEC_STRING(name, help, field, str, val) \
|
||||
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_STRING, .defval = val, .defstr = str }
|
||||
#define AVOPTION_CODEC_RCOVERRIDE(name, help, field) \
|
||||
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_RCOVERRIDE, .defval = 0, .defstr = NULL }
|
||||
#define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
|
||||
#define AVOPTION_END() AVOPTION_SUB(NULL)
|
||||
|
||||
#ifdef __MINGW32__
|
||||
# ifdef _DEBUG
|
||||
# define DEBUG
|
||||
# endif
|
||||
|
||||
# define snprintf _snprintf
|
||||
# define vsnprintf _vsnprintf
|
||||
|
||||
# ifdef CONFIG_WINCE
|
||||
# define perror(a)
|
||||
# endif
|
||||
|
||||
/* __MINGW32__ end */
|
||||
#elif defined (CONFIG_OS2)
|
||||
/* OS/2 EMX */
|
||||
|
||||
#include <float.h>
|
||||
|
||||
#endif /* !__MINGW32__ && CONFIG_OS2 */
|
||||
|
||||
# ifdef USE_FASTMEMCPY
|
||||
# include "fastmemcpy.h"
|
||||
# endif
|
||||
|
||||
// Use rip-relative addressing if compiling PIC code on x86-64.
|
||||
# if defined(__MINGW32__) || defined(__CYGWIN__) || \
|
||||
defined(__OS2__) || (defined (__OpenBSD__) && !defined(__ELF__))
|
||||
# if defined(ARCH_X86_64) && defined(PIC)
|
||||
# define MANGLE(a) "_" #a"(%%rip)"
|
||||
# else
|
||||
# define MANGLE(a) "_" #a
|
||||
# endif
|
||||
# else
|
||||
# if defined(ARCH_X86_64) && defined(PIC)
|
||||
# define MANGLE(a) #a"(%%rip)"
|
||||
# elif defined(CONFIG_DARWIN)
|
||||
# define MANGLE(a) "_" #a
|
||||
# else
|
||||
# define MANGLE(a) #a
|
||||
# endif
|
||||
# endif
|
||||
|
||||
/* debug stuff */
|
||||
|
||||
# if !defined(DEBUG) && !defined(NDEBUG)
|
||||
# define NDEBUG
|
||||
# endif
|
||||
# include <assert.h>
|
||||
|
||||
/* dprintf macros */
|
||||
# ifdef DEBUG
|
||||
# define dprintf(fmt,...) av_log(NULL, AV_LOG_DEBUG, fmt, __VA_ARGS__)
|
||||
# else
|
||||
# define dprintf(fmt,...)
|
||||
# endif
|
||||
|
||||
# ifdef CONFIG_WINCE
|
||||
# define abort()
|
||||
# endif
|
||||
|
||||
# define av_abort() do { av_log(NULL, AV_LOG_ERROR, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0)
|
||||
|
||||
extern const uint32_t inverse[256];
|
||||
|
||||
#if defined(ARCH_X86) || defined(ARCH_X86_64)
|
||||
# define FASTDIV(a,b) \
|
||||
({\
|
||||
int ret,dmy;\
|
||||
asm volatile(\
|
||||
"mull %3"\
|
||||
:"=d"(ret),"=a"(dmy)\
|
||||
:"1"(a),"g"(inverse[b])\
|
||||
);\
|
||||
ret;\
|
||||
})
|
||||
#elif defined(CONFIG_FASTDIV)
|
||||
# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a)*inverse[b])>>32))
|
||||
#else
|
||||
# define FASTDIV(a,b) ((a)/(b))
|
||||
#endif
|
||||
|
||||
/* math */
|
||||
extern FF_IMPORT_ATTR const uint8_t ff_sqrt_tab[128];
|
||||
|
||||
static inline int ff_sqrt(int a)
|
||||
{
|
||||
int ret=0;
|
||||
int s;
|
||||
int ret_sq=0;
|
||||
|
||||
if(a<128) return ff_sqrt_tab[a];
|
||||
|
||||
for(s=15; s>=0; s--){
|
||||
int b= ret_sq + (1<<(s*2)) + (ret<<s)*2;
|
||||
if(b<=a){
|
||||
ret_sq=b;
|
||||
ret+= 1<<s;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
#if defined(ARCH_X86) || defined(ARCH_X86_64)
|
||||
#define MASK_ABS(mask, level)\
|
||||
asm volatile(\
|
||||
"cdq \n\t"\
|
||||
"xorl %1, %0 \n\t"\
|
||||
"subl %1, %0 \n\t"\
|
||||
: "+a" (level), "=&d" (mask)\
|
||||
);
|
||||
#else
|
||||
#define MASK_ABS(mask, level)\
|
||||
mask= level>>31;\
|
||||
level= (level^mask)-mask;
|
||||
#endif
|
||||
|
||||
#if __CPU__ >= 686 && !defined(RUNTIME_CPUDETECT)
|
||||
#define COPY3_IF_LT(x,y,a,b,c,d)\
|
||||
asm volatile (\
|
||||
"cmpl %0, %3 \n\t"\
|
||||
"cmovl %3, %0 \n\t"\
|
||||
"cmovl %4, %1 \n\t"\
|
||||
"cmovl %5, %2 \n\t"\
|
||||
: "+r" (x), "+r" (a), "+r" (c)\
|
||||
: "r" (y), "r" (b), "r" (d)\
|
||||
);
|
||||
#else
|
||||
#define COPY3_IF_LT(x,y,a,b,c,d)\
|
||||
if((y)<(x)){\
|
||||
(x)=(y);\
|
||||
(a)=(b);\
|
||||
(c)=(d);\
|
||||
}
|
||||
#endif
|
||||
|
||||
/* avoid usage of various functions */
|
||||
#define malloc please_use_av_malloc
|
||||
#define free please_use_av_free
|
||||
#define realloc please_use_av_realloc
|
||||
#define time time_is_forbidden_due_to_security_issues
|
||||
#define rand rand_is_forbidden_due_to_state_trashing
|
||||
#define srand srand_is_forbidden_due_to_state_trashing
|
||||
#define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf
|
||||
#define strcat strcat_is_forbidden_due_to_security_issues_use_pstrcat
|
||||
#if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H))
|
||||
#define printf please_use_av_log
|
||||
#define fprintf please_use_av_log
|
||||
#endif
|
||||
|
||||
#define CHECKED_ALLOCZ(p, size)\
|
||||
{\
|
||||
p= av_mallocz(size);\
|
||||
if(p==NULL && (size)!=0){\
|
||||
perror("malloc");\
|
||||
goto fail;\
|
||||
}\
|
||||
}
|
||||
|
||||
#ifndef HAVE_LRINTF
|
||||
/* XXX: add ISOC specific test to avoid specific BSD testing. */
|
||||
/* better than nothing implementation. */
|
||||
/* btw, rintf() is existing on fbsd too -- alex */
|
||||
static always_inline long int lrintf(float x)
|
||||
{
|
||||
#ifdef __MINGW32__
|
||||
# ifdef ARCH_X86
|
||||
int32_t i;
|
||||
asm volatile(
|
||||
"fistpl %0\n\t"
|
||||
: "=m" (i) : "t" (x) : "st"
|
||||
);
|
||||
return i;
|
||||
# else
|
||||
/* XXX: incorrect, but make it compile */
|
||||
return (int)(x + (x < 0 ? -0.5 : 0.5));
|
||||
# endif /* ARCH_X86 */
|
||||
#else
|
||||
return (int)(rint(x));
|
||||
#endif /* __MINGW32__ */
|
||||
}
|
||||
#endif /* HAVE_LRINTF */
|
||||
|
||||
#endif /* INTERNAL_H */
|
||||
Loading…
Reference in New Issue
Block a user