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