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