Mercurial > libavcodec.hg
annotate utils.c @ 1900:5cde80c5d929 libavcodec
static allocation rewrite (old code was plain a broken mess)
doesnt call realloc every time
doesnt randomly overwrite memory after after 8-16 calls
doesnt use ugly macro wraper
fewer lines of code
| author | michael |
|---|---|
| date | Sun, 21 Mar 2004 21:58:14 +0000 |
| parents | ea2a4058441c |
| children | bc5039adb9af |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 * utils for libavcodec | |
| 429 | 3 * Copyright (c) 2001 Fabrice Bellard. |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
4 * Copyright (c) 2003 Michel Bardiaux for the av_log API |
|
1739
07a484280a82
copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
michael
parents:
1730
diff
changeset
|
5 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> |
| 0 | 6 * |
| 429 | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Lesser General Public | |
| 9 * License as published by the Free Software Foundation; either | |
| 10 * version 2 of the License, or (at your option) any later version. | |
| 0 | 11 * |
| 429 | 12 * This library is distributed in the hope that it will be useful, |
| 0 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 429 | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 * Lesser General Public License for more details. | |
| 0 | 16 * |
| 429 | 17 * You should have received a copy of the GNU Lesser General Public |
| 18 * License along with this library; if not, write to the Free Software | |
| 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 0 | 20 */ |
| 1106 | 21 |
| 22 /** | |
| 23 * @file utils.c | |
| 24 * utils. | |
| 25 */ | |
| 26 | |
| 394 | 27 #include "avcodec.h" |
| 0 | 28 #include "dsputil.h" |
| 341 | 29 #include "mpegvideo.h" |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
30 #include <stdarg.h> |
| 0 | 31 |
| 862 | 32 void *av_mallocz(unsigned int size) |
| 394 | 33 { |
| 34 void *ptr; | |
| 908 | 35 |
| 394 | 36 ptr = av_malloc(size); |
| 37 if (!ptr) | |
| 38 return NULL; | |
| 39 memset(ptr, 0, size); | |
| 40 return ptr; | |
| 41 } | |
| 42 | |
|
1031
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
43 char *av_strdup(const char *s) |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
44 { |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
45 char *ptr; |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
46 int len; |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
47 len = strlen(s) + 1; |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
48 ptr = av_malloc(len); |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
49 if (!ptr) |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
50 return NULL; |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
51 memcpy(ptr, s, len); |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
52 return ptr; |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
53 } |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
54 |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
55 /** |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
56 * realloc which does nothing if the block is large enough |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
57 */ |
| 1057 | 58 void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size) |
|
1031
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
59 { |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
60 if(min_size < *size) |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
61 return ptr; |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
62 |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
63 *size= min_size + 10*1024; |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
64 |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
65 return av_realloc(ptr, *size); |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
66 } |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
67 |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
68 |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
69 static unsigned int last_static = 0; |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
70 static unsigned int allocated_static = 0; |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
71 static void** array_static = NULL; |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
72 static const unsigned int grow_static = 64; // ^2 |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
73 |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
74 /** |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
75 * allocation of static arrays - do not use for normal allocation. |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
76 */ |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
77 void *av_mallocz_static(unsigned int size) |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
78 { |
|
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
79 void *ptr = av_mallocz(size); |
|
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
80 |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
81 if(ptr){ |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
82 array_static =av_fast_realloc(array_static, &allocated_static, last_static+1); |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
83 array_static[last_static++] = ptr; |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
84 } |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
85 |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
86 return ptr; |
|
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
87 } |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
88 |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
89 /** |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
90 * free all static arrays and reset pointers to 0. |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
91 */ |
| 1282 | 92 void av_free_static(void) |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
93 { |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
94 while(last_static){ |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
95 av_freep(&array_static[--last_static]); |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
96 } |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
97 av_freep(&array_static); |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
98 } |
|
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
99 |
| 1854 | 100 /** |
| 101 * Frees memory and sets the pointer to NULL. | |
| 102 * @param arg pointer to the pointer which should be freed | |
| 103 */ | |
| 104 void av_freep(void *arg) | |
| 400 | 105 { |
| 1854 | 106 void **ptr= (void**)arg; |
| 400 | 107 av_free(*ptr); |
| 108 *ptr = NULL; | |
| 109 } | |
| 110 | |
| 0 | 111 /* encoder management */ |
| 112 AVCodec *first_avcodec; | |
| 113 | |
| 114 void register_avcodec(AVCodec *format) | |
| 115 { | |
| 116 AVCodec **p; | |
| 117 p = &first_avcodec; | |
| 118 while (*p != NULL) p = &(*p)->next; | |
| 119 *p = format; | |
| 120 format->next = NULL; | |
| 121 } | |
| 122 | |
| 1214 | 123 typedef struct InternalBuffer{ |
| 903 | 124 int last_pic_num; |
| 1214 | 125 uint8_t *base[4]; |
| 903 | 126 uint8_t *data[4]; |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
127 int linesize[4]; |
| 1214 | 128 }InternalBuffer; |
| 129 | |
| 130 #define INTERNAL_BUFFER_SIZE 32 | |
| 903 | 131 |
| 1538 | 132 #define ALIGN(x, a) (((x)+(a)-1)&~((a)-1)) |
| 133 | |
| 134 void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){ | |
| 135 int w_align= 1; | |
| 136 int h_align= 1; | |
| 137 | |
| 138 switch(s->pix_fmt){ | |
| 139 case PIX_FMT_YUV420P: | |
| 140 case PIX_FMT_YUV422: | |
| 141 case PIX_FMT_YUV422P: | |
| 142 case PIX_FMT_YUV444P: | |
| 143 case PIX_FMT_GRAY8: | |
| 144 case PIX_FMT_YUVJ420P: | |
| 145 case PIX_FMT_YUVJ422P: | |
| 146 case PIX_FMT_YUVJ444P: | |
| 147 w_align= 16; //FIXME check for non mpeg style codecs and use less alignment | |
| 148 h_align= 16; | |
| 149 break; | |
| 150 case PIX_FMT_YUV411P: | |
| 151 w_align=32; | |
| 152 h_align=8; | |
| 153 break; | |
| 154 case PIX_FMT_YUV410P: | |
| 155 if(s->codec_id == CODEC_ID_SVQ1){ | |
| 156 w_align=64; | |
| 157 h_align=64; | |
| 158 } | |
| 159 break; | |
| 160 default: | |
| 161 w_align= 1; | |
| 162 h_align= 1; | |
| 163 break; | |
| 164 } | |
| 165 | |
| 166 *width = ALIGN(*width , w_align); | |
| 167 *height= ALIGN(*height, h_align); | |
| 168 } | |
| 169 | |
| 925 | 170 int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){ |
| 903 | 171 int i; |
| 1538 | 172 int w= s->width; |
| 173 int h= s->height; | |
| 1214 | 174 InternalBuffer *buf; |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
175 int *picture_number; |
| 924 | 176 |
| 177 assert(pic->data[0]==NULL); | |
| 1214 | 178 assert(INTERNAL_BUFFER_SIZE > s->internal_buffer_count); |
| 903 | 179 |
| 1214 | 180 if(s->internal_buffer==NULL){ |
| 181 s->internal_buffer= av_mallocz(INTERNAL_BUFFER_SIZE*sizeof(InternalBuffer)); | |
| 182 } | |
| 183 #if 0 | |
| 184 s->internal_buffer= av_fast_realloc( | |
| 185 s->internal_buffer, | |
| 186 &s->internal_buffer_size, | |
| 187 sizeof(InternalBuffer)*FFMAX(99, s->internal_buffer_count+1)/*FIXME*/ | |
| 188 ); | |
| 189 #endif | |
| 190 | |
| 191 buf= &((InternalBuffer*)s->internal_buffer)[s->internal_buffer_count]; | |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
192 picture_number= &(((InternalBuffer*)s->internal_buffer)[INTERNAL_BUFFER_SIZE-1]).last_pic_num; //FIXME ugly hack |
|
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
193 (*picture_number)++; |
|
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
194 |
| 1214 | 195 if(buf->base[0]){ |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
196 pic->age= *picture_number - buf->last_pic_num; |
|
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
197 buf->last_pic_num= *picture_number; |
| 903 | 198 }else{ |
| 1538 | 199 int h_chroma_shift, v_chroma_shift; |
| 200 int s_align, pixel_size; | |
| 903 | 201 |
| 202 avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift); | |
| 1538 | 203 |
| 903 | 204 switch(s->pix_fmt){ |
| 1291 | 205 case PIX_FMT_RGB555: |
| 206 case PIX_FMT_RGB565: | |
| 903 | 207 case PIX_FMT_YUV422: |
| 208 pixel_size=2; | |
| 209 break; | |
| 210 case PIX_FMT_RGB24: | |
| 211 case PIX_FMT_BGR24: | |
| 212 pixel_size=3; | |
| 213 break; | |
| 214 case PIX_FMT_RGBA32: | |
| 215 pixel_size=4; | |
| 216 break; | |
| 217 default: | |
| 218 pixel_size=1; | |
| 219 } | |
| 1538 | 220 |
| 221 avcodec_align_dimensions(s, &w, &h); | |
| 222 #if defined(ARCH_POWERPC) || defined(HAVE_MMI) //FIXME some cleaner check | |
| 223 s_align= 16; | |
| 224 #else | |
| 225 s_align= 8; | |
| 226 #endif | |
| 227 | |
| 903 | 228 if(!(s->flags&CODEC_FLAG_EMU_EDGE)){ |
| 229 w+= EDGE_WIDTH*2; | |
| 230 h+= EDGE_WIDTH*2; | |
| 231 } | |
| 232 | |
| 1214 | 233 buf->last_pic_num= -256*256*256*64; |
| 903 | 234 |
| 235 for(i=0; i<3; i++){ | |
| 1165 | 236 const int h_shift= i==0 ? 0 : h_chroma_shift; |
| 237 const int v_shift= i==0 ? 0 : v_chroma_shift; | |
| 903 | 238 |
|
1798
a3da4b429984
ppc chroma mess workaround (real bug is that the motion compensation code assumes that 2*uvlinesize == linesize and fixing this would mean a slowdown)
michael
parents:
1776
diff
changeset
|
239 //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it |
|
a3da4b429984
ppc chroma mess workaround (real bug is that the motion compensation code assumes that 2*uvlinesize == linesize and fixing this would mean a slowdown)
michael
parents:
1776
diff
changeset
|
240 buf->linesize[i]= ALIGN(pixel_size*w>>h_shift, s_align<<(h_chroma_shift-h_shift)); |
| 903 | 241 |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
242 buf->base[i]= av_mallocz((buf->linesize[i]*h>>v_shift)+16); //FIXME 16 |
| 1214 | 243 if(buf->base[i]==NULL) return -1; |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
244 memset(buf->base[i], 128, buf->linesize[i]*h>>v_shift); |
| 903 | 245 |
| 246 if(s->flags&CODEC_FLAG_EMU_EDGE) | |
| 1214 | 247 buf->data[i] = buf->base[i]; |
| 903 | 248 else |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
249 buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), s_align); |
| 903 | 250 } |
| 251 pic->age= 256*256*256*64; | |
| 252 } | |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
253 pic->type= FF_BUFFER_TYPE_INTERNAL; |
| 903 | 254 |
| 1214 | 255 for(i=0; i<4; i++){ |
| 256 pic->base[i]= buf->base[i]; | |
| 257 pic->data[i]= buf->data[i]; | |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
258 pic->linesize[i]= buf->linesize[i]; |
| 1214 | 259 } |
| 260 s->internal_buffer_count++; | |
| 261 | |
| 903 | 262 return 0; |
| 263 } | |
| 264 | |
| 925 | 265 void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic){ |
| 903 | 266 int i; |
| 1214 | 267 InternalBuffer *buf, *last, temp; |
| 268 | |
| 924 | 269 assert(pic->type==FF_BUFFER_TYPE_INTERNAL); |
| 1396 | 270 assert(s->internal_buffer_count); |
| 1214 | 271 |
| 1455 | 272 buf = NULL; /* avoids warning */ |
| 1214 | 273 for(i=0; i<s->internal_buffer_count; i++){ //just 3-5 checks so is not worth to optimize |
| 274 buf= &((InternalBuffer*)s->internal_buffer)[i]; | |
| 275 if(buf->data[0] == pic->data[0]) | |
| 276 break; | |
| 277 } | |
| 278 assert(i < s->internal_buffer_count); | |
| 279 s->internal_buffer_count--; | |
| 280 last = &((InternalBuffer*)s->internal_buffer)[s->internal_buffer_count]; | |
| 281 | |
| 282 temp= *buf; | |
| 283 *buf= *last; | |
| 284 *last= temp; | |
| 285 | |
| 286 for(i=0; i<3; i++){ | |
| 903 | 287 pic->data[i]=NULL; |
| 1214 | 288 // pic->base[i]=NULL; |
| 289 } | |
| 903 | 290 //printf("R%X\n", pic->opaque); |
| 291 } | |
| 292 | |
| 1630 | 293 int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){ |
| 294 AVFrame temp_pic; | |
| 295 int i; | |
| 296 | |
| 297 /* If no picture return a new buffer */ | |
| 298 if(pic->data[0] == NULL) { | |
| 299 /* We will copy from buffer, so must be readable */ | |
| 300 pic->buffer_hints |= FF_BUFFER_HINTS_READABLE; | |
| 301 return s->get_buffer(s, pic); | |
| 302 } | |
| 303 | |
| 304 /* If internal buffer type return the same buffer */ | |
| 305 if(pic->type == FF_BUFFER_TYPE_INTERNAL) | |
| 306 return 0; | |
| 307 | |
| 308 /* | |
| 309 * Not internal type and reget_buffer not overridden, emulate cr buffer | |
| 310 */ | |
| 311 temp_pic = *pic; | |
| 312 for(i = 0; i < 4; i++) | |
| 313 pic->data[i] = pic->base[i] = NULL; | |
| 314 pic->opaque = NULL; | |
| 315 /* Allocate new frame */ | |
| 316 if (s->get_buffer(s, pic)) | |
| 317 return -1; | |
| 318 /* Copy image data from old buffer to new buffer */ | |
| 319 img_copy((AVPicture*)pic, (AVPicture*)&temp_pic, s->pix_fmt, s->width, | |
| 320 s->height); | |
| 321 s->release_buffer(s, &temp_pic); // Release old frame | |
| 322 return 0; | |
| 323 } | |
| 324 | |
| 1799 | 325 int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void **arg, int *ret, int count){ |
| 326 int i; | |
| 327 | |
| 328 for(i=0; i<count; i++){ | |
| 329 int r= func(c, arg[i]); | |
| 330 if(ret) ret[i]= r; | |
| 331 } | |
| 332 return 0; | |
| 333 } | |
| 334 | |
| 1858 | 335 enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt){ |
| 998 | 336 return fmt[0]; |
| 337 } | |
| 338 | |
| 1856 | 339 static const char* context_to_name(void* ptr) { |
| 340 AVCodecContext *avc= ptr; | |
| 341 | |
| 342 if(avc && avc->codec && avc->codec->name) | |
| 343 return avc->codec->name; | |
| 344 else | |
| 345 return "NULL"; | |
| 346 } | |
| 347 | |
| 348 static AVClass av_codec_context_class = { "AVCodecContext", context_to_name }; | |
| 349 | |
| 681 | 350 void avcodec_get_context_defaults(AVCodecContext *s){ |
|
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
351 memset(s, 0, sizeof(AVCodecContext)); |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
352 |
| 1856 | 353 s->av_class= &av_codec_context_class; |
| 685 | 354 s->bit_rate= 800*1000; |
| 355 s->bit_rate_tolerance= s->bit_rate*10; | |
| 681 | 356 s->qmin= 2; |
| 357 s->qmax= 31; | |
| 932 | 358 s->mb_qmin= 2; |
| 359 s->mb_qmax= 31; | |
| 681 | 360 s->rc_eq= "tex^qComp"; |
| 361 s->qcompress= 0.5; | |
| 685 | 362 s->max_qdiff= 3; |
| 363 s->b_quant_factor=1.25; | |
| 364 s->b_quant_offset=1.25; | |
|
686
83d2c9d50d7d
fixing i_quant_factor, this should finally fix the bitrate bug with ffserver hopefully
michaelni
parents:
685
diff
changeset
|
365 s->i_quant_factor=-0.8; |
| 685 | 366 s->i_quant_offset=0.0; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
742
diff
changeset
|
367 s->error_concealment= 3; |
| 762 | 368 s->error_resilience= 1; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
742
diff
changeset
|
369 s->workaround_bugs= FF_BUG_AUTODETECT; |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
370 s->frame_rate_base= 1; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
371 s->frame_rate = 25; |
| 762 | 372 s->gop_size= 50; |
| 373 s->me_method= ME_EPZS; | |
| 903 | 374 s->get_buffer= avcodec_default_get_buffer; |
| 375 s->release_buffer= avcodec_default_release_buffer; | |
| 998 | 376 s->get_format= avcodec_default_get_format; |
| 1799 | 377 s->execute= avcodec_default_execute; |
| 378 s->thread_count=1; | |
| 954 | 379 s->me_subpel_quality=8; |
|
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1456
diff
changeset
|
380 s->lmin= FF_QP2LAMBDA * s->qmin; |
|
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1456
diff
changeset
|
381 s->lmax= FF_QP2LAMBDA * s->qmax; |
| 1548 | 382 s->sample_aspect_ratio= (AVRational){0,1}; |
| 1730 | 383 s->ildct_cmp= FF_CMP_VSAD; |
| 1150 | 384 |
| 385 s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS; | |
| 386 s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS; | |
|
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1582
diff
changeset
|
387 s->palctrl = NULL; |
| 1630 | 388 s->reget_buffer= avcodec_default_reget_buffer; |
| 681 | 389 } |
| 390 | |
| 391 /** | |
| 392 * allocates a AVCodecContext and set it to defaults. | |
| 393 * this can be deallocated by simply calling free() | |
| 394 */ | |
| 703 | 395 AVCodecContext *avcodec_alloc_context(void){ |
|
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
396 AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext)); |
| 681 | 397 |
| 398 if(avctx==NULL) return NULL; | |
| 399 | |
| 400 avcodec_get_context_defaults(avctx); | |
| 401 | |
| 402 return avctx; | |
| 403 } | |
| 404 | |
|
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
405 void avcodec_get_frame_defaults(AVFrame *pic){ |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
406 memset(pic, 0, sizeof(AVFrame)); |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
407 |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
408 pic->pts= AV_NOPTS_VALUE; |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
409 } |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
410 |
| 903 | 411 /** |
| 925 | 412 * allocates a AVPFrame and set it to defaults. |
| 903 | 413 * this can be deallocated by simply calling free() |
| 414 */ | |
| 925 | 415 AVFrame *avcodec_alloc_frame(void){ |
|
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
416 AVFrame *pic= av_malloc(sizeof(AVFrame)); |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
417 |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
418 if(pic==NULL) return NULL; |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
419 |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
420 avcodec_get_frame_defaults(pic); |
| 903 | 421 |
| 422 return pic; | |
| 423 } | |
| 424 | |
| 0 | 425 int avcodec_open(AVCodecContext *avctx, AVCodec *codec) |
| 426 { | |
| 427 int ret; | |
| 428 | |
|
1456
670fca257a69
detect avcodec_open() on an already opened AVCodecContext
michaelni
parents:
1455
diff
changeset
|
429 if(avctx->codec) |
|
670fca257a69
detect avcodec_open() on an already opened AVCodecContext
michaelni
parents:
1455
diff
changeset
|
430 return -1; |
|
670fca257a69
detect avcodec_open() on an already opened AVCodecContext
michaelni
parents:
1455
diff
changeset
|
431 |
| 0 | 432 avctx->codec = codec; |
| 927 | 433 avctx->codec_id = codec->id; |
| 0 | 434 avctx->frame_number = 0; |
|
374
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
435 if (codec->priv_data_size > 0) { |
|
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
436 avctx->priv_data = av_mallocz(codec->priv_data_size); |
|
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
437 if (!avctx->priv_data) |
|
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
438 return -ENOMEM; |
|
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
439 } else { |
|
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
440 avctx->priv_data = NULL; |
|
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
441 } |
| 0 | 442 ret = avctx->codec->init(avctx); |
| 443 if (ret < 0) { | |
| 394 | 444 av_freep(&avctx->priv_data); |
| 0 | 445 return ret; |
| 446 } | |
| 447 return 0; | |
| 448 } | |
| 449 | |
| 1064 | 450 int avcodec_encode_audio(AVCodecContext *avctx, uint8_t *buf, int buf_size, |
| 0 | 451 const short *samples) |
| 452 { | |
| 453 int ret; | |
| 454 | |
| 455 ret = avctx->codec->encode(avctx, buf, buf_size, (void *)samples); | |
| 456 avctx->frame_number++; | |
| 457 return ret; | |
| 458 } | |
| 459 | |
| 1064 | 460 int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size, |
| 925 | 461 const AVFrame *pict) |
| 0 | 462 { |
| 463 int ret; | |
| 464 | |
| 465 ret = avctx->codec->encode(avctx, buf, buf_size, (void *)pict); | |
| 814 | 466 |
| 467 emms_c(); //needed to avoid a emms_c() call before every return; | |
| 468 | |
| 0 | 469 avctx->frame_number++; |
| 470 return ret; | |
| 471 } | |
| 472 | |
| 1249 | 473 /** |
| 474 * decode a frame. | |
| 475 * @param buf bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE larger then the actual read bytes | |
| 476 * because some optimized bitstream readers read 32 or 64 bit at once and could read over the end | |
| 477 * @param buf_size the size of the buffer in bytes | |
| 478 * @param got_picture_ptr zero if no frame could be decompressed, Otherwise, it is non zero | |
| 479 * @return -1 if error, otherwise return the number of | |
| 480 * bytes used. | |
| 481 */ | |
| 925 | 482 int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, |
| 0 | 483 int *got_picture_ptr, |
| 1064 | 484 uint8_t *buf, int buf_size) |
| 0 | 485 { |
| 486 int ret; | |
| 903 | 487 |
| 0 | 488 ret = avctx->codec->decode(avctx, picture, got_picture_ptr, |
| 489 buf, buf_size); | |
| 814 | 490 |
| 491 emms_c(); //needed to avoid a emms_c() call before every return; | |
| 903 | 492 |
|
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
260
diff
changeset
|
493 if (*got_picture_ptr) |
|
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
260
diff
changeset
|
494 avctx->frame_number++; |
| 0 | 495 return ret; |
| 496 } | |
| 497 | |
| 498 /* decode an audio frame. return -1 if error, otherwise return the | |
| 499 *number of bytes used. If no frame could be decompressed, | |
| 500 *frame_size_ptr is zero. Otherwise, it is the decompressed frame | |
| 501 *size in BYTES. */ | |
| 1064 | 502 int avcodec_decode_audio(AVCodecContext *avctx, int16_t *samples, |
| 0 | 503 int *frame_size_ptr, |
| 1064 | 504 uint8_t *buf, int buf_size) |
| 0 | 505 { |
| 506 int ret; | |
| 507 | |
| 508 ret = avctx->codec->decode(avctx, samples, frame_size_ptr, | |
| 509 buf, buf_size); | |
| 510 avctx->frame_number++; | |
| 511 return ret; | |
| 512 } | |
| 513 | |
| 514 int avcodec_close(AVCodecContext *avctx) | |
| 515 { | |
| 516 if (avctx->codec->close) | |
| 517 avctx->codec->close(avctx); | |
| 394 | 518 av_freep(&avctx->priv_data); |
| 0 | 519 avctx->codec = NULL; |
| 520 return 0; | |
| 521 } | |
| 522 | |
| 523 AVCodec *avcodec_find_encoder(enum CodecID id) | |
| 524 { | |
| 525 AVCodec *p; | |
| 526 p = first_avcodec; | |
| 527 while (p) { | |
| 528 if (p->encode != NULL && p->id == id) | |
| 529 return p; | |
| 530 p = p->next; | |
| 531 } | |
| 532 return NULL; | |
| 533 } | |
| 534 | |
| 177 | 535 AVCodec *avcodec_find_encoder_by_name(const char *name) |
| 536 { | |
| 537 AVCodec *p; | |
| 538 p = first_avcodec; | |
| 539 while (p) { | |
| 540 if (p->encode != NULL && strcmp(name,p->name) == 0) | |
| 541 return p; | |
| 542 p = p->next; | |
| 543 } | |
| 544 return NULL; | |
| 545 } | |
| 546 | |
| 0 | 547 AVCodec *avcodec_find_decoder(enum CodecID id) |
| 548 { | |
| 549 AVCodec *p; | |
| 550 p = first_avcodec; | |
| 551 while (p) { | |
| 552 if (p->decode != NULL && p->id == id) | |
| 553 return p; | |
| 554 p = p->next; | |
| 555 } | |
| 556 return NULL; | |
| 557 } | |
| 558 | |
| 559 AVCodec *avcodec_find_decoder_by_name(const char *name) | |
| 560 { | |
| 561 AVCodec *p; | |
| 562 p = first_avcodec; | |
| 563 while (p) { | |
| 564 if (p->decode != NULL && strcmp(name,p->name) == 0) | |
| 565 return p; | |
| 566 p = p->next; | |
| 567 } | |
| 568 return NULL; | |
| 569 } | |
| 570 | |
| 571 AVCodec *avcodec_find(enum CodecID id) | |
| 572 { | |
| 573 AVCodec *p; | |
| 574 p = first_avcodec; | |
| 575 while (p) { | |
| 576 if (p->id == id) | |
| 577 return p; | |
| 578 p = p->next; | |
| 579 } | |
| 580 return NULL; | |
| 581 } | |
| 582 | |
| 583 void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) | |
| 584 { | |
| 585 const char *codec_name; | |
| 586 AVCodec *p; | |
| 587 char buf1[32]; | |
| 337 | 588 char channels_str[100]; |
| 92 | 589 int bitrate; |
| 0 | 590 |
| 591 if (encode) | |
| 592 p = avcodec_find_encoder(enc->codec_id); | |
| 593 else | |
| 594 p = avcodec_find_decoder(enc->codec_id); | |
| 595 | |
| 596 if (p) { | |
| 597 codec_name = p->name; | |
|
1449
7fbe89a76b73
update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents:
1396
diff
changeset
|
598 if (!encode && enc->codec_id == CODEC_ID_MP3) { |
|
7fbe89a76b73
update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents:
1396
diff
changeset
|
599 if (enc->sub_id == 2) |
|
7fbe89a76b73
update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents:
1396
diff
changeset
|
600 codec_name = "mp2"; |
|
7fbe89a76b73
update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents:
1396
diff
changeset
|
601 else if (enc->sub_id == 1) |
|
7fbe89a76b73
update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents:
1396
diff
changeset
|
602 codec_name = "mp1"; |
|
7fbe89a76b73
update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents:
1396
diff
changeset
|
603 } |
|
1582
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
604 } else if (enc->codec_id == CODEC_ID_MPEG2TS) { |
|
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
605 /* fake mpeg2 transport stream codec (currently not |
|
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
606 registered) */ |
|
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
607 codec_name = "mpeg2ts"; |
| 0 | 608 } else if (enc->codec_name[0] != '\0') { |
| 609 codec_name = enc->codec_name; | |
| 610 } else { | |
| 611 /* output avi tags */ | |
| 612 if (enc->codec_type == CODEC_TYPE_VIDEO) { | |
| 613 snprintf(buf1, sizeof(buf1), "%c%c%c%c", | |
| 614 enc->codec_tag & 0xff, | |
| 615 (enc->codec_tag >> 8) & 0xff, | |
| 616 (enc->codec_tag >> 16) & 0xff, | |
| 617 (enc->codec_tag >> 24) & 0xff); | |
| 618 } else { | |
| 619 snprintf(buf1, sizeof(buf1), "0x%04x", enc->codec_tag); | |
| 620 } | |
| 621 codec_name = buf1; | |
| 622 } | |
| 623 | |
| 624 switch(enc->codec_type) { | |
| 625 case CODEC_TYPE_VIDEO: | |
| 626 snprintf(buf, buf_size, | |
| 627 "Video: %s%s", | |
| 1389 | 628 codec_name, enc->mb_decision ? " (hq)" : ""); |
| 55 | 629 if (enc->codec_id == CODEC_ID_RAWVIDEO) { |
| 630 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
| 631 ", %s", | |
|
988
001b7d3045e5
moved avcodec_get_chroma_sub_sample() to imgconvert.c
bellard
parents:
963
diff
changeset
|
632 avcodec_get_pix_fmt_name(enc->pix_fmt)); |
| 55 | 633 } |
| 0 | 634 if (enc->width) { |
| 635 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
| 636 ", %dx%d, %0.2f fps", | |
| 637 enc->width, enc->height, | |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
638 (float)enc->frame_rate / enc->frame_rate_base); |
| 0 | 639 } |
| 741 | 640 if (encode) { |
| 641 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
| 642 ", q=%d-%d", enc->qmin, enc->qmax); | |
| 643 } | |
| 92 | 644 bitrate = enc->bit_rate; |
| 0 | 645 break; |
| 646 case CODEC_TYPE_AUDIO: | |
| 647 snprintf(buf, buf_size, | |
| 648 "Audio: %s", | |
| 649 codec_name); | |
|
318
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
650 switch (enc->channels) { |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
651 case 1: |
| 337 | 652 strcpy(channels_str, "mono"); |
|
318
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
653 break; |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
654 case 2: |
| 337 | 655 strcpy(channels_str, "stereo"); |
|
318
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
656 break; |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
657 case 6: |
| 337 | 658 strcpy(channels_str, "5:1"); |
|
318
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
659 break; |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
660 default: |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
661 sprintf(channels_str, "%d channels", enc->channels); |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
662 break; |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
663 } |
| 0 | 664 if (enc->sample_rate) { |
| 665 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
| 666 ", %d Hz, %s", | |
| 667 enc->sample_rate, | |
|
318
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
668 channels_str); |
| 0 | 669 } |
|
318
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
670 |
| 92 | 671 /* for PCM codecs, compute bitrate directly */ |
| 672 switch(enc->codec_id) { | |
| 673 case CODEC_ID_PCM_S16LE: | |
| 674 case CODEC_ID_PCM_S16BE: | |
| 675 case CODEC_ID_PCM_U16LE: | |
| 676 case CODEC_ID_PCM_U16BE: | |
| 94 | 677 bitrate = enc->sample_rate * enc->channels * 16; |
| 92 | 678 break; |
| 679 case CODEC_ID_PCM_S8: | |
| 680 case CODEC_ID_PCM_U8: | |
| 681 case CODEC_ID_PCM_ALAW: | |
| 682 case CODEC_ID_PCM_MULAW: | |
| 94 | 683 bitrate = enc->sample_rate * enc->channels * 8; |
| 92 | 684 break; |
| 685 default: | |
| 686 bitrate = enc->bit_rate; | |
| 687 break; | |
| 688 } | |
| 0 | 689 break; |
|
1582
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
690 case CODEC_TYPE_DATA: |
|
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
691 snprintf(buf, buf_size, "Data: %s", codec_name); |
|
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
692 bitrate = enc->bit_rate; |
|
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
693 break; |
| 0 | 694 default: |
| 583 | 695 av_abort(); |
| 0 | 696 } |
| 741 | 697 if (encode) { |
| 698 if (enc->flags & CODEC_FLAG_PASS1) | |
| 699 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
| 700 ", pass 1"); | |
| 701 if (enc->flags & CODEC_FLAG_PASS2) | |
| 702 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
| 703 ", pass 2"); | |
| 704 } | |
| 92 | 705 if (bitrate != 0) { |
| 0 | 706 snprintf(buf + strlen(buf), buf_size - strlen(buf), |
| 92 | 707 ", %d kb/s", bitrate / 1000); |
| 0 | 708 } |
| 709 } | |
| 710 | |
| 362 | 711 unsigned avcodec_version( void ) |
| 712 { | |
| 713 return LIBAVCODEC_VERSION_INT; | |
| 714 } | |
| 55 | 715 |
| 379 | 716 unsigned avcodec_build( void ) |
| 717 { | |
| 718 return LIBAVCODEC_BUILD; | |
| 719 } | |
| 720 | |
| 0 | 721 /* must be called before any other functions */ |
| 722 void avcodec_init(void) | |
| 723 { | |
|
303
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
724 static int inited = 0; |
|
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
725 |
|
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
726 if (inited != 0) |
|
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
727 return; |
|
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
728 inited = 1; |
|
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
729 |
| 1201 | 730 dsputil_static_init(); |
| 0 | 731 } |
| 732 | |
| 1368 | 733 /** |
| 734 * Flush buffers, should be called when seeking or when swicthing to a different stream. | |
| 735 */ | |
| 341 | 736 void avcodec_flush_buffers(AVCodecContext *avctx) |
| 737 { | |
| 1368 | 738 if(avctx->codec->flush) |
| 739 avctx->codec->flush(avctx); | |
| 341 | 740 } |
| 741 | |
| 1214 | 742 void avcodec_default_free_buffers(AVCodecContext *s){ |
| 743 int i, j; | |
| 744 | |
| 745 if(s->internal_buffer==NULL) return; | |
| 746 | |
| 747 for(i=0; i<INTERNAL_BUFFER_SIZE; i++){ | |
| 748 InternalBuffer *buf= &((InternalBuffer*)s->internal_buffer)[i]; | |
| 749 for(j=0; j<4; j++){ | |
| 750 av_freep(&buf->base[j]); | |
| 751 buf->data[j]= NULL; | |
| 752 } | |
| 753 } | |
| 754 av_freep(&s->internal_buffer); | |
| 755 | |
| 756 s->internal_buffer_count=0; | |
| 757 } | |
| 758 | |
| 1264 | 759 char av_get_pict_type_char(int pict_type){ |
| 760 switch(pict_type){ | |
| 761 case I_TYPE: return 'I'; | |
| 762 case P_TYPE: return 'P'; | |
| 763 case B_TYPE: return 'B'; | |
| 764 case S_TYPE: return 'S'; | |
| 765 case SI_TYPE:return 'i'; | |
| 766 case SP_TYPE:return 'p'; | |
| 767 default: return '?'; | |
| 768 } | |
| 769 } | |
| 770 | |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
771 int av_reduce(int *dst_nom, int *dst_den, int64_t nom, int64_t den, int64_t max){ |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
772 int exact=1, sign=0; |
|
1549
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
773 int64_t gcd; |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
774 |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
775 assert(den != 0); |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
776 |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
777 if(den < 0){ |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
778 den= -den; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
779 nom= -nom; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
780 } |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
781 |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
782 if(nom < 0){ |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
783 nom= -nom; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
784 sign= 1; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
785 } |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
786 |
|
1549
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
787 gcd = ff_gcd(nom, den); |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
788 nom /= gcd; |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
789 den /= gcd; |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
790 |
|
1549
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
791 if(nom > max || den > max){ |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
792 AVRational a0={0,1}, a1={1,0}; |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
793 exact=0; |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
794 |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
795 for(;;){ |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
796 int64_t x= nom / den; |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
797 int64_t a2n= x*a1.num + a0.num; |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
798 int64_t a2d= x*a1.den + a0.den; |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
799 |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
800 if(a2n > max || a2d > max) break; |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
801 |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
802 nom %= den; |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
803 |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
804 a0= a1; |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
805 a1= (AVRational){a2n, a2d}; |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
806 if(nom==0) break; |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
807 x= nom; nom=den; den=x; |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
808 } |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
809 nom= a1.num; |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
810 den= a1.den; |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
811 } |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
812 |
|
1549
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
813 assert(ff_gcd(nom, den) == 1); |
|
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
814 |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
815 if(sign) nom= -nom; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
816 |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
817 *dst_nom = nom; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
818 *dst_den = den; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
819 |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
820 return exact; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
821 } |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
822 |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
823 int64_t av_rescale(int64_t a, int b, int c){ |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
824 uint64_t h, l; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
825 assert(c > 0); |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
826 assert(b >=0); |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
827 |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
828 if(a<0) return -av_rescale(-a, b, c); |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
829 |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
830 h= a>>32; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
831 if(h==0) return a*b/c; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
832 |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
833 l= a&0xFFFFFFFF; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
834 l *= b; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
835 h *= b; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
836 |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
837 l += (h%c)<<32; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
838 |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
839 return ((h/c)<<32) + l/c; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
840 } |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
841 |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
842 /* av_log API */ |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
843 |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
844 static int av_log_level = AV_LOG_DEBUG; |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
845 |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
846 static void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
847 { |
| 1600 | 848 static int print_prefix=1; |
| 1856 | 849 AVClass* avc= ptr ? *(AVClass**)ptr : NULL; |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
850 if(level>av_log_level) |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
851 return; |
|
1823
a660ef952580
(f)printf() is disallowed in libavcodec, compilation will fail now if its used, except that codecs which where added after the printf->av_log change which did ignore av_log() and used prinf are now silent and wont print anything, they should be changed to use av_log, i could do that, but its better if the orginal developer decides which AV_LOG level each message should get
michael
parents:
1799
diff
changeset
|
852 #undef fprintf |
| 1856 | 853 if(print_prefix && avc) { |
| 854 fprintf(stderr, "[%s @ %p]", avc->item_name(ptr), avc); | |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
855 } |
|
1823
a660ef952580
(f)printf() is disallowed in libavcodec, compilation will fail now if its used, except that codecs which where added after the printf->av_log change which did ignore av_log() and used prinf are now silent and wont print anything, they should be changed to use av_log, i could do that, but its better if the orginal developer decides which AV_LOG level each message should get
michael
parents:
1799
diff
changeset
|
856 #define fprintf please_use_av_log |
| 1600 | 857 |
| 1776 | 858 print_prefix= strstr(fmt, "\n") != NULL; |
| 1600 | 859 |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
860 vfprintf(stderr, fmt, vl); |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
861 } |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
862 |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
863 static void (*av_log_callback)(void*, int, const char*, va_list) = av_log_default_callback; |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
864 |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
865 void av_log(void* avcl, int level, const char *fmt, ...) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
866 { |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
867 va_list vl; |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
868 va_start(vl, fmt); |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
869 av_vlog(avcl, level, fmt, vl); |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
870 va_end(vl); |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
871 } |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
872 |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
873 void av_vlog(void* avcl, int level, const char *fmt, va_list vl) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
874 { |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
875 av_log_callback(avcl, level, fmt, vl); |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
876 } |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
877 |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
878 int av_log_get_level(void) |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
879 { |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
880 return av_log_level; |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
881 } |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
882 |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
883 void av_log_set_level(int level) |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
884 { |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
885 av_log_level = level; |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
886 } |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
887 |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
888 void av_log_set_callback(void (*callback)(void*, int, const char*, va_list)) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
889 { |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
890 av_log_callback = callback; |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
891 } |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
892 |
