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