Mercurial > libavcodec.hg
annotate utils.c @ 11989:176c5deb6756 libavcodec
Optimize split MC, so we don't always do 4x4 blocks of 4x4pixels each, but
we apply them as 16x8/8x16/8x8 subblocks where possible. Since this allows
us to use width=8/16 instead of width=4 MC functions, we can now take more
advantage of SSE2/SSSE3 optimizations, leading to a total speedup for splitMV
filter of about 10%.
author | rbultje |
---|---|
date | Mon, 28 Jun 2010 13:50:55 +0000 |
parents | 2ae71694d6ae |
children | fdafbcef52f5 |
rev | line source |
---|---|
0 | 1 /* |
2 * utils for libavcodec | |
8629
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
8611
diff
changeset
|
3 * Copyright (c) 2001 Fabrice Bellard |
1739
07a484280a82
copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
michael
parents:
1730
diff
changeset
|
4 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> |
0 | 5 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3916
diff
changeset
|
6 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3916
diff
changeset
|
7 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3916
diff
changeset
|
8 * FFmpeg is free software; you can redistribute it and/or |
429 | 9 * modify it under the terms of the GNU Lesser General Public |
10 * License as published by the Free Software Foundation; either | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3916
diff
changeset
|
11 * version 2.1 of the License, or (at your option) any later version. |
0 | 12 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3916
diff
changeset
|
13 * FFmpeg is distributed in the hope that it will be useful, |
0 | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
429 | 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
16 * Lesser General Public License for more details. | |
0 | 17 * |
429 | 18 * You should have received a copy of the GNU Lesser General Public |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3916
diff
changeset
|
19 * License along with FFmpeg; if not, write to the Free Software |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
3031
diff
changeset
|
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 21 */ |
2967 | 22 |
1106 | 23 /** |
11644
7dd2a45249a9
Remove explicit filename from Doxygen @file commands.
diego
parents:
11629
diff
changeset
|
24 * @file |
1106 | 25 * utils. |
26 */ | |
2967 | 27 |
7576
e50e9def7428
ensure we get explicit definition of various _XOPEN_SOURCE functions we use
aurel
parents:
7530
diff
changeset
|
28 /* needed for mkstemp() */ |
7936 | 29 #define _XOPEN_SOURCE 600 |
7576
e50e9def7428
ensure we get explicit definition of various _XOPEN_SOURCE functions we use
aurel
parents:
7530
diff
changeset
|
30 |
8110 | 31 #include "libavutil/avstring.h" |
6763 | 32 #include "libavutil/integer.h" |
33 #include "libavutil/crc.h" | |
11311
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
34 #include "libavutil/pixdesc.h" |
394 | 35 #include "avcodec.h" |
0 | 36 #include "dsputil.h" |
2880 | 37 #include "opt.h" |
6360 | 38 #include "imgconvert.h" |
7454
bb5e8cae1d71
Write sample format description within avcodec_string()
pross
parents:
7409
diff
changeset
|
39 #include "audioconvert.h" |
11322
c4e86bcb2fee
Include libxvid_internal.h: It contains the prototype for av_tempfile().
cehoyos
parents:
11311
diff
changeset
|
40 #include "libxvid_internal.h" |
8603
555c2ab21d84
Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents:
8596
diff
changeset
|
41 #include "internal.h" |
7576
e50e9def7428
ensure we get explicit definition of various _XOPEN_SOURCE functions we use
aurel
parents:
7530
diff
changeset
|
42 #include <stdlib.h> |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
43 #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
|
44 #include <limits.h> |
2862 | 45 #include <float.h> |
8590 | 46 #if !HAVE_MKSTEMP |
3233
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
47 #include <fcntl.h> |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
48 #endif |
0 | 49 |
2806 | 50 static int volatile entangled_thread_counter=0; |
9742 | 51 int (*ff_lockmgr_cb)(void **mutex, enum AVLockOp op); |
52 static void *codec_mutex; | |
2806 | 53 |
1057 | 54 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
|
55 { |
2967 | 56 if(min_size < *size) |
1031
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
57 return ptr; |
2967 | 58 |
2422 | 59 *size= FFMAX(17*min_size/16 + 32, min_size); |
1031
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
60 |
6532
8aafb712389e
Fix possible heap overflow caused by av_fast_realloc()
michael
parents:
6488
diff
changeset
|
61 ptr= av_realloc(ptr, *size); |
8aafb712389e
Fix possible heap overflow caused by av_fast_realloc()
michael
parents:
6488
diff
changeset
|
62 if(!ptr) //we could set this to the unmodified min_size but this is safer if the user lost the ptr and uses NULL now |
8aafb712389e
Fix possible heap overflow caused by av_fast_realloc()
michael
parents:
6488
diff
changeset
|
63 *size= 0; |
8aafb712389e
Fix possible heap overflow caused by av_fast_realloc()
michael
parents:
6488
diff
changeset
|
64 |
8aafb712389e
Fix possible heap overflow caused by av_fast_realloc()
michael
parents:
6488
diff
changeset
|
65 return ptr; |
1031
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 |
9415
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9379
diff
changeset
|
68 void av_fast_malloc(void *ptr, unsigned int *size, unsigned int min_size) |
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9379
diff
changeset
|
69 { |
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9379
diff
changeset
|
70 void **p = ptr; |
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9379
diff
changeset
|
71 if (min_size < *size) |
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9379
diff
changeset
|
72 return; |
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9379
diff
changeset
|
73 *size= FFMAX(17*min_size/16 + 32, min_size); |
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9379
diff
changeset
|
74 av_free(*p); |
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9379
diff
changeset
|
75 *p = av_malloc(*size); |
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9379
diff
changeset
|
76 if (!*p) *size = 0; |
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9379
diff
changeset
|
77 } |
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9379
diff
changeset
|
78 |
0 | 79 /* encoder management */ |
7992 | 80 static AVCodec *first_avcodec = NULL; |
0 | 81 |
6011 | 82 AVCodec *av_codec_next(AVCodec *c){ |
83 if(c) return c->next; | |
84 else return first_avcodec; | |
85 } | |
86 | |
8750
2528b6a2b5d3
Rename register_avcodec() as avcodec_register() and deprecate the old
stefano
parents:
8748
diff
changeset
|
87 void avcodec_register(AVCodec *codec) |
0 | 88 { |
89 AVCodec **p; | |
8325 | 90 avcodec_init(); |
0 | 91 p = &first_avcodec; |
92 while (*p != NULL) p = &(*p)->next; | |
8324
343f0476fd1d
Use a more explicit "codec" rather than "format" as the parameter of
stefano
parents:
8281
diff
changeset
|
93 *p = codec; |
343f0476fd1d
Use a more explicit "codec" rather than "format" as the parameter of
stefano
parents:
8281
diff
changeset
|
94 codec->next = NULL; |
0 | 95 } |
96 | |
8752
7fd1422a8703
Drop the deprecated function register_avcodec() at the next major
stefano
parents:
8750
diff
changeset
|
97 #if LIBAVCODEC_VERSION_MAJOR < 53 |
8750
2528b6a2b5d3
Rename register_avcodec() as avcodec_register() and deprecate the old
stefano
parents:
8748
diff
changeset
|
98 void register_avcodec(AVCodec *codec) |
2528b6a2b5d3
Rename register_avcodec() as avcodec_register() and deprecate the old
stefano
parents:
8748
diff
changeset
|
99 { |
2528b6a2b5d3
Rename register_avcodec() as avcodec_register() and deprecate the old
stefano
parents:
8748
diff
changeset
|
100 avcodec_register(codec); |
2528b6a2b5d3
Rename register_avcodec() as avcodec_register() and deprecate the old
stefano
parents:
8748
diff
changeset
|
101 } |
8752
7fd1422a8703
Drop the deprecated function register_avcodec() at the next major
stefano
parents:
8750
diff
changeset
|
102 #endif |
8750
2528b6a2b5d3
Rename register_avcodec() as avcodec_register() and deprecate the old
stefano
parents:
8748
diff
changeset
|
103 |
11567
1025297f5624
Add function to export EDGE_WIDTH from libavcodec.
koorogi
parents:
11560
diff
changeset
|
104 unsigned avcodec_get_edge_width(void) |
1025297f5624
Add function to export EDGE_WIDTH from libavcodec.
koorogi
parents:
11560
diff
changeset
|
105 { |
1025297f5624
Add function to export EDGE_WIDTH from libavcodec.
koorogi
parents:
11560
diff
changeset
|
106 return EDGE_WIDTH; |
1025297f5624
Add function to export EDGE_WIDTH from libavcodec.
koorogi
parents:
11560
diff
changeset
|
107 } |
1025297f5624
Add function to export EDGE_WIDTH from libavcodec.
koorogi
parents:
11560
diff
changeset
|
108 |
2270 | 109 void avcodec_set_dimensions(AVCodecContext *s, int width, int height){ |
110 s->coded_width = width; | |
111 s->coded_height= height; | |
112 s->width = -((-width )>>s->lowres); | |
113 s->height= -((-height)>>s->lowres); | |
114 } | |
115 | |
1214 | 116 typedef struct InternalBuffer{ |
903 | 117 int last_pic_num; |
1214 | 118 uint8_t *base[4]; |
903 | 119 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
|
120 int linesize[4]; |
5522
acaaff7b6fb8
ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents:
5383
diff
changeset
|
121 int width, height; |
acaaff7b6fb8
ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents:
5383
diff
changeset
|
122 enum PixelFormat pix_fmt; |
1214 | 123 }InternalBuffer; |
124 | |
125 #define INTERNAL_BUFFER_SIZE 32 | |
903 | 126 |
11311
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
127 void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int linesize_align[4]){ |
2967 | 128 int w_align= 1; |
129 int h_align= 1; | |
130 | |
1538 | 131 switch(s->pix_fmt){ |
132 case PIX_FMT_YUV420P: | |
4494
ce643a22f049
Replace deprecated PIX_FMT names by the newer variants.
diego
parents:
4453
diff
changeset
|
133 case PIX_FMT_YUYV422: |
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
2125
diff
changeset
|
134 case PIX_FMT_UYVY422: |
1538 | 135 case PIX_FMT_YUV422P: |
10549 | 136 case PIX_FMT_YUV440P: |
1538 | 137 case PIX_FMT_YUV444P: |
138 case PIX_FMT_GRAY8: | |
4066 | 139 case PIX_FMT_GRAY16BE: |
140 case PIX_FMT_GRAY16LE: | |
1538 | 141 case PIX_FMT_YUVJ420P: |
142 case PIX_FMT_YUVJ422P: | |
10549 | 143 case PIX_FMT_YUVJ440P: |
1538 | 144 case PIX_FMT_YUVJ444P: |
5706
3e8764a25c53
add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents:
5576
diff
changeset
|
145 case PIX_FMT_YUVA420P: |
1538 | 146 w_align= 16; //FIXME check for non mpeg style codecs and use less alignment |
147 h_align= 16; | |
10549 | 148 if(s->codec_id == CODEC_ID_MPEG2VIDEO || s->codec_id == CODEC_ID_MJPEG || s->codec_id == CODEC_ID_AMV || s->codec_id == CODEC_ID_THP) |
9379
d31c367da415
Make sure mpeg2 has its height rounded up to 32 as that is needed
michael
parents:
9355
diff
changeset
|
149 h_align= 32; // interlaced is rounded up to 2 MBs |
1538 | 150 break; |
151 case PIX_FMT_YUV411P: | |
4494
ce643a22f049
Replace deprecated PIX_FMT names by the newer variants.
diego
parents:
4453
diff
changeset
|
152 case PIX_FMT_UYYVYY411: |
1538 | 153 w_align=32; |
154 h_align=8; | |
155 break; | |
156 case PIX_FMT_YUV410P: | |
157 if(s->codec_id == CODEC_ID_SVQ1){ | |
158 w_align=64; | |
159 h_align=64; | |
160 } | |
2104 | 161 case PIX_FMT_RGB555: |
162 if(s->codec_id == CODEC_ID_RPZA){ | |
163 w_align=4; | |
164 h_align=4; | |
165 } | |
166 case PIX_FMT_PAL8: | |
8748
eaa08ce79f9a
Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents:
8718
diff
changeset
|
167 case PIX_FMT_BGR8: |
eaa08ce79f9a
Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents:
8718
diff
changeset
|
168 case PIX_FMT_RGB8: |
2104 | 169 if(s->codec_id == CODEC_ID_SMC){ |
170 w_align=4; | |
171 h_align=4; | |
172 } | |
1538 | 173 break; |
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
174 case PIX_FMT_BGR24: |
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
175 if((s->codec_id == CODEC_ID_MSZH) || (s->codec_id == CODEC_ID_ZLIB)){ |
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
176 w_align=4; |
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
177 h_align=4; |
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
178 } |
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
179 break; |
1538 | 180 default: |
181 w_align= 1; | |
182 h_align= 1; | |
183 break; | |
184 } | |
185 | |
9686
bc32976d6d9d
Move ALIGN macro to libavutil/common.h and use it in various places
conrad
parents:
9545
diff
changeset
|
186 *width = FFALIGN(*width , w_align); |
bc32976d6d9d
Move ALIGN macro to libavutil/common.h and use it in various places
conrad
parents:
9545
diff
changeset
|
187 *height= FFALIGN(*height, h_align); |
7942
64f35acc2407
Allocate 1 line more in the chroma plane for H.264, this avoids some
michael
parents:
7941
diff
changeset
|
188 if(s->codec_id == CODEC_ID_H264) |
64f35acc2407
Allocate 1 line more in the chroma plane for H.264, this avoids some
michael
parents:
7941
diff
changeset
|
189 *height+=2; // some of the optimized chroma MC reads one line too much |
11311
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
190 |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
191 linesize_align[0] = |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
192 linesize_align[1] = |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
193 linesize_align[2] = |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
194 linesize_align[3] = STRIDE_ALIGN; |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
195 //STRIDE_ALIGN is 8 for SSE* but this does not work for SVQ1 chroma planes |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
196 //we could change STRIDE_ALIGN to 16 for x86/sse but it would increase the |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
197 //picture size unneccessarily in some cases. The solution here is not |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
198 //pretty and better ideas are welcome! |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
199 #if HAVE_MMX |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
200 if(s->codec_id == CODEC_ID_SVQ1 || s->codec_id == CODEC_ID_VP5 || |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
201 s->codec_id == CODEC_ID_VP6 || s->codec_id == CODEC_ID_VP6F || |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
202 s->codec_id == CODEC_ID_VP6A) { |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
203 linesize_align[0] = |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
204 linesize_align[1] = |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
205 linesize_align[2] = 16; |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
206 } |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
207 #endif |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
208 } |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
209 |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
210 void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){ |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
211 int chroma_shift = av_pix_fmt_descriptors[s->pix_fmt].log2_chroma_w; |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
212 int linesize_align[4]; |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
213 int align; |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
214 avcodec_align_dimensions2(s, width, height, linesize_align); |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
215 align = FFMAX(linesize_align[0], linesize_align[3]); |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
216 linesize_align[1] <<= chroma_shift; |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
217 linesize_align[2] <<= chroma_shift; |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
218 align = FFMAX3(align, linesize_align[1], linesize_align[2]); |
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
219 *width=FFALIGN(*width, align); |
1538 | 220 } |
221 | |
2422 | 222 int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h){ |
9536
f522c8e05a29
Update safety check as the maximum pixel size is no longer 4.
michael
parents:
9415
diff
changeset
|
223 if((int)w>0 && (int)h>0 && (w+128)*(uint64_t)(h+128) < INT_MAX/8) |
2422 | 224 return 0; |
2967 | 225 |
2422 | 226 av_log(av_log_ctx, AV_LOG_ERROR, "picture size invalid (%ux%u)\n", w, h); |
11659
45512d8b6b35
Make avcodec_check_dimensions() return AVERROR(EINVAL) rather than -1
stefano
parents:
11644
diff
changeset
|
227 return AVERROR(EINVAL); |
2422 | 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; |
2422 | 236 |
4453
22827cd6b228
Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents:
4351
diff
changeset
|
237 if(pic->data[0]!=NULL) { |
22827cd6b228
Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents:
4351
diff
changeset
|
238 av_log(s, AV_LOG_ERROR, "pic->data[0]!=NULL in avcodec_default_get_buffer\n"); |
22827cd6b228
Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents:
4351
diff
changeset
|
239 return -1; |
22827cd6b228
Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents:
4351
diff
changeset
|
240 } |
22827cd6b228
Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents:
4351
diff
changeset
|
241 if(s->internal_buffer_count >= INTERNAL_BUFFER_SIZE) { |
22827cd6b228
Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents:
4351
diff
changeset
|
242 av_log(s, AV_LOG_ERROR, "internal_buffer_count overflow (missing release_buffer?)\n"); |
22827cd6b228
Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents:
4351
diff
changeset
|
243 return -1; |
22827cd6b228
Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents:
4351
diff
changeset
|
244 } |
903 | 245 |
2422 | 246 if(avcodec_check_dimensions(s,w,h)) |
247 return -1; | |
248 | |
1214 | 249 if(s->internal_buffer==NULL){ |
7307
52764a3665d8
Make the ugly hack which uses an unused entry in the internal buffer
michael
parents:
7293
diff
changeset
|
250 s->internal_buffer= av_mallocz((INTERNAL_BUFFER_SIZE+1)*sizeof(InternalBuffer)); |
1214 | 251 } |
252 #if 0 | |
253 s->internal_buffer= av_fast_realloc( | |
2967 | 254 s->internal_buffer, |
255 &s->internal_buffer_size, | |
1214 | 256 sizeof(InternalBuffer)*FFMAX(99, s->internal_buffer_count+1)/*FIXME*/ |
257 ); | |
258 #endif | |
2967 | 259 |
1214 | 260 buf= &((InternalBuffer*)s->internal_buffer)[s->internal_buffer_count]; |
7307
52764a3665d8
Make the ugly hack which uses an unused entry in the internal buffer
michael
parents:
7293
diff
changeset
|
261 picture_number= &(((InternalBuffer*)s->internal_buffer)[INTERNAL_BUFFER_SIZE]).last_pic_num; //FIXME ugly hack |
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
262 (*picture_number)++; |
2967 | 263 |
5522
acaaff7b6fb8
ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents:
5383
diff
changeset
|
264 if(buf->base[0] && (buf->width != w || buf->height != h || buf->pix_fmt != s->pix_fmt)){ |
acaaff7b6fb8
ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents:
5383
diff
changeset
|
265 for(i=0; i<4; i++){ |
acaaff7b6fb8
ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents:
5383
diff
changeset
|
266 av_freep(&buf->base[i]); |
acaaff7b6fb8
ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents:
5383
diff
changeset
|
267 buf->data[i]= NULL; |
acaaff7b6fb8
ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents:
5383
diff
changeset
|
268 } |
acaaff7b6fb8
ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents:
5383
diff
changeset
|
269 } |
acaaff7b6fb8
ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents:
5383
diff
changeset
|
270 |
1214 | 271 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
|
272 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
|
273 buf->last_pic_num= *picture_number; |
903 | 274 }else{ |
1538 | 275 int h_chroma_shift, v_chroma_shift; |
6360 | 276 int size[4] = {0}; |
277 int tmpsize; | |
9192
6faca73d75cc
Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents:
9032
diff
changeset
|
278 int unaligned; |
2950 | 279 AVPicture picture; |
7941
8a3f24796fa9
Replace second (and wrong) call to avcodec_align_dimensions() by adjusting
michael
parents:
7936
diff
changeset
|
280 int stride_align[4]; |
2950 | 281 |
903 | 282 avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift); |
1538 | 283 |
11311
ee2e050815be
Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents:
11223
diff
changeset
|
284 avcodec_align_dimensions2(s, &w, &h, stride_align); |
2967 | 285 |
903 | 286 if(!(s->flags&CODEC_FLAG_EMU_EDGE)){ |
287 w+= EDGE_WIDTH*2; | |
288 h+= EDGE_WIDTH*2; | |
289 } | |
4986 | 290 |
9192
6faca73d75cc
Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents:
9032
diff
changeset
|
291 do { |
6faca73d75cc
Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents:
9032
diff
changeset
|
292 // NOTE: do not align linesizes individually, this breaks e.g. assumptions |
6faca73d75cc
Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents:
9032
diff
changeset
|
293 // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2 |
9193 | 294 ff_fill_linesize(&picture, s->pix_fmt, w); |
9192
6faca73d75cc
Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents:
9032
diff
changeset
|
295 // increase alignment of w for next try (rhs gives the lowest bit set in w) |
6faca73d75cc
Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents:
9032
diff
changeset
|
296 w += w & ~(w-1); |
6360 | 297 |
9192
6faca73d75cc
Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents:
9032
diff
changeset
|
298 unaligned = 0; |
9193 | 299 for (i=0; i<4; i++){ |
9192
6faca73d75cc
Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents:
9032
diff
changeset
|
300 unaligned |= picture.linesize[i] % stride_align[i]; |
9193 | 301 } |
9192
6faca73d75cc
Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents:
9032
diff
changeset
|
302 } while (unaligned); |
6360 | 303 |
304 tmpsize = ff_fill_pointer(&picture, NULL, s->pix_fmt, h); | |
9014
1de11a984fc6
Check return value of ff_fill_pointer in avcodec_default_get_buffer,
reimar
parents:
9011
diff
changeset
|
305 if (tmpsize < 0) |
1de11a984fc6
Check return value of ff_fill_pointer in avcodec_default_get_buffer,
reimar
parents:
9011
diff
changeset
|
306 return -1; |
6360 | 307 |
308 for (i=0; i<3 && picture.data[i+1]; i++) | |
309 size[i] = picture.data[i+1] - picture.data[i]; | |
6390 | 310 size[i] = tmpsize - (picture.data[i] - picture.data[0]); |
2950 | 311 |
1214 | 312 buf->last_pic_num= -256*256*256*64; |
2950 | 313 memset(buf->base, 0, sizeof(buf->base)); |
314 memset(buf->data, 0, sizeof(buf->data)); | |
903 | 315 |
5706
3e8764a25c53
add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents:
5576
diff
changeset
|
316 for(i=0; i<4 && size[i]; i++){ |
1165 | 317 const int h_shift= i==0 ? 0 : h_chroma_shift; |
318 const int v_shift= i==0 ? 0 : v_chroma_shift; | |
903 | 319 |
2950 | 320 buf->linesize[i]= picture.linesize[i]; |
903 | 321 |
2950 | 322 buf->base[i]= av_malloc(size[i]+16); //FIXME 16 |
1214 | 323 if(buf->base[i]==NULL) return -1; |
2950 | 324 memset(buf->base[i], 128, size[i]); |
325 | |
11781 | 326 // no edge if EDGE EMU or not planar YUV |
8748
eaa08ce79f9a
Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents:
8718
diff
changeset
|
327 if((s->flags&CODEC_FLAG_EMU_EDGE) || !size[2]) |
1214 | 328 buf->data[i] = buf->base[i]; |
903 | 329 else |
9686
bc32976d6d9d
Move ALIGN macro to libavutil/common.h and use it in various places
conrad
parents:
9545
diff
changeset
|
330 buf->data[i] = buf->base[i] + FFALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), stride_align[i]); |
903 | 331 } |
8748
eaa08ce79f9a
Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents:
8718
diff
changeset
|
332 if(size[1] && !size[2]) |
eaa08ce79f9a
Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents:
8718
diff
changeset
|
333 ff_set_systematic_pal((uint32_t*)buf->data[1], s->pix_fmt); |
5522
acaaff7b6fb8
ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents:
5383
diff
changeset
|
334 buf->width = s->width; |
acaaff7b6fb8
ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents:
5383
diff
changeset
|
335 buf->height = s->height; |
acaaff7b6fb8
ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents:
5383
diff
changeset
|
336 buf->pix_fmt= s->pix_fmt; |
903 | 337 pic->age= 256*256*256*64; |
338 } | |
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
|
339 pic->type= FF_BUFFER_TYPE_INTERNAL; |
903 | 340 |
1214 | 341 for(i=0; i<4; i++){ |
342 pic->base[i]= buf->base[i]; | |
343 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
|
344 pic->linesize[i]= buf->linesize[i]; |
1214 | 345 } |
346 s->internal_buffer_count++; | |
347 | |
7631
b5b4bf0944b8
Provide a simpler way for the user to reorder her timestamps.
michael
parents:
7613
diff
changeset
|
348 pic->reordered_opaque= s->reordered_opaque; |
b5b4bf0944b8
Provide a simpler way for the user to reorder her timestamps.
michael
parents:
7613
diff
changeset
|
349 |
7406
7b2819083061
Add a new -debug option for tracing calls to the default get/release_buffer functions.
astrange
parents:
7331
diff
changeset
|
350 if(s->debug&FF_DEBUG_BUFFERS) |
7b2819083061
Add a new -debug option for tracing calls to the default get/release_buffer functions.
astrange
parents:
7331
diff
changeset
|
351 av_log(s, AV_LOG_DEBUG, "default_get_buffer called on pic %p, %d buffers used\n", pic, s->internal_buffer_count); |
7b2819083061
Add a new -debug option for tracing calls to the default get/release_buffer functions.
astrange
parents:
7331
diff
changeset
|
352 |
903 | 353 return 0; |
354 } | |
355 | |
925 | 356 void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic){ |
903 | 357 int i; |
4558 | 358 InternalBuffer *buf, *last; |
1214 | 359 |
924 | 360 assert(pic->type==FF_BUFFER_TYPE_INTERNAL); |
1396 | 361 assert(s->internal_buffer_count); |
1214 | 362 |
1455 | 363 buf = NULL; /* avoids warning */ |
1214 | 364 for(i=0; i<s->internal_buffer_count; i++){ //just 3-5 checks so is not worth to optimize |
365 buf= &((InternalBuffer*)s->internal_buffer)[i]; | |
366 if(buf->data[0] == pic->data[0]) | |
367 break; | |
368 } | |
369 assert(i < s->internal_buffer_count); | |
370 s->internal_buffer_count--; | |
371 last = &((InternalBuffer*)s->internal_buffer)[s->internal_buffer_count]; | |
372 | |
4558 | 373 FFSWAP(InternalBuffer, *buf, *last); |
1214 | 374 |
5706
3e8764a25c53
add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents:
5576
diff
changeset
|
375 for(i=0; i<4; i++){ |
903 | 376 pic->data[i]=NULL; |
1214 | 377 // pic->base[i]=NULL; |
378 } | |
903 | 379 //printf("R%X\n", pic->opaque); |
7406
7b2819083061
Add a new -debug option for tracing calls to the default get/release_buffer functions.
astrange
parents:
7331
diff
changeset
|
380 |
7b2819083061
Add a new -debug option for tracing calls to the default get/release_buffer functions.
astrange
parents:
7331
diff
changeset
|
381 if(s->debug&FF_DEBUG_BUFFERS) |
7b2819083061
Add a new -debug option for tracing calls to the default get/release_buffer functions.
astrange
parents:
7331
diff
changeset
|
382 av_log(s, AV_LOG_DEBUG, "default_release_buffer called on pic %p, %d buffers used\n", pic, s->internal_buffer_count); |
903 | 383 } |
384 | |
1630 | 385 int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){ |
386 AVFrame temp_pic; | |
387 int i; | |
388 | |
389 /* If no picture return a new buffer */ | |
390 if(pic->data[0] == NULL) { | |
391 /* We will copy from buffer, so must be readable */ | |
392 pic->buffer_hints |= FF_BUFFER_HINTS_READABLE; | |
393 return s->get_buffer(s, pic); | |
394 } | |
395 | |
396 /* If internal buffer type return the same buffer */ | |
10684
7e316791ac7b
Set reordered_opaque in default_reget_buffer() with internal buffers.
michael
parents:
10550
diff
changeset
|
397 if(pic->type == FF_BUFFER_TYPE_INTERNAL) { |
7e316791ac7b
Set reordered_opaque in default_reget_buffer() with internal buffers.
michael
parents:
10550
diff
changeset
|
398 pic->reordered_opaque= s->reordered_opaque; |
1630 | 399 return 0; |
10684
7e316791ac7b
Set reordered_opaque in default_reget_buffer() with internal buffers.
michael
parents:
10550
diff
changeset
|
400 } |
1630 | 401 |
402 /* | |
403 * Not internal type and reget_buffer not overridden, emulate cr buffer | |
404 */ | |
405 temp_pic = *pic; | |
406 for(i = 0; i < 4; i++) | |
407 pic->data[i] = pic->base[i] = NULL; | |
408 pic->opaque = NULL; | |
409 /* Allocate new frame */ | |
410 if (s->get_buffer(s, pic)) | |
411 return -1; | |
412 /* Copy image data from old buffer to new buffer */ | |
4624
6a900f539e2c
Add the prefix "av_" to img_crop(), img_copy() and img_pad(), and rename "img"
takis
parents:
4621
diff
changeset
|
413 av_picture_copy((AVPicture*)pic, (AVPicture*)&temp_pic, s->pix_fmt, s->width, |
1630 | 414 s->height); |
415 s->release_buffer(s, &temp_pic); // Release old frame | |
416 return 0; | |
417 } | |
418 | |
8129
a9734fe0811e
Making it easier to send arbitrary structures as work orders to MT workers
romansh
parents:
8110
diff
changeset
|
419 int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){ |
1799 | 420 int i; |
421 | |
422 for(i=0; i<count; i++){ | |
8129
a9734fe0811e
Making it easier to send arbitrary structures as work orders to MT workers
romansh
parents:
8110
diff
changeset
|
423 int r= func(c, (char*)arg + i*size); |
1799 | 424 if(ret) ret[i]= r; |
425 } | |
426 return 0; | |
427 } | |
428 | |
10386
98501365c3aa
Add an execute2 function that is more flexible and allows to use parallel
reimar
parents:
10345
diff
changeset
|
429 int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int jobnr, int threadnr),void *arg, int *ret, int count){ |
98501365c3aa
Add an execute2 function that is more flexible and allows to use parallel
reimar
parents:
10345
diff
changeset
|
430 int i; |
98501365c3aa
Add an execute2 function that is more flexible and allows to use parallel
reimar
parents:
10345
diff
changeset
|
431 |
98501365c3aa
Add an execute2 function that is more flexible and allows to use parallel
reimar
parents:
10345
diff
changeset
|
432 for(i=0; i<count; i++){ |
98501365c3aa
Add an execute2 function that is more flexible and allows to use parallel
reimar
parents:
10345
diff
changeset
|
433 int r= func(c, arg, i, 0); |
98501365c3aa
Add an execute2 function that is more flexible and allows to use parallel
reimar
parents:
10345
diff
changeset
|
434 if(ret) ret[i]= r; |
98501365c3aa
Add an execute2 function that is more flexible and allows to use parallel
reimar
parents:
10345
diff
changeset
|
435 } |
98501365c3aa
Add an execute2 function that is more flexible and allows to use parallel
reimar
parents:
10345
diff
changeset
|
436 return 0; |
98501365c3aa
Add an execute2 function that is more flexible and allows to use parallel
reimar
parents:
10345
diff
changeset
|
437 } |
98501365c3aa
Add an execute2 function that is more flexible and allows to use parallel
reimar
parents:
10345
diff
changeset
|
438 |
9011
90c99bda19f5
Approved hunks for VAAPI / our new shiny hwaccel API
michael
parents:
8772
diff
changeset
|
439 enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat *fmt){ |
90c99bda19f5
Approved hunks for VAAPI / our new shiny hwaccel API
michael
parents:
8772
diff
changeset
|
440 while (*fmt != PIX_FMT_NONE && ff_is_hwaccel_pix_fmt(*fmt)) |
90c99bda19f5
Approved hunks for VAAPI / our new shiny hwaccel API
michael
parents:
8772
diff
changeset
|
441 ++fmt; |
998 | 442 return fmt[0]; |
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; |
2488 | 449 pic->key_frame= 1; |
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
450 } |
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
451 |
925 | 452 AVFrame *avcodec_alloc_frame(void){ |
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
453 AVFrame *pic= av_malloc(sizeof(AVFrame)); |
2967 | 454 |
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
455 if(pic==NULL) return NULL; |
2967 | 456 |
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
457 avcodec_get_frame_defaults(pic); |
2967 | 458 |
903 | 459 return pic; |
460 } | |
461 | |
5542
b0a566346fb1
Add attribute that forces alignment of stack to functions that need it.
ramiro
parents:
5537
diff
changeset
|
462 int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec) |
0 | 463 { |
2806 | 464 int ret= -1; |
2967 | 465 |
9742 | 466 /* If there is a user-supplied mutex locking routine, call it. */ |
467 if (ff_lockmgr_cb) { | |
468 if ((*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN)) | |
469 return -1; | |
470 } | |
471 | |
2806 | 472 entangled_thread_counter++; |
473 if(entangled_thread_counter != 1){ | |
474 av_log(avctx, AV_LOG_ERROR, "insufficient thread locking around avcodec_open/close()\n"); | |
475 goto end; | |
476 } | |
0 | 477 |
6069
3670c9e7ff4d
Check for avcodec_open codec parameter == NULL and return error in that case
reimar
parents:
6047
diff
changeset
|
478 if(avctx->codec || !codec) |
2806 | 479 goto end; |
1456
670fca257a69
detect avcodec_open() on an already opened AVCodecContext
michaelni
parents:
1455
diff
changeset
|
480 |
374
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
481 if (codec->priv_data_size > 0) { |
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
482 avctx->priv_data = av_mallocz(codec->priv_data_size); |
5382
7f96f6e16f81
Return AVERROR(ENOMEM) on memory allocation failure of avcodec_open.
takis
parents:
5356
diff
changeset
|
483 if (!avctx->priv_data) { |
7f96f6e16f81
Return AVERROR(ENOMEM) on memory allocation failure of avcodec_open.
takis
parents:
5356
diff
changeset
|
484 ret = AVERROR(ENOMEM); |
2806 | 485 goto end; |
5382
7f96f6e16f81
Return AVERROR(ENOMEM) on memory allocation failure of avcodec_open.
takis
parents:
5356
diff
changeset
|
486 } |
374
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
487 } else { |
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
488 avctx->priv_data = NULL; |
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
489 } |
2270 | 490 |
491 if(avctx->coded_width && avctx->coded_height) | |
492 avcodec_set_dimensions(avctx, avctx->coded_width, avctx->coded_height); | |
493 else if(avctx->width && avctx->height) | |
494 avcodec_set_dimensions(avctx, avctx->width, avctx->height); | |
495 | |
10179
0ac7e80ecc76
perform sanity check on number of audio channels in avcodec_open()
pross
parents:
9891
diff
changeset
|
496 #define SANE_NB_CHANNELS 128U |
10201
1b2ef85867a9
Add parentheses to logical expression to avoid the warning:
diego
parents:
10179
diff
changeset
|
497 if (((avctx->coded_width || avctx->coded_height) |
1b2ef85867a9
Add parentheses to logical expression to avoid the warning:
diego
parents:
10179
diff
changeset
|
498 && avcodec_check_dimensions(avctx, avctx->coded_width, avctx->coded_height)) |
1b2ef85867a9
Add parentheses to logical expression to avoid the warning:
diego
parents:
10179
diff
changeset
|
499 || avctx->channels > SANE_NB_CHANNELS) { |
5383
8a28860d54ba
Return AVERROR(EINVAL) when invalid width and/or height are specified to
takis
parents:
5382
diff
changeset
|
500 ret = AVERROR(EINVAL); |
10255
b81ec4ac8f96
Make sure priv_data is freed and codec is set to NULL in case of failure of avcodec_open().
michael
parents:
10229
diff
changeset
|
501 goto free_and_end; |
2422 | 502 } |
503 | |
3159 | 504 avctx->codec = codec; |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11323
diff
changeset
|
505 if ((avctx->codec_type == AVMEDIA_TYPE_UNKNOWN || avctx->codec_type == codec->type) && |
10345
294c444866f7
Make avcodec_open set codec_id and codec_type if they haven't been set.
reimar
parents:
10255
diff
changeset
|
506 avctx->codec_id == CODEC_ID_NONE) { |
294c444866f7
Make avcodec_open set codec_id and codec_type if they haven't been set.
reimar
parents:
10255
diff
changeset
|
507 avctx->codec_type = codec->type; |
294c444866f7
Make avcodec_open set codec_id and codec_type if they haven't been set.
reimar
parents:
10255
diff
changeset
|
508 avctx->codec_id = codec->id; |
294c444866f7
Make avcodec_open set codec_id and codec_type if they haven't been set.
reimar
parents:
10255
diff
changeset
|
509 } |
10229
bd1c4a438c7f
Check codec_id and codec_type in avcodec_open(), based on 43_codec_type_mismatch.patch from chrome
michael
parents:
10201
diff
changeset
|
510 if(avctx->codec_id != codec->id || avctx->codec_type != codec->type){ |
bd1c4a438c7f
Check codec_id and codec_type in avcodec_open(), based on 43_codec_type_mismatch.patch from chrome
michael
parents:
10201
diff
changeset
|
511 av_log(avctx, AV_LOG_ERROR, "codec type or id mismatches\n"); |
10255
b81ec4ac8f96
Make sure priv_data is freed and codec is set to NULL in case of failure of avcodec_open().
michael
parents:
10229
diff
changeset
|
512 goto free_and_end; |
10229
bd1c4a438c7f
Check codec_id and codec_type in avcodec_open(), based on 43_codec_type_mismatch.patch from chrome
michael
parents:
10201
diff
changeset
|
513 } |
3159 | 514 avctx->frame_number = 0; |
4762 | 515 if(avctx->codec->init){ |
4763 | 516 ret = avctx->codec->init(avctx); |
517 if (ret < 0) { | |
10255
b81ec4ac8f96
Make sure priv_data is freed and codec is set to NULL in case of failure of avcodec_open().
michael
parents:
10229
diff
changeset
|
518 goto free_and_end; |
4763 | 519 } |
4762 | 520 } |
2806 | 521 ret=0; |
522 end: | |
523 entangled_thread_counter--; | |
9742 | 524 |
525 /* Release any user-supplied mutex. */ | |
526 if (ff_lockmgr_cb) { | |
527 (*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE); | |
528 } | |
2806 | 529 return ret; |
10255
b81ec4ac8f96
Make sure priv_data is freed and codec is set to NULL in case of failure of avcodec_open().
michael
parents:
10229
diff
changeset
|
530 free_and_end: |
b81ec4ac8f96
Make sure priv_data is freed and codec is set to NULL in case of failure of avcodec_open().
michael
parents:
10229
diff
changeset
|
531 av_freep(&avctx->priv_data); |
b81ec4ac8f96
Make sure priv_data is freed and codec is set to NULL in case of failure of avcodec_open().
michael
parents:
10229
diff
changeset
|
532 avctx->codec= NULL; |
b81ec4ac8f96
Make sure priv_data is freed and codec is set to NULL in case of failure of avcodec_open().
michael
parents:
10229
diff
changeset
|
533 goto end; |
0 | 534 } |
535 | |
5542
b0a566346fb1
Add attribute that forces alignment of stack to functions that need it.
ramiro
parents:
5537
diff
changeset
|
536 int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx, uint8_t *buf, int buf_size, |
0 | 537 const short *samples) |
538 { | |
2422 | 539 if(buf_size < FF_MIN_BUFFER_SIZE && 0){ |
4526 | 540 av_log(avctx, AV_LOG_ERROR, "buffer smaller than minimum size\n"); |
2422 | 541 return -1; |
542 } | |
2091 | 543 if((avctx->codec->capabilities & CODEC_CAP_DELAY) || samples){ |
8756
153d7e5d5a5b
remove useless cast, it does not remove warning, encode prototype must be changed
bcoudurier
parents:
8752
diff
changeset
|
544 int ret = avctx->codec->encode(avctx, buf, buf_size, samples); |
2091 | 545 avctx->frame_number++; |
546 return ret; | |
547 }else | |
548 return 0; | |
0 | 549 } |
550 | |
5542
b0a566346fb1
Add attribute that forces alignment of stack to functions that need it.
ramiro
parents:
5537
diff
changeset
|
551 int attribute_align_arg avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size, |
925 | 552 const AVFrame *pict) |
0 | 553 { |
2422 | 554 if(buf_size < FF_MIN_BUFFER_SIZE){ |
4526 | 555 av_log(avctx, AV_LOG_ERROR, "buffer smaller than minimum size\n"); |
2422 | 556 return -1; |
557 } | |
558 if(avcodec_check_dimensions(avctx,avctx->width,avctx->height)) | |
559 return -1; | |
2091 | 560 if((avctx->codec->capabilities & CODEC_CAP_DELAY) || pict){ |
8756
153d7e5d5a5b
remove useless cast, it does not remove warning, encode prototype must be changed
bcoudurier
parents:
8752
diff
changeset
|
561 int ret = avctx->codec->encode(avctx, buf, buf_size, pict); |
2091 | 562 avctx->frame_number++; |
2764 | 563 emms_c(); //needed to avoid an emms_c() call before every return; |
2967 | 564 |
2091 | 565 return ret; |
566 }else | |
567 return 0; | |
0 | 568 } |
569 | |
2967 | 570 int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, |
2756 | 571 const AVSubtitle *sub) |
572 { | |
573 int ret; | |
8771
f7442819cacf
Check that start_display_time is 0 in avcodec_encode_subtitle()
superdump
parents:
8757
diff
changeset
|
574 if(sub->start_display_time) { |
f7442819cacf
Check that start_display_time is 0 in avcodec_encode_subtitle()
superdump
parents:
8757
diff
changeset
|
575 av_log(avctx, AV_LOG_ERROR, "start_display_time must be 0.\n"); |
f7442819cacf
Check that start_display_time is 0 in avcodec_encode_subtitle()
superdump
parents:
8757
diff
changeset
|
576 return -1; |
f7442819cacf
Check that start_display_time is 0 in avcodec_encode_subtitle()
superdump
parents:
8757
diff
changeset
|
577 } |
8772
5a9485bd4421
Check that there are subtitle rects to encode in avcodec_encode_subtitle()
superdump
parents:
8771
diff
changeset
|
578 if(sub->num_rects == 0 || !sub->rects) |
5a9485bd4421
Check that there are subtitle rects to encode in avcodec_encode_subtitle()
superdump
parents:
8771
diff
changeset
|
579 return -1; |
8756
153d7e5d5a5b
remove useless cast, it does not remove warning, encode prototype must be changed
bcoudurier
parents:
8752
diff
changeset
|
580 ret = avctx->codec->encode(avctx, buf, buf_size, sub); |
2756 | 581 avctx->frame_number++; |
582 return ret; | |
583 } | |
584 | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
585 #if LIBAVCODEC_VERSION_MAJOR < 53 |
5542
b0a566346fb1
Add attribute that forces alignment of stack to functions that need it.
ramiro
parents:
5537
diff
changeset
|
586 int attribute_align_arg avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, |
0 | 587 int *got_picture_ptr, |
6318
73c09e922744
Make avcodec_decode_* functions take const input buffers.
michael
parents:
6219
diff
changeset
|
588 const uint8_t *buf, int buf_size) |
0 | 589 { |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
590 AVPacket avpkt; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
591 av_init_packet(&avpkt); |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
592 avpkt.data = buf; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
593 avpkt.size = buf_size; |
9787 | 594 // HACK for CorePNG to decode as normal PNG by default |
595 avpkt.flags = AV_PKT_FLAG_KEY; | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
596 |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
597 return avcodec_decode_video2(avctx, picture, got_picture_ptr, &avpkt); |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
598 } |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
599 #endif |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
600 |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
601 int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
602 int *got_picture_ptr, |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
603 AVPacket *avpkt) |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
604 { |
0 | 605 int ret; |
2967 | 606 |
2028 | 607 *got_picture_ptr= 0; |
2422 | 608 if((avctx->coded_width||avctx->coded_height) && avcodec_check_dimensions(avctx,avctx->coded_width,avctx->coded_height)) |
609 return -1; | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
610 if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size){ |
2967 | 611 ret = avctx->codec->decode(avctx, picture, got_picture_ptr, |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
612 avpkt); |
814 | 613 |
2764 | 614 emms_c(); //needed to avoid an emms_c() call before every return; |
2967 | 615 |
616 if (*got_picture_ptr) | |
2453 | 617 avctx->frame_number++; |
618 }else | |
619 ret= 0; | |
620 | |
0 | 621 return ret; |
622 } | |
623 | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
624 #if LIBAVCODEC_VERSION_MAJOR < 53 |
5542
b0a566346fb1
Add attribute that forces alignment of stack to functions that need it.
ramiro
parents:
5537
diff
changeset
|
625 int attribute_align_arg avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples, |
0 | 626 int *frame_size_ptr, |
6318
73c09e922744
Make avcodec_decode_* functions take const input buffers.
michael
parents:
6219
diff
changeset
|
627 const uint8_t *buf, int buf_size) |
0 | 628 { |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
629 AVPacket avpkt; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
630 av_init_packet(&avpkt); |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
631 avpkt.data = buf; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
632 avpkt.size = buf_size; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
633 |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
634 return avcodec_decode_audio3(avctx, samples, frame_size_ptr, &avpkt); |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
635 } |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
636 #endif |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
637 |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
638 int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples, |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
639 int *frame_size_ptr, |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
640 AVPacket *avpkt) |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
641 { |
0 | 642 int ret; |
643 | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
644 if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size){ |
4578
006563b9ab27
dont check buffer size if the decode function wont be called at all
michael
parents:
4577
diff
changeset
|
645 //FIXME remove the check below _after_ ensuring that all audio check that the available space is enough |
006563b9ab27
dont check buffer size if the decode function wont be called at all
michael
parents:
4577
diff
changeset
|
646 if(*frame_size_ptr < AVCODEC_MAX_AUDIO_FRAME_SIZE){ |
006563b9ab27
dont check buffer size if the decode function wont be called at all
michael
parents:
4577
diff
changeset
|
647 av_log(avctx, AV_LOG_ERROR, "buffer smaller than AVCODEC_MAX_AUDIO_FRAME_SIZE\n"); |
006563b9ab27
dont check buffer size if the decode function wont be called at all
michael
parents:
4577
diff
changeset
|
648 return -1; |
006563b9ab27
dont check buffer size if the decode function wont be called at all
michael
parents:
4577
diff
changeset
|
649 } |
006563b9ab27
dont check buffer size if the decode function wont be called at all
michael
parents:
4577
diff
changeset
|
650 if(*frame_size_ptr < FF_MIN_BUFFER_SIZE || |
5707
c46509aca422
Remove check for input buffer size as it does not guarantee that
kostya
parents:
5706
diff
changeset
|
651 *frame_size_ptr < avctx->channels * avctx->frame_size * sizeof(int16_t)){ |
4578
006563b9ab27
dont check buffer size if the decode function wont be called at all
michael
parents:
4577
diff
changeset
|
652 av_log(avctx, AV_LOG_ERROR, "buffer %d too small\n", *frame_size_ptr); |
006563b9ab27
dont check buffer size if the decode function wont be called at all
michael
parents:
4577
diff
changeset
|
653 return -1; |
006563b9ab27
dont check buffer size if the decode function wont be called at all
michael
parents:
4577
diff
changeset
|
654 } |
006563b9ab27
dont check buffer size if the decode function wont be called at all
michael
parents:
4577
diff
changeset
|
655 |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
656 ret = avctx->codec->decode(avctx, samples, frame_size_ptr, avpkt); |
2791 | 657 avctx->frame_number++; |
4351 | 658 }else{ |
2791 | 659 ret= 0; |
4351 | 660 *frame_size_ptr=0; |
661 } | |
0 | 662 return ret; |
663 } | |
664 | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
665 #if LIBAVCODEC_VERSION_MAJOR < 53 |
2756 | 666 int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub, |
667 int *got_sub_ptr, | |
668 const uint8_t *buf, int buf_size) | |
669 { | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
670 AVPacket avpkt; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
671 av_init_packet(&avpkt); |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
672 avpkt.data = buf; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
673 avpkt.size = buf_size; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
674 |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
675 return avcodec_decode_subtitle2(avctx, sub, got_sub_ptr, &avpkt); |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
676 } |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
677 #endif |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
678 |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
679 int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
680 int *got_sub_ptr, |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
681 AVPacket *avpkt) |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
682 { |
2756 | 683 int ret; |
684 | |
685 *got_sub_ptr = 0; | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9328
diff
changeset
|
686 ret = avctx->codec->decode(avctx, sub, got_sub_ptr, avpkt); |
2756 | 687 if (*got_sub_ptr) |
688 avctx->frame_number++; | |
689 return ret; | |
690 } | |
691 | |
10867 | 692 av_cold int avcodec_close(AVCodecContext *avctx) |
0 | 693 { |
9742 | 694 /* If there is a user-supplied mutex locking routine, call it. */ |
695 if (ff_lockmgr_cb) { | |
696 if ((*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN)) | |
697 return -1; | |
698 } | |
699 | |
2806 | 700 entangled_thread_counter++; |
701 if(entangled_thread_counter != 1){ | |
702 av_log(avctx, AV_LOG_ERROR, "insufficient thread locking around avcodec_open/close()\n"); | |
703 entangled_thread_counter--; | |
704 return -1; | |
705 } | |
706 | |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
707 if (HAVE_THREADS && avctx->thread_opaque) |
5234 | 708 avcodec_thread_free(avctx); |
10505
e7f082df2d65
Add a NULL pointer check to avcodec_close() this should prevent a segfault
michael
parents:
10501
diff
changeset
|
709 if (avctx->codec && avctx->codec->close) |
0 | 710 avctx->codec->close(avctx); |
1994 | 711 avcodec_default_free_buffers(avctx); |
11712
25ed71436974
Set coded_frame to NULL when closing a codec, since it might
reimar
parents:
11659
diff
changeset
|
712 avctx->coded_frame = NULL; |
394 | 713 av_freep(&avctx->priv_data); |
11585 | 714 if(avctx->codec && avctx->codec->encode) |
11223
a090d10c314f
Free encoder extradata in avcodec_close(). Should fix several small memory
vitor
parents:
11134
diff
changeset
|
715 av_freep(&avctx->extradata); |
0 | 716 avctx->codec = NULL; |
2806 | 717 entangled_thread_counter--; |
9742 | 718 |
719 /* Release any user-supplied mutex. */ | |
720 if (ff_lockmgr_cb) { | |
721 (*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE); | |
722 } | |
0 | 723 return 0; |
724 } | |
725 | |
726 AVCodec *avcodec_find_encoder(enum CodecID id) | |
727 { | |
11771
3c0dffc64d86
Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents:
11742
diff
changeset
|
728 AVCodec *p, *experimental=NULL; |
0 | 729 p = first_avcodec; |
730 while (p) { | |
11771
3c0dffc64d86
Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents:
11742
diff
changeset
|
731 if (p->encode != NULL && p->id == id) { |
3c0dffc64d86
Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents:
11742
diff
changeset
|
732 if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) { |
3c0dffc64d86
Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents:
11742
diff
changeset
|
733 experimental = p; |
3c0dffc64d86
Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents:
11742
diff
changeset
|
734 } else |
3c0dffc64d86
Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents:
11742
diff
changeset
|
735 return p; |
3c0dffc64d86
Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents:
11742
diff
changeset
|
736 } |
0 | 737 p = p->next; |
738 } | |
11771
3c0dffc64d86
Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents:
11742
diff
changeset
|
739 return experimental; |
0 | 740 } |
741 | |
177 | 742 AVCodec *avcodec_find_encoder_by_name(const char *name) |
743 { | |
744 AVCodec *p; | |
8016
81dba4c59fd6
allows calling avcodec_find_(en|de)coder_by_name with NULL parameter
aurel
parents:
7992
diff
changeset
|
745 if (!name) |
81dba4c59fd6
allows calling avcodec_find_(en|de)coder_by_name with NULL parameter
aurel
parents:
7992
diff
changeset
|
746 return NULL; |
177 | 747 p = first_avcodec; |
748 while (p) { | |
749 if (p->encode != NULL && strcmp(name,p->name) == 0) | |
750 return p; | |
751 p = p->next; | |
752 } | |
753 return NULL; | |
754 } | |
755 | |
0 | 756 AVCodec *avcodec_find_decoder(enum CodecID id) |
757 { | |
758 AVCodec *p; | |
759 p = first_avcodec; | |
760 while (p) { | |
761 if (p->decode != NULL && p->id == id) | |
762 return p; | |
763 p = p->next; | |
764 } | |
765 return NULL; | |
766 } | |
767 | |
768 AVCodec *avcodec_find_decoder_by_name(const char *name) | |
769 { | |
770 AVCodec *p; | |
8016
81dba4c59fd6
allows calling avcodec_find_(en|de)coder_by_name with NULL parameter
aurel
parents:
7992
diff
changeset
|
771 if (!name) |
81dba4c59fd6
allows calling avcodec_find_(en|de)coder_by_name with NULL parameter
aurel
parents:
7992
diff
changeset
|
772 return NULL; |
0 | 773 p = first_avcodec; |
774 while (p) { | |
775 if (p->decode != NULL && strcmp(name,p->name) == 0) | |
776 return p; | |
777 p = p->next; | |
778 } | |
779 return NULL; | |
780 } | |
781 | |
11323
7089198d1d10
Make av_get_bit_rate() static and remove av_, the function is only used
cehoyos
parents:
11322
diff
changeset
|
782 static int get_bit_rate(AVCodecContext *ctx) |
10550
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
783 { |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
784 int bit_rate; |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
785 int bits_per_sample; |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
786 |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
787 switch(ctx->codec_type) { |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11323
diff
changeset
|
788 case AVMEDIA_TYPE_VIDEO: |
11629 | 789 case AVMEDIA_TYPE_DATA: |
790 case AVMEDIA_TYPE_SUBTITLE: | |
791 case AVMEDIA_TYPE_ATTACHMENT: | |
10550
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
792 bit_rate = ctx->bit_rate; |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
793 break; |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11323
diff
changeset
|
794 case AVMEDIA_TYPE_AUDIO: |
10550
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
795 bits_per_sample = av_get_bits_per_sample(ctx->codec_id); |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
796 bit_rate = bits_per_sample ? ctx->sample_rate * ctx->channels * bits_per_sample : ctx->bit_rate; |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
797 break; |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
798 default: |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
799 bit_rate = 0; |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
800 break; |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
801 } |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
802 return bit_rate; |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
803 } |
eb415f52f9f9
Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents:
10549
diff
changeset
|
804 |
11809
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
805 size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag) |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
806 { |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
807 int i, len, ret = 0; |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
808 |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
809 for (i = 0; i < 4; i++) { |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
810 len = snprintf(buf, buf_size, |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
811 isprint(codec_tag&0xFF) ? "%c" : "[%d]", codec_tag&0xFF); |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
812 buf += len; |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
813 buf_size = buf_size > len ? buf_size - len : 0; |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
814 ret += len; |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
815 codec_tag>>=8; |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
816 } |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
817 return ret; |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
818 } |
867d82f512df
Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents:
11781
diff
changeset
|
819 |
0 | 820 void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) |
821 { | |
822 const char *codec_name; | |
823 AVCodec *p; | |
824 char buf1[32]; | |
92 | 825 int bitrate; |
5837 | 826 AVRational display_aspect_ratio; |
0 | 827 |
828 if (encode) | |
829 p = avcodec_find_encoder(enc->codec_id); | |
830 else | |
831 p = avcodec_find_decoder(enc->codec_id); | |
832 | |
833 if (p) { | |
834 codec_name = p->name; | |
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
|
835 } 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
|
836 /* 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
|
837 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
|
838 codec_name = "mpeg2ts"; |
0 | 839 } else if (enc->codec_name[0] != '\0') { |
840 codec_name = enc->codec_name; | |
841 } else { | |
842 /* output avi tags */ | |
11810
2ae71694d6ae
Make avcodec_string() use av_get_codec_tag_string().
stefano
parents:
11809
diff
changeset
|
843 char tag_buf[32]; |
2ae71694d6ae
Make avcodec_string() use av_get_codec_tag_string().
stefano
parents:
11809
diff
changeset
|
844 av_get_codec_tag_string(tag_buf, sizeof(tag_buf), enc->codec_tag); |
2ae71694d6ae
Make avcodec_string() use av_get_codec_tag_string().
stefano
parents:
11809
diff
changeset
|
845 snprintf(buf1, sizeof(buf1), "%s / 0x%04X", tag_buf, enc->codec_tag); |
0 | 846 codec_name = buf1; |
847 } | |
848 | |
849 switch(enc->codec_type) { | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11323
diff
changeset
|
850 case AVMEDIA_TYPE_VIDEO: |
0 | 851 snprintf(buf, buf_size, |
852 "Video: %s%s", | |
1389 | 853 codec_name, enc->mb_decision ? " (hq)" : ""); |
2636
2344c6713011
print pix_fmt if its known instead of if the raw codec is used
michael
parents:
2635
diff
changeset
|
854 if (enc->pix_fmt != PIX_FMT_NONE) { |
55 | 855 snprintf(buf + strlen(buf), buf_size - strlen(buf), |
856 ", %s", | |
988
001b7d3045e5
moved avcodec_get_chroma_sub_sample() to imgconvert.c
bellard
parents:
963
diff
changeset
|
857 avcodec_get_pix_fmt_name(enc->pix_fmt)); |
55 | 858 } |
0 | 859 if (enc->width) { |
860 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
2884
a332778dfa06
print more time_base fps stuff if av_log level is at debug or above
michael
parents:
2881
diff
changeset
|
861 ", %dx%d", |
a332778dfa06
print more time_base fps stuff if av_log level is at debug or above
michael
parents:
2881
diff
changeset
|
862 enc->width, enc->height); |
6466 | 863 if (enc->sample_aspect_ratio.num) { |
6467 | 864 av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den, |
865 enc->width*enc->sample_aspect_ratio.num, | |
866 enc->height*enc->sample_aspect_ratio.den, | |
867 1024*1024); | |
868 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
869 " [PAR %d:%d DAR %d:%d]", | |
870 enc->sample_aspect_ratio.num, enc->sample_aspect_ratio.den, | |
871 display_aspect_ratio.num, display_aspect_ratio.den); | |
6466 | 872 } |
6012 | 873 if(av_log_get_level() >= AV_LOG_DEBUG){ |
8611 | 874 int g= av_gcd(enc->time_base.num, enc->time_base.den); |
2884
a332778dfa06
print more time_base fps stuff if av_log level is at debug or above
michael
parents:
2881
diff
changeset
|
875 snprintf(buf + strlen(buf), buf_size - strlen(buf), |
a332778dfa06
print more time_base fps stuff if av_log level is at debug or above
michael
parents:
2881
diff
changeset
|
876 ", %d/%d", |
a332778dfa06
print more time_base fps stuff if av_log level is at debug or above
michael
parents:
2881
diff
changeset
|
877 enc->time_base.num/g, enc->time_base.den/g); |
a332778dfa06
print more time_base fps stuff if av_log level is at debug or above
michael
parents:
2881
diff
changeset
|
878 } |
0 | 879 } |
741 | 880 if (encode) { |
881 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
882 ", q=%d-%d", enc->qmin, enc->qmax); | |
883 } | |
0 | 884 break; |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11323
diff
changeset
|
885 case AVMEDIA_TYPE_AUDIO: |
0 | 886 snprintf(buf, buf_size, |
887 "Audio: %s", | |
888 codec_name); | |
889 if (enc->sample_rate) { | |
890 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
8098 | 891 ", %d Hz", enc->sample_rate); |
0 | 892 } |
8098 | 893 av_strlcat(buf, ", ", buf_size); |
894 avcodec_get_channel_layout_string(buf + strlen(buf), buf_size - strlen(buf), enc->channels, enc->channel_layout); | |
7454
bb5e8cae1d71
Write sample format description within avcodec_string()
pross
parents:
7409
diff
changeset
|
895 if (enc->sample_fmt != SAMPLE_FMT_NONE) { |
bb5e8cae1d71
Write sample format description within avcodec_string()
pross
parents:
7409
diff
changeset
|
896 snprintf(buf + strlen(buf), buf_size - strlen(buf), |
bb5e8cae1d71
Write sample format description within avcodec_string()
pross
parents:
7409
diff
changeset
|
897 ", %s", avcodec_get_sample_fmt_name(enc->sample_fmt)); |
bb5e8cae1d71
Write sample format description within avcodec_string()
pross
parents:
7409
diff
changeset
|
898 } |
0 | 899 break; |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11323
diff
changeset
|
900 case AVMEDIA_TYPE_DATA: |
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
|
901 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
|
902 break; |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11323
diff
changeset
|
903 case AVMEDIA_TYPE_SUBTITLE: |
2756 | 904 snprintf(buf, buf_size, "Subtitle: %s", codec_name); |
905 break; | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11323
diff
changeset
|
906 case AVMEDIA_TYPE_ATTACHMENT: |
6184 | 907 snprintf(buf, buf_size, "Attachment: %s", codec_name); |
908 break; | |
0 | 909 default: |
2281 | 910 snprintf(buf, buf_size, "Invalid Codec type %d", enc->codec_type); |
911 return; | |
0 | 912 } |
741 | 913 if (encode) { |
914 if (enc->flags & CODEC_FLAG_PASS1) | |
915 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
916 ", pass 1"); | |
917 if (enc->flags & CODEC_FLAG_PASS2) | |
918 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
919 ", pass 2"); | |
920 } | |
11323
7089198d1d10
Make av_get_bit_rate() static and remove av_, the function is only used
cehoyos
parents:
11322
diff
changeset
|
921 bitrate = get_bit_rate(enc); |
92 | 922 if (bitrate != 0) { |
2967 | 923 snprintf(buf + strlen(buf), buf_size - strlen(buf), |
92 | 924 ", %d kb/s", bitrate / 1000); |
0 | 925 } |
926 } | |
927 | |
362 | 928 unsigned avcodec_version( void ) |
929 { | |
930 return LIBAVCODEC_VERSION_INT; | |
931 } | |
55 | 932 |
10764
4546d91de818
Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for XXX_configuration() and
stefano
parents:
10684
diff
changeset
|
933 const char *avcodec_configuration(void) |
10536
046dcf7aa19c
Add functions to return library license and library configuration.
diego
parents:
10505
diff
changeset
|
934 { |
046dcf7aa19c
Add functions to return library license and library configuration.
diego
parents:
10505
diff
changeset
|
935 return FFMPEG_CONFIGURATION; |
046dcf7aa19c
Add functions to return library license and library configuration.
diego
parents:
10505
diff
changeset
|
936 } |
046dcf7aa19c
Add functions to return library license and library configuration.
diego
parents:
10505
diff
changeset
|
937 |
10764
4546d91de818
Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for XXX_configuration() and
stefano
parents:
10684
diff
changeset
|
938 const char *avcodec_license(void) |
10536
046dcf7aa19c
Add functions to return library license and library configuration.
diego
parents:
10505
diff
changeset
|
939 { |
046dcf7aa19c
Add functions to return library license and library configuration.
diego
parents:
10505
diff
changeset
|
940 #define LICENSE_PREFIX "libavcodec license: " |
046dcf7aa19c
Add functions to return library license and library configuration.
diego
parents:
10505
diff
changeset
|
941 return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1; |
046dcf7aa19c
Add functions to return library license and library configuration.
diego
parents:
10505
diff
changeset
|
942 } |
046dcf7aa19c
Add functions to return library license and library configuration.
diego
parents:
10505
diff
changeset
|
943 |
0 | 944 void avcodec_init(void) |
945 { | |
6350 | 946 static int initialized = 0; |
303
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
947 |
6350 | 948 if (initialized != 0) |
2979 | 949 return; |
6350 | 950 initialized = 1; |
303
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
951 |
4197 | 952 dsputil_static_init(); |
0 | 953 } |
954 | |
341 | 955 void avcodec_flush_buffers(AVCodecContext *avctx) |
956 { | |
1368 | 957 if(avctx->codec->flush) |
958 avctx->codec->flush(avctx); | |
341 | 959 } |
960 | |
2231 | 961 void avcodec_default_free_buffers(AVCodecContext *s){ |
1214 | 962 int i, j; |
963 | |
964 if(s->internal_buffer==NULL) return; | |
2967 | 965 |
10398
11b685acd280
Print a warning message when avcodec_default_free_buffers finds unreleased
reimar
parents:
10386
diff
changeset
|
966 if (s->internal_buffer_count) |
11b685acd280
Print a warning message when avcodec_default_free_buffers finds unreleased
reimar
parents:
10386
diff
changeset
|
967 av_log(s, AV_LOG_WARNING, "Found %i unreleased buffers!\n", s->internal_buffer_count); |
1214 | 968 for(i=0; i<INTERNAL_BUFFER_SIZE; i++){ |
969 InternalBuffer *buf= &((InternalBuffer*)s->internal_buffer)[i]; | |
970 for(j=0; j<4; j++){ | |
971 av_freep(&buf->base[j]); | |
972 buf->data[j]= NULL; | |
973 } | |
974 } | |
975 av_freep(&s->internal_buffer); | |
2967 | 976 |
1214 | 977 s->internal_buffer_count=0; |
978 } | |
979 | |
1264 | 980 char av_get_pict_type_char(int pict_type){ |
981 switch(pict_type){ | |
6450 | 982 case FF_I_TYPE: return 'I'; |
983 case FF_P_TYPE: return 'P'; | |
984 case FF_B_TYPE: return 'B'; | |
985 case FF_S_TYPE: return 'S'; | |
986 case FF_SI_TYPE:return 'i'; | |
987 case FF_SP_TYPE:return 'p'; | |
6456 | 988 case FF_BI_TYPE:return 'b'; |
6455 | 989 default: return '?'; |
1264 | 990 } |
991 } | |
992 | |
3433 | 993 int av_get_bits_per_sample(enum CodecID codec_id){ |
994 switch(codec_id){ | |
3435
ffa9e863f3be
simplify the voc demuxer using av_get_bits_per_sample()
aurel
parents:
3433
diff
changeset
|
995 case CODEC_ID_ADPCM_SBPRO_2: |
3438 | 996 return 2; |
3435
ffa9e863f3be
simplify the voc demuxer using av_get_bits_per_sample()
aurel
parents:
3433
diff
changeset
|
997 case CODEC_ID_ADPCM_SBPRO_3: |
3438 | 998 return 3; |
3435
ffa9e863f3be
simplify the voc demuxer using av_get_bits_per_sample()
aurel
parents:
3433
diff
changeset
|
999 case CODEC_ID_ADPCM_SBPRO_4: |
3438 | 1000 case CODEC_ID_ADPCM_CT: |
10779 | 1001 case CODEC_ID_ADPCM_IMA_WAV: |
10777
c4e157b47af5
Handle more ADPCM codecs in av_get_bits_per_sample().
daniel
parents:
10764
diff
changeset
|
1002 case CODEC_ID_ADPCM_MS: |
c4e157b47af5
Handle more ADPCM codecs in av_get_bits_per_sample().
daniel
parents:
10764
diff
changeset
|
1003 case CODEC_ID_ADPCM_YAMAHA: |
3438 | 1004 return 4; |
3433 | 1005 case CODEC_ID_PCM_ALAW: |
1006 case CODEC_ID_PCM_MULAW: | |
1007 case CODEC_ID_PCM_S8: | |
1008 case CODEC_ID_PCM_U8: | |
7475
eaf0ebba81d7
Make avcodec_string() and av_get_bits_per_sample() report the sample size for CODEC_ID_PCM_ZORK
pross
parents:
7454
diff
changeset
|
1009 case CODEC_ID_PCM_ZORK: |
3433 | 1010 return 8; |
1011 case CODEC_ID_PCM_S16BE: | |
1012 case CODEC_ID_PCM_S16LE: | |
5940
d63186919b60
add pcm_s16le_planar support for electronicarts files
aurel
parents:
5837
diff
changeset
|
1013 case CODEC_ID_PCM_S16LE_PLANAR: |
3433 | 1014 case CODEC_ID_PCM_U16BE: |
1015 case CODEC_ID_PCM_U16LE: | |
1016 return 16; | |
1017 case CODEC_ID_PCM_S24DAUD: | |
1018 case CODEC_ID_PCM_S24BE: | |
1019 case CODEC_ID_PCM_S24LE: | |
1020 case CODEC_ID_PCM_U24BE: | |
1021 case CODEC_ID_PCM_U24LE: | |
1022 return 24; | |
1023 case CODEC_ID_PCM_S32BE: | |
1024 case CODEC_ID_PCM_S32LE: | |
1025 case CODEC_ID_PCM_U32BE: | |
1026 case CODEC_ID_PCM_U32LE: | |
7409
21770337ff2d
add CODEC_ID_PCM_F32BE (32-bit floating point PCM big endian decoder)
pross
parents:
7406
diff
changeset
|
1027 case CODEC_ID_PCM_F32BE: |
7613 | 1028 case CODEC_ID_PCM_F32LE: |
3433 | 1029 return 32; |
7613 | 1030 case CODEC_ID_PCM_F64BE: |
1031 case CODEC_ID_PCM_F64LE: | |
1032 return 64; | |
3433 | 1033 default: |
1034 return 0; | |
1035 } | |
1036 } | |
1037 | |
5537 | 1038 int av_get_bits_per_sample_format(enum SampleFormat sample_fmt) { |
1039 switch (sample_fmt) { | |
1040 case SAMPLE_FMT_U8: | |
1041 return 8; | |
1042 case SAMPLE_FMT_S16: | |
1043 return 16; | |
1044 case SAMPLE_FMT_S32: | |
1045 case SAMPLE_FMT_FLT: | |
1046 return 32; | |
7612 | 1047 case SAMPLE_FMT_DBL: |
1048 return 64; | |
5537 | 1049 default: |
1050 return 0; | |
1051 } | |
1052 } | |
1053 | |
8590 | 1054 #if !HAVE_THREADS |
2013
85e547a18d87
dummy avcodec_thread_init() to avoid linking issues
michael
parents:
2002
diff
changeset
|
1055 int avcodec_thread_init(AVCodecContext *s, int thread_count){ |
9545
59073f92f0e2
Make avcodec_thread_init() set the thread count, even in the case when
stefano
parents:
9536
diff
changeset
|
1056 s->thread_count = thread_count; |
2013
85e547a18d87
dummy avcodec_thread_init() to avoid linking issues
michael
parents:
2002
diff
changeset
|
1057 return -1; |
85e547a18d87
dummy avcodec_thread_init() to avoid linking issues
michael
parents:
2002
diff
changeset
|
1058 } |
85e547a18d87
dummy avcodec_thread_init() to avoid linking issues
michael
parents:
2002
diff
changeset
|
1059 #endif |
2676 | 1060 |
1061 unsigned int av_xiphlacing(unsigned char *s, unsigned int v) | |
1062 { | |
1063 unsigned int n = 0; | |
1064 | |
1065 while(v >= 0xff) { | |
1066 *s++ = 0xff; | |
1067 v -= 0xff; | |
1068 n++; | |
1069 } | |
1070 *s = v; | |
1071 n++; | |
1072 return n; | |
1073 } | |
3233
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1074 |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1075 /* Wrapper to work around the lack of mkstemp() on mingw/cygin. |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1076 * Also, tries to create file in /tmp first, if possible. |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1077 * *prefix can be a character constant; *filename will be allocated internally. |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1078 * Returns file descriptor of opened file (or -1 on error) |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1079 * and opened file name in **filename. */ |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1080 int av_tempfile(char *prefix, char **filename) { |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1081 int fd=-1; |
8590 | 1082 #if !HAVE_MKSTEMP |
3233
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1083 *filename = tempnam(".", prefix); |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1084 #else |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1085 size_t len = strlen(prefix) + 12; /* room for "/tmp/" and "XXXXXX\0" */ |
3372 | 1086 *filename = av_malloc(len); |
3233
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1087 #endif |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1088 /* -----common section-----*/ |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1089 if (*filename == NULL) { |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1090 av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot allocate file name\n"); |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1091 return -1; |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1092 } |
8590 | 1093 #if !HAVE_MKSTEMP |
5285 | 1094 fd = open(*filename, O_RDWR | O_BINARY | O_CREAT, 0444); |
3233
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1095 #else |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1096 snprintf(*filename, len, "/tmp/%sXXXXXX", prefix); |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1097 fd = mkstemp(*filename); |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1098 if (fd < 0) { |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1099 snprintf(*filename, len, "./%sXXXXXX", prefix); |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1100 fd = mkstemp(*filename); |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1101 } |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1102 #endif |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1103 /* -----common section-----*/ |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1104 if (fd < 0) { |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1105 av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot open temporary file %s\n", *filename); |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1106 return -1; |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1107 } |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1108 return fd; /* success */ |
18af2f7788c6
- Add new file internal.h for common internal-use-only functions.
corey
parents:
3171
diff
changeset
|
1109 } |
5126
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1110 |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1111 typedef struct { |
5176
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1112 const char *abbr; |
5126
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1113 int width, height; |
5176
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1114 } VideoFrameSizeAbbr; |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1115 |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1116 typedef struct { |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1117 const char *abbr; |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1118 int rate_num, rate_den; |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1119 } VideoFrameRateAbbr; |
5126
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1120 |
7129 | 1121 static const VideoFrameSizeAbbr video_frame_size_abbrs[] = { |
5176
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1122 { "ntsc", 720, 480 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1123 { "pal", 720, 576 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1124 { "qntsc", 352, 240 }, /* VCD compliant NTSC */ |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1125 { "qpal", 352, 288 }, /* VCD compliant PAL */ |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1126 { "sntsc", 640, 480 }, /* square pixel NTSC */ |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1127 { "spal", 768, 576 }, /* square pixel PAL */ |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1128 { "film", 352, 240 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1129 { "ntsc-film", 352, 240 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1130 { "sqcif", 128, 96 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1131 { "qcif", 176, 144 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1132 { "cif", 352, 288 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1133 { "4cif", 704, 576 }, |
9328
6a1ad1d933cd
Add 16cif video frame size abbreviation. i.e. -s alias for 1408x1152.
gb
parents:
9193
diff
changeset
|
1134 { "16cif", 1408,1152 }, |
5176
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1135 { "qqvga", 160, 120 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1136 { "qvga", 320, 240 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1137 { "vga", 640, 480 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1138 { "svga", 800, 600 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1139 { "xga", 1024, 768 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1140 { "uxga", 1600,1200 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1141 { "qxga", 2048,1536 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1142 { "sxga", 1280,1024 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1143 { "qsxga", 2560,2048 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1144 { "hsxga", 5120,4096 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1145 { "wvga", 852, 480 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1146 { "wxga", 1366, 768 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1147 { "wsxga", 1600,1024 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1148 { "wuxga", 1920,1200 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1149 { "woxga", 2560,1600 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1150 { "wqsxga", 3200,2048 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1151 { "wquxga", 3840,2400 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1152 { "whsxga", 6400,4096 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1153 { "whuxga", 7680,4800 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1154 { "cga", 320, 200 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1155 { "ega", 640, 350 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1156 { "hd480", 852, 480 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1157 { "hd720", 1280, 720 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1158 { "hd1080", 1920,1080 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1159 }; |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1160 |
7129 | 1161 static const VideoFrameRateAbbr video_frame_rate_abbrs[]= { |
5176
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1162 { "ntsc", 30000, 1001 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1163 { "pal", 25, 1 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1164 { "qntsc", 30000, 1001 }, /* VCD compliant NTSC */ |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1165 { "qpal", 25, 1 }, /* VCD compliant PAL */ |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1166 { "sntsc", 30000, 1001 }, /* square pixel NTSC */ |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1167 { "spal", 25, 1 }, /* square pixel PAL */ |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1168 { "film", 24, 1 }, |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1169 { "ntsc-film", 24000, 1001 }, |
5126
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1170 }; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1171 |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1172 int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str) |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1173 { |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1174 int i; |
8042 | 1175 int n = FF_ARRAY_ELEMS(video_frame_size_abbrs); |
8757
d529e239a510
Remove 'const' qualifier from variable in av_parse_video_frame_size().
bcoudurier
parents:
8756
diff
changeset
|
1176 char *p; |
5126
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1177 int frame_width = 0, frame_height = 0; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1178 |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1179 for(i=0;i<n;i++) { |
5176
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1180 if (!strcmp(video_frame_size_abbrs[i].abbr, str)) { |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1181 frame_width = video_frame_size_abbrs[i].width; |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1182 frame_height = video_frame_size_abbrs[i].height; |
5126
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1183 break; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1184 } |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1185 } |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1186 if (i == n) { |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1187 p = str; |
8757
d529e239a510
Remove 'const' qualifier from variable in av_parse_video_frame_size().
bcoudurier
parents:
8756
diff
changeset
|
1188 frame_width = strtol(p, &p, 10); |
5126
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1189 if (*p) |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1190 p++; |
8757
d529e239a510
Remove 'const' qualifier from variable in av_parse_video_frame_size().
bcoudurier
parents:
8756
diff
changeset
|
1191 frame_height = strtol(p, &p, 10); |
5126
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1192 } |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1193 if (frame_width <= 0 || frame_height <= 0) |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1194 return -1; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1195 *width_ptr = frame_width; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1196 *height_ptr = frame_height; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1197 return 0; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1198 } |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1199 |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1200 int av_parse_video_frame_rate(AVRational *frame_rate, const char *arg) |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1201 { |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1202 int i; |
8042 | 1203 int n = FF_ARRAY_ELEMS(video_frame_rate_abbrs); |
5126
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1204 char* cp; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1205 |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1206 /* First, we check our abbreviation table */ |
5176
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1207 for (i = 0; i < n; ++i) |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1208 if (!strcmp(video_frame_rate_abbrs[i].abbr, arg)) { |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1209 frame_rate->num = video_frame_rate_abbrs[i].rate_num; |
82f7eaa32f46
split frame rate and frame size abbreviation into two structures
benoit
parents:
5127
diff
changeset
|
1210 frame_rate->den = video_frame_rate_abbrs[i].rate_den; |
5126
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1211 return 0; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1212 } |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1213 |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1214 /* Then, we try to parse it as fraction */ |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1215 cp = strchr(arg, '/'); |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1216 if (!cp) |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1217 cp = strchr(arg, ':'); |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1218 if (cp) { |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1219 char* cpp; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1220 frame_rate->num = strtol(arg, &cpp, 10); |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1221 if (cpp != arg || cpp == cp) |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1222 frame_rate->den = strtol(cp+1, &cpp, 10); |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1223 else |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1224 frame_rate->num = 0; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1225 } |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1226 else { |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1227 /* Finally we give up and parse it as double */ |
7826 | 1228 AVRational time_base = av_d2q(strtod(arg, 0), 1001000); |
5126
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1229 frame_rate->den = time_base.den; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1230 frame_rate->num = time_base.num; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1231 } |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1232 if (!frame_rate->num || !frame_rate->den) |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1233 return -1; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1234 else |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1235 return 0; |
7982b376b58a
Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents:
4986
diff
changeset
|
1236 } |
7530
398636f16e7e
Add a generic function to lavc to log messages about missing features.
superdump
parents:
7475
diff
changeset
|
1237 |
10832
f20726a6d538
Add a function to match a 2 element vector of uint16_t and use it in h263 and svq1
michael
parents:
10779
diff
changeset
|
1238 int ff_match_2uint16(const uint16_t (*tab)[2], int size, int a, int b){ |
f20726a6d538
Add a function to match a 2 element vector of uint16_t and use it in h263 and svq1
michael
parents:
10779
diff
changeset
|
1239 int i; |
f20726a6d538
Add a function to match a 2 element vector of uint16_t and use it in h263 and svq1
michael
parents:
10779
diff
changeset
|
1240 for(i=0; i<size && !(tab[i][0]==a && tab[i][1]==b); i++); |
f20726a6d538
Add a function to match a 2 element vector of uint16_t and use it in h263 and svq1
michael
parents:
10779
diff
changeset
|
1241 return i; |
f20726a6d538
Add a function to match a 2 element vector of uint16_t and use it in h263 and svq1
michael
parents:
10779
diff
changeset
|
1242 } |
f20726a6d538
Add a function to match a 2 element vector of uint16_t and use it in h263 and svq1
michael
parents:
10779
diff
changeset
|
1243 |
9891
7ad7d4094d1f
Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents:
9787
diff
changeset
|
1244 void av_log_missing_feature(void *avc, const char *feature, int want_sample) |
7530
398636f16e7e
Add a generic function to lavc to log messages about missing features.
superdump
parents:
7475
diff
changeset
|
1245 { |
398636f16e7e
Add a generic function to lavc to log messages about missing features.
superdump
parents:
7475
diff
changeset
|
1246 av_log(avc, AV_LOG_WARNING, "%s not implemented. Update your FFmpeg " |
398636f16e7e
Add a generic function to lavc to log messages about missing features.
superdump
parents:
7475
diff
changeset
|
1247 "version to the newest one from SVN. If the problem still " |
398636f16e7e
Add a generic function to lavc to log messages about missing features.
superdump
parents:
7475
diff
changeset
|
1248 "occurs, it means that your file has a feature which has not " |
398636f16e7e
Add a generic function to lavc to log messages about missing features.
superdump
parents:
7475
diff
changeset
|
1249 "been implemented.", feature); |
398636f16e7e
Add a generic function to lavc to log messages about missing features.
superdump
parents:
7475
diff
changeset
|
1250 if(want_sample) |
9891
7ad7d4094d1f
Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents:
9787
diff
changeset
|
1251 av_log_ask_for_sample(avc, NULL); |
8603
555c2ab21d84
Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents:
8596
diff
changeset
|
1252 else |
555c2ab21d84
Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents:
8596
diff
changeset
|
1253 av_log(avc, AV_LOG_WARNING, "\n"); |
7530
398636f16e7e
Add a generic function to lavc to log messages about missing features.
superdump
parents:
7475
diff
changeset
|
1254 } |
8603
555c2ab21d84
Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents:
8596
diff
changeset
|
1255 |
9891
7ad7d4094d1f
Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents:
9787
diff
changeset
|
1256 void av_log_ask_for_sample(void *avc, const char *msg) |
8603
555c2ab21d84
Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents:
8596
diff
changeset
|
1257 { |
555c2ab21d84
Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents:
8596
diff
changeset
|
1258 if (msg) |
555c2ab21d84
Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents:
8596
diff
changeset
|
1259 av_log(avc, AV_LOG_WARNING, "%s ", msg); |
555c2ab21d84
Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents:
8596
diff
changeset
|
1260 av_log(avc, AV_LOG_WARNING, "If you want to help, upload a sample " |
555c2ab21d84
Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents:
8596
diff
changeset
|
1261 "of this file to ftp://upload.ffmpeg.org/MPlayer/incoming/ " |
555c2ab21d84
Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents:
8596
diff
changeset
|
1262 "and contact the ffmpeg-devel mailing list.\n"); |
555c2ab21d84
Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents:
8596
diff
changeset
|
1263 } |
9030 | 1264 |
1265 static AVHWAccel *first_hwaccel = NULL; | |
1266 | |
1267 void av_register_hwaccel(AVHWAccel *hwaccel) | |
1268 { | |
1269 AVHWAccel **p = &first_hwaccel; | |
1270 while (*p) | |
1271 p = &(*p)->next; | |
1272 *p = hwaccel; | |
1273 hwaccel->next = NULL; | |
1274 } | |
9031 | 1275 |
1276 AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel) | |
1277 { | |
1278 return hwaccel ? hwaccel->next : first_hwaccel; | |
1279 } | |
9032 | 1280 |
1281 AVHWAccel *ff_find_hwaccel(enum CodecID codec_id, enum PixelFormat pix_fmt) | |
1282 { | |
1283 AVHWAccel *hwaccel=NULL; | |
1284 | |
1285 while((hwaccel= av_hwaccel_next(hwaccel))){ | |
1286 if ( hwaccel->id == codec_id | |
1287 && hwaccel->pix_fmt == pix_fmt) | |
1288 return hwaccel; | |
1289 } | |
1290 return NULL; | |
1291 } | |
9742 | 1292 |
1293 int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)) | |
1294 { | |
1295 if (ff_lockmgr_cb) { | |
1296 if (ff_lockmgr_cb(&codec_mutex, AV_LOCK_DESTROY)) | |
1297 return -1; | |
1298 } | |
1299 | |
1300 ff_lockmgr_cb = cb; | |
1301 | |
1302 if (ff_lockmgr_cb) { | |
1303 if (ff_lockmgr_cb(&codec_mutex, AV_LOCK_CREATE)) | |
1304 return -1; | |
1305 } | |
1306 return 0; | |
1307 } | |
11742
a37818ac3817
Factorize some code into the new function ff_toupper4().
cehoyos
parents:
11712
diff
changeset
|
1308 |
a37818ac3817
Factorize some code into the new function ff_toupper4().
cehoyos
parents:
11712
diff
changeset
|
1309 unsigned int ff_toupper4(unsigned int x) |
a37818ac3817
Factorize some code into the new function ff_toupper4().
cehoyos
parents:
11712
diff
changeset
|
1310 { |
a37818ac3817
Factorize some code into the new function ff_toupper4().
cehoyos
parents:
11712
diff
changeset
|
1311 return toupper( x &0xFF) |
a37818ac3817
Factorize some code into the new function ff_toupper4().
cehoyos
parents:
11712
diff
changeset
|
1312 + (toupper((x>>8 )&0xFF)<<8 ) |
a37818ac3817
Factorize some code into the new function ff_toupper4().
cehoyos
parents:
11712
diff
changeset
|
1313 + (toupper((x>>16)&0xFF)<<16) |
a37818ac3817
Factorize some code into the new function ff_toupper4().
cehoyos
parents:
11712
diff
changeset
|
1314 + (toupper((x>>24)&0xFF)<<24); |
a37818ac3817
Factorize some code into the new function ff_toupper4().
cehoyos
parents:
11712
diff
changeset
|
1315 } |