annotate utils.c @ 12404:86f5aff0f8e8 libavcodec

removed an unnecessary blank line
author bindhammer
date Mon, 23 Aug 2010 13:19:48 +0000
parents 914f484bb476
children ffb3668ff7af
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
16 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
17 *
429
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
21 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
22
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
23 /**
11644
7dd2a45249a9 Remove explicit filename from Doxygen @file commands.
diego
parents: 11629
diff changeset
24 * @file
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
25 * utils.
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
26 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
27
8110
f5298dd1e61c Add missing #include "libavutil/avstring.h", fixes
diego
parents: 8098
diff changeset
28 #include "libavutil/avstring.h"
6763
f7cbb7733146 Use full path for #includes from another directory.
diego
parents: 6541
diff changeset
29 #include "libavutil/integer.h"
f7cbb7733146 Use full path for #includes from another directory.
diego
parents: 6541
diff changeset
30 #include "libavutil/crc.h"
11311
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
31 #include "libavutil/pixdesc.h"
12320
035ca6548e29 Use av_fill_image_pointers/linesizes in place of ff_fill_pointer/linesize,
stefano
parents: 12280
diff changeset
32 #include "libavcore/imgutils.h"
394
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
33 #include "avcodec.h"
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
34 #include "dsputil.h"
2880
4d91f38477ee dont include opt.h in avcodec.h
michael
parents: 2879
diff changeset
35 #include "opt.h"
6360
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
36 #include "imgconvert.h"
7454
bb5e8cae1d71 Write sample format description within avcodec_string()
pross
parents: 7409
diff changeset
37 #include "audioconvert.h"
8603
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
38 #include "internal.h"
7576
e50e9def7428 ensure we get explicit definition of various _XOPEN_SOURCE functions we use
aurel
parents: 7530
diff changeset
39 #include <stdlib.h>
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1588
diff changeset
40 #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
41 #include <limits.h>
2862
f4aea2c316cc AVOption first try
michael
parents: 2856
diff changeset
42 #include <float.h>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
43
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
44 static int volatile entangled_thread_counter=0;
9742
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
45 int (*ff_lockmgr_cb)(void **mutex, enum AVLockOp op);
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
46 static void *codec_mutex;
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
47
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1032
diff changeset
48 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
49 {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
50 if(min_size < *size)
1031
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
51 return ptr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
52
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
53 *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
54
6532
8aafb712389e Fix possible heap overflow caused by av_fast_realloc()
michael
parents: 6488
diff changeset
55 ptr= av_realloc(ptr, *size);
8aafb712389e Fix possible heap overflow caused by av_fast_realloc()
michael
parents: 6488
diff changeset
56 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
57 *size= 0;
8aafb712389e Fix possible heap overflow caused by av_fast_realloc()
michael
parents: 6488
diff changeset
58
8aafb712389e Fix possible heap overflow caused by av_fast_realloc()
michael
parents: 6488
diff changeset
59 return ptr;
1031
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
60 }
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
61
9415
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9379
diff changeset
62 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
63 {
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9379
diff changeset
64 void **p = ptr;
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9379
diff changeset
65 if (min_size < *size)
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9379
diff changeset
66 return;
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9379
diff changeset
67 *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
68 av_free(*p);
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9379
diff changeset
69 *p = av_malloc(*size);
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9379
diff changeset
70 if (!*p) *size = 0;
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9379
diff changeset
71 }
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9379
diff changeset
72
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
73 /* encoder management */
7992
b5f5257c0c70 Mark list heads static. Patch by Diego Petten
lu_zero
parents: 7983
diff changeset
74 static AVCodec *first_avcodec = NULL;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
75
6011
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 5979
diff changeset
76 AVCodec *av_codec_next(AVCodec *c){
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 5979
diff changeset
77 if(c) return c->next;
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 5979
diff changeset
78 else return first_avcodec;
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 5979
diff changeset
79 }
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 5979
diff changeset
80
8750
2528b6a2b5d3 Rename register_avcodec() as avcodec_register() and deprecate the old
stefano
parents: 8748
diff changeset
81 void avcodec_register(AVCodec *codec)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
82 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
83 AVCodec **p;
8325
0b905a126bc9 Make register_avcodec() call avcodec_init().
stefano
parents: 8324
diff changeset
84 avcodec_init();
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
85 p = &first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
86 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
87 *p = codec;
343f0476fd1d Use a more explicit "codec" rather than "format" as the parameter of
stefano
parents: 8281
diff changeset
88 codec->next = NULL;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
89 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
90
8752
7fd1422a8703 Drop the deprecated function register_avcodec() at the next major
stefano
parents: 8750
diff changeset
91 #if LIBAVCODEC_VERSION_MAJOR < 53
8750
2528b6a2b5d3 Rename register_avcodec() as avcodec_register() and deprecate the old
stefano
parents: 8748
diff changeset
92 void register_avcodec(AVCodec *codec)
2528b6a2b5d3 Rename register_avcodec() as avcodec_register() and deprecate the old
stefano
parents: 8748
diff changeset
93 {
2528b6a2b5d3 Rename register_avcodec() as avcodec_register() and deprecate the old
stefano
parents: 8748
diff changeset
94 avcodec_register(codec);
2528b6a2b5d3 Rename register_avcodec() as avcodec_register() and deprecate the old
stefano
parents: 8748
diff changeset
95 }
8752
7fd1422a8703 Drop the deprecated function register_avcodec() at the next major
stefano
parents: 8750
diff changeset
96 #endif
8750
2528b6a2b5d3 Rename register_avcodec() as avcodec_register() and deprecate the old
stefano
parents: 8748
diff changeset
97
11567
1025297f5624 Add function to export EDGE_WIDTH from libavcodec.
koorogi
parents: 11560
diff changeset
98 unsigned avcodec_get_edge_width(void)
1025297f5624 Add function to export EDGE_WIDTH from libavcodec.
koorogi
parents: 11560
diff changeset
99 {
1025297f5624 Add function to export EDGE_WIDTH from libavcodec.
koorogi
parents: 11560
diff changeset
100 return EDGE_WIDTH;
1025297f5624 Add function to export EDGE_WIDTH from libavcodec.
koorogi
parents: 11560
diff changeset
101 }
1025297f5624 Add function to export EDGE_WIDTH from libavcodec.
koorogi
parents: 11560
diff changeset
102
2270
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
103 void avcodec_set_dimensions(AVCodecContext *s, int width, int height){
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
104 s->coded_width = width;
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
105 s->coded_height= height;
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
106 s->width = -((-width )>>s->lowres);
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
107 s->height= -((-height)>>s->lowres);
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
108 }
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
109
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
110 typedef struct InternalBuffer{
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
111 int last_pic_num;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
112 uint8_t *base[4];
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
113 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
114 int linesize[4];
5522
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
115 int width, height;
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
116 enum PixelFormat pix_fmt;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
117 }InternalBuffer;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
118
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
119 #define INTERNAL_BUFFER_SIZE 32
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
120
11311
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
121 void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int linesize_align[4]){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
122 int w_align= 1;
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
123 int h_align= 1;
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
124
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
125 switch(s->pix_fmt){
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
126 case PIX_FMT_YUV420P:
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4453
diff changeset
127 case PIX_FMT_YUYV422:
2137
ef47c0b1ff28 UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents: 2125
diff changeset
128 case PIX_FMT_UYVY422:
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
129 case PIX_FMT_YUV422P:
10549
981e7720fc03 Allocate pictures with enough padding for jpeg.
michael
parents: 10536
diff changeset
130 case PIX_FMT_YUV440P:
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
131 case PIX_FMT_YUV444P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
132 case PIX_FMT_GRAY8:
4066
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 4030
diff changeset
133 case PIX_FMT_GRAY16BE:
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 4030
diff changeset
134 case PIX_FMT_GRAY16LE:
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
135 case PIX_FMT_YUVJ420P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
136 case PIX_FMT_YUVJ422P:
10549
981e7720fc03 Allocate pictures with enough padding for jpeg.
michael
parents: 10536
diff changeset
137 case PIX_FMT_YUVJ440P:
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
138 case PIX_FMT_YUVJ444P:
5706
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5576
diff changeset
139 case PIX_FMT_YUVA420P:
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
140 w_align= 16; //FIXME check for non mpeg style codecs and use less alignment
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
141 h_align= 16;
10549
981e7720fc03 Allocate pictures with enough padding for jpeg.
michael
parents: 10536
diff changeset
142 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
143 h_align= 32; // interlaced is rounded up to 2 MBs
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
144 break;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
145 case PIX_FMT_YUV411P:
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4453
diff changeset
146 case PIX_FMT_UYYVYY411:
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
147 w_align=32;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
148 h_align=8;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
149 break;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
150 case PIX_FMT_YUV410P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
151 if(s->codec_id == CODEC_ID_SVQ1){
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
152 w_align=64;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
153 h_align=64;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
154 }
2104
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
155 case PIX_FMT_RGB555:
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
156 if(s->codec_id == CODEC_ID_RPZA){
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
157 w_align=4;
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
158 h_align=4;
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
159 }
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
160 case PIX_FMT_PAL8:
8748
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
161 case PIX_FMT_BGR8:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
162 case PIX_FMT_RGB8:
2104
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
163 if(s->codec_id == CODEC_ID_SMC){
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
164 w_align=4;
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
165 h_align=4;
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
166 }
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
167 break;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
168 case PIX_FMT_BGR24:
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
169 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
170 w_align=4;
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
171 h_align=4;
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
172 }
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
173 break;
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
174 default:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
175 w_align= 1;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
176 h_align= 1;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
177 break;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
178 }
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
179
9686
bc32976d6d9d Move ALIGN macro to libavutil/common.h and use it in various places
conrad
parents: 9545
diff changeset
180 *width = FFALIGN(*width , w_align);
bc32976d6d9d Move ALIGN macro to libavutil/common.h and use it in various places
conrad
parents: 9545
diff changeset
181 *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
182 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
183 *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
184
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
185 linesize_align[0] =
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
186 linesize_align[1] =
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
187 linesize_align[2] =
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
188 linesize_align[3] = STRIDE_ALIGN;
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
189 //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
190 //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
191 //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
192 //pretty and better ideas are welcome!
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
193 #if HAVE_MMX
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
194 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
195 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
196 s->codec_id == CODEC_ID_VP6A) {
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
197 linesize_align[0] =
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
198 linesize_align[1] =
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
199 linesize_align[2] = 16;
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
200 }
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
201 #endif
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
202 }
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
203
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
204 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
205 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
206 int linesize_align[4];
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
207 int align;
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
208 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
209 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
210 linesize_align[1] <<= chroma_shift;
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
211 linesize_align[2] <<= chroma_shift;
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
212 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
213 *width=FFALIGN(*width, align);
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
214 }
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
215
12371
5dffb531b1cc Deprecate avcodec_check_dimensions() in favor of the new function
stefano
parents: 12320
diff changeset
216 #if LIBAVCODEC_VERSION_MAJOR < 53
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
217 int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h){
12371
5dffb531b1cc Deprecate avcodec_check_dimensions() in favor of the new function
stefano
parents: 12320
diff changeset
218 return av_check_image_size(w, h, 0, av_log_ctx);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
219 }
12371
5dffb531b1cc Deprecate avcodec_check_dimensions() in favor of the new function
stefano
parents: 12320
diff changeset
220 #endif
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
221
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
222 int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
223 int i;
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
224 int w= s->width;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
225 int h= s->height;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
226 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
227 int *picture_number;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
228
4453
22827cd6b228 Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents: 4351
diff changeset
229 if(pic->data[0]!=NULL) {
22827cd6b228 Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents: 4351
diff changeset
230 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
231 return -1;
22827cd6b228 Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents: 4351
diff changeset
232 }
22827cd6b228 Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents: 4351
diff changeset
233 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
234 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
235 return -1;
22827cd6b228 Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents: 4351
diff changeset
236 }
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
237
12372
914f484bb476 Remove use of the deprecated function avcodec_check_dimensions(), use
stefano
parents: 12371
diff changeset
238 if(av_check_image_size(w, h, 0, s))
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
239 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
240
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
241 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
242 s->internal_buffer= av_mallocz((INTERNAL_BUFFER_SIZE+1)*sizeof(InternalBuffer));
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
243 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
244 #if 0
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
245 s->internal_buffer= av_fast_realloc(
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
246 s->internal_buffer,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
247 &s->internal_buffer_size,
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
248 sizeof(InternalBuffer)*FFMAX(99, s->internal_buffer_count+1)/*FIXME*/
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
249 );
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
250 #endif
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
251
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
252 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
253 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
254 (*picture_number)++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
255
5522
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
256 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
257 for(i=0; i<4; i++){
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
258 av_freep(&buf->base[i]);
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
259 buf->data[i]= NULL;
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
260 }
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
261 }
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
262
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
263 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
264 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
265 buf->last_pic_num= *picture_number;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
266 }else{
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
267 int h_chroma_shift, v_chroma_shift;
6360
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
268 int size[4] = {0};
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
269 int tmpsize;
9192
6faca73d75cc Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents: 9032
diff changeset
270 int unaligned;
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
271 AVPicture picture;
7941
8a3f24796fa9 Replace second (and wrong) call to avcodec_align_dimensions() by adjusting
michael
parents: 7936
diff changeset
272 int stride_align[4];
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
273
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
274 avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift);
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
275
11311
ee2e050815be Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding
reimar
parents: 11223
diff changeset
276 avcodec_align_dimensions2(s, &w, &h, stride_align);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
277
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
278 if(!(s->flags&CODEC_FLAG_EMU_EDGE)){
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
279 w+= EDGE_WIDTH*2;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
280 h+= EDGE_WIDTH*2;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
281 }
4986
270e6cce0be3 fix a crash with svq1 + sse2.
lorenm
parents: 4891
diff changeset
282
9192
6faca73d75cc Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents: 9032
diff changeset
283 do {
6faca73d75cc Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents: 9032
diff changeset
284 // 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
285 // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2
12320
035ca6548e29 Use av_fill_image_pointers/linesizes in place of ff_fill_pointer/linesize,
stefano
parents: 12280
diff changeset
286 av_fill_image_linesizes(picture.linesize, s->pix_fmt, w);
9192
6faca73d75cc Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents: 9032
diff changeset
287 // 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
288 w += w & ~(w-1);
6360
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
289
9192
6faca73d75cc Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents: 9032
diff changeset
290 unaligned = 0;
9193
9fd579338f23 Fix indentation after r18047.
reimar
parents: 9192
diff changeset
291 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
292 unaligned |= picture.linesize[i] % stride_align[i];
9193
9fd579338f23 Fix indentation after r18047.
reimar
parents: 9192
diff changeset
293 }
9192
6faca73d75cc Change linesize alignment method to ensure that linesize[0] == 2*linesize[1]
reimar
parents: 9032
diff changeset
294 } while (unaligned);
6360
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
295
12320
035ca6548e29 Use av_fill_image_pointers/linesizes in place of ff_fill_pointer/linesize,
stefano
parents: 12280
diff changeset
296 tmpsize = av_fill_image_pointers(picture.data, s->pix_fmt, h, NULL, picture.linesize);
9014
1de11a984fc6 Check return value of ff_fill_pointer in avcodec_default_get_buffer,
reimar
parents: 9011
diff changeset
297 if (tmpsize < 0)
1de11a984fc6 Check return value of ff_fill_pointer in avcodec_default_get_buffer,
reimar
parents: 9011
diff changeset
298 return -1;
6360
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
299
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
300 for (i=0; i<3 && picture.data[i+1]; i++)
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
301 size[i] = picture.data[i+1] - picture.data[i];
6390
27a6801cbb27 Fix bug I introduced in r11962.
vitor
parents: 6388
diff changeset
302 size[i] = tmpsize - (picture.data[i] - picture.data[0]);
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
303
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
304 buf->last_pic_num= -256*256*256*64;
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
305 memset(buf->base, 0, sizeof(buf->base));
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
306 memset(buf->data, 0, sizeof(buf->data));
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
307
5706
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5576
diff changeset
308 for(i=0; i<4 && size[i]; i++){
1165
michaelni
parents: 1150
diff changeset
309 const int h_shift= i==0 ? 0 : h_chroma_shift;
michaelni
parents: 1150
diff changeset
310 const int v_shift= i==0 ? 0 : v_chroma_shift;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
311
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
312 buf->linesize[i]= picture.linesize[i];
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
313
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
314 buf->base[i]= av_malloc(size[i]+16); //FIXME 16
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
315 if(buf->base[i]==NULL) return -1;
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
316 memset(buf->base[i], 128, size[i]);
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
317
11781
22b17f922f2b Cosmetics : Fix typo.
jai_menon
parents: 11771
diff changeset
318 // 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
319 if((s->flags&CODEC_FLAG_EMU_EDGE) || !size[2])
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
320 buf->data[i] = buf->base[i];
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
321 else
9686
bc32976d6d9d Move ALIGN macro to libavutil/common.h and use it in various places
conrad
parents: 9545
diff changeset
322 buf->data[i] = buf->base[i] + FFALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), stride_align[i]);
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
323 }
8748
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
324 if(size[1] && !size[2])
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
325 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
326 buf->width = s->width;
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
327 buf->height = s->height;
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
328 buf->pix_fmt= s->pix_fmt;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
329 pic->age= 256*256*256*64;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
330 }
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
331 pic->type= FF_BUFFER_TYPE_INTERNAL;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
332
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
333 for(i=0; i<4; i++){
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
334 pic->base[i]= buf->base[i];
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
335 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
336 pic->linesize[i]= buf->linesize[i];
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
337 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
338 s->internal_buffer_count++;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
339
7631
b5b4bf0944b8 Provide a simpler way for the user to reorder her timestamps.
michael
parents: 7613
diff changeset
340 pic->reordered_opaque= s->reordered_opaque;
b5b4bf0944b8 Provide a simpler way for the user to reorder her timestamps.
michael
parents: 7613
diff changeset
341
7406
7b2819083061 Add a new -debug option for tracing calls to the default get/release_buffer functions.
astrange
parents: 7331
diff changeset
342 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
343 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
344
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
345 return 0;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
346 }
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
347
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
348 void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic){
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
349 int i;
4558
4d1b45b20f8c simplify release_buffer using FFSWAP
aurel
parents: 4552
diff changeset
350 InternalBuffer *buf, *last;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
351
924
3814e9115672 cleanup / messup?
michaelni
parents: 908
diff changeset
352 assert(pic->type==FF_BUFFER_TYPE_INTERNAL);
1396
e380ac39024a cleanup / fixes
michaelni
parents: 1389
diff changeset
353 assert(s->internal_buffer_count);
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
354
1455
c4539ef4d8cb removed warnings
bellard
parents: 1449
diff changeset
355 buf = NULL; /* avoids warning */
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
356 for(i=0; i<s->internal_buffer_count; i++){ //just 3-5 checks so is not worth to optimize
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
357 buf= &((InternalBuffer*)s->internal_buffer)[i];
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
358 if(buf->data[0] == pic->data[0])
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
359 break;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
360 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
361 assert(i < s->internal_buffer_count);
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
362 s->internal_buffer_count--;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
363 last = &((InternalBuffer*)s->internal_buffer)[s->internal_buffer_count];
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
364
4558
4d1b45b20f8c simplify release_buffer using FFSWAP
aurel
parents: 4552
diff changeset
365 FFSWAP(InternalBuffer, *buf, *last);
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
366
5706
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5576
diff changeset
367 for(i=0; i<4; i++){
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
368 pic->data[i]=NULL;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
369 // pic->base[i]=NULL;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
370 }
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
371 //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
372
7b2819083061 Add a new -debug option for tracing calls to the default get/release_buffer functions.
astrange
parents: 7331
diff changeset
373 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
374 av_log(s, AV_LOG_DEBUG, "default_release_buffer called on pic %p, %d buffers used\n", pic, s->internal_buffer_count);
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
375 }
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
376
1630
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
377 int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
378 AVFrame temp_pic;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
379 int i;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
380
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
381 /* If no picture return a new buffer */
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
382 if(pic->data[0] == NULL) {
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
383 /* We will copy from buffer, so must be readable */
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
384 pic->buffer_hints |= FF_BUFFER_HINTS_READABLE;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
385 return s->get_buffer(s, pic);
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
386 }
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
387
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
388 /* 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
389 if(pic->type == FF_BUFFER_TYPE_INTERNAL) {
7e316791ac7b Set reordered_opaque in default_reget_buffer() with internal buffers.
michael
parents: 10550
diff changeset
390 pic->reordered_opaque= s->reordered_opaque;
1630
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
391 return 0;
10684
7e316791ac7b Set reordered_opaque in default_reget_buffer() with internal buffers.
michael
parents: 10550
diff changeset
392 }
1630
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
393
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
394 /*
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
395 * Not internal type and reget_buffer not overridden, emulate cr buffer
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
396 */
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
397 temp_pic = *pic;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
398 for(i = 0; i < 4; i++)
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
399 pic->data[i] = pic->base[i] = NULL;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
400 pic->opaque = NULL;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
401 /* Allocate new frame */
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
402 if (s->get_buffer(s, pic))
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
403 return -1;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
404 /* 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
405 av_picture_copy((AVPicture*)pic, (AVPicture*)&temp_pic, s->pix_fmt, s->width,
1630
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
406 s->height);
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
407 s->release_buffer(s, &temp_pic); // Release old frame
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
408 return 0;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
409 }
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
410
8129
a9734fe0811e Making it easier to send arbitrary structures as work orders to MT workers
romansh
parents: 8110
diff changeset
411 int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
412 int i;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
413
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
414 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
415 int r= func(c, (char*)arg + i*size);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
416 if(ret) ret[i]= r;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
417 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
418 return 0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
419 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
420
10386
98501365c3aa Add an execute2 function that is more flexible and allows to use parallel
reimar
parents: 10345
diff changeset
421 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
422 int i;
98501365c3aa Add an execute2 function that is more flexible and allows to use parallel
reimar
parents: 10345
diff changeset
423
98501365c3aa Add an execute2 function that is more flexible and allows to use parallel
reimar
parents: 10345
diff changeset
424 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
425 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
426 if(ret) ret[i]= r;
98501365c3aa Add an execute2 function that is more flexible and allows to use parallel
reimar
parents: 10345
diff changeset
427 }
98501365c3aa Add an execute2 function that is more flexible and allows to use parallel
reimar
parents: 10345
diff changeset
428 return 0;
98501365c3aa Add an execute2 function that is more flexible and allows to use parallel
reimar
parents: 10345
diff changeset
429 }
98501365c3aa Add an execute2 function that is more flexible and allows to use parallel
reimar
parents: 10345
diff changeset
430
9011
90c99bda19f5 Approved hunks for VAAPI / our new shiny hwaccel API
michael
parents: 8772
diff changeset
431 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
432 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
433 ++fmt;
998
6129c88a6393 get_format()
michaelni
parents: 992
diff changeset
434 return fmt[0];
6129c88a6393 get_format()
michaelni
parents: 992
diff changeset
435 }
6129c88a6393 get_format()
michaelni
parents: 992
diff changeset
436
1831
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
437 void avcodec_get_frame_defaults(AVFrame *pic){
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
438 memset(pic, 0, sizeof(AVFrame));
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
439
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
440 pic->pts= AV_NOPTS_VALUE;
2488
8dd4672b9f74 make keyframe default for AVFrames
michael
parents: 2453
diff changeset
441 pic->key_frame= 1;
1831
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
442 }
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
443
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
444 AVFrame *avcodec_alloc_frame(void){
1831
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
445 AVFrame *pic= av_malloc(sizeof(AVFrame));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
446
1831
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
447 if(pic==NULL) return NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
448
1831
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
449 avcodec_get_frame_defaults(pic);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
450
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
451 return pic;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
452 }
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
453
5542
b0a566346fb1 Add attribute that forces alignment of stack to functions that need it.
ramiro
parents: 5537
diff changeset
454 int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
455 {
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
456 int ret= -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
457
9742
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
458 /* If there is a user-supplied mutex locking routine, call it. */
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
459 if (ff_lockmgr_cb) {
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
460 if ((*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN))
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
461 return -1;
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
462 }
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
463
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
464 entangled_thread_counter++;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
465 if(entangled_thread_counter != 1){
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
466 av_log(avctx, AV_LOG_ERROR, "insufficient thread locking around avcodec_open/close()\n");
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
467 goto end;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
468 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
469
6069
3670c9e7ff4d Check for avcodec_open codec parameter == NULL and return error in that case
reimar
parents: 6047
diff changeset
470 if(avctx->codec || !codec)
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
471 goto end;
1456
670fca257a69 detect avcodec_open() on an already opened AVCodecContext
michaelni
parents: 1455
diff changeset
472
374
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
473 if (codec->priv_data_size > 0) {
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
474 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
475 if (!avctx->priv_data) {
7f96f6e16f81 Return AVERROR(ENOMEM) on memory allocation failure of avcodec_open.
takis
parents: 5356
diff changeset
476 ret = AVERROR(ENOMEM);
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
477 goto end;
5382
7f96f6e16f81 Return AVERROR(ENOMEM) on memory allocation failure of avcodec_open.
takis
parents: 5356
diff changeset
478 }
374
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
479 } else {
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
480 avctx->priv_data = NULL;
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
481 }
2270
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
482
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
483 if(avctx->coded_width && avctx->coded_height)
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
484 avcodec_set_dimensions(avctx, avctx->coded_width, avctx->coded_height);
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
485 else if(avctx->width && avctx->height)
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
486 avcodec_set_dimensions(avctx, avctx->width, avctx->height);
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
487
10179
0ac7e80ecc76 perform sanity check on number of audio channels in avcodec_open()
pross
parents: 9891
diff changeset
488 #define SANE_NB_CHANNELS 128U
10201
1b2ef85867a9 Add parentheses to logical expression to avoid the warning:
diego
parents: 10179
diff changeset
489 if (((avctx->coded_width || avctx->coded_height)
12372
914f484bb476 Remove use of the deprecated function avcodec_check_dimensions(), use
stefano
parents: 12371
diff changeset
490 && av_check_image_size(avctx->coded_width, avctx->coded_height, 0, avctx))
10201
1b2ef85867a9 Add parentheses to logical expression to avoid the warning:
diego
parents: 10179
diff changeset
491 || avctx->channels > SANE_NB_CHANNELS) {
5383
8a28860d54ba Return AVERROR(EINVAL) when invalid width and/or height are specified to
takis
parents: 5382
diff changeset
492 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
493 goto free_and_end;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
494 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
495
3159
e1157712c1d5 fix segfault with BLUR8.AVI
michael
parents: 3136
diff changeset
496 avctx->codec = codec;
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11323
diff changeset
497 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
498 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
499 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
500 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
501 }
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
502 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
503 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
504 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
505 }
3159
e1157712c1d5 fix segfault with BLUR8.AVI
michael
parents: 3136
diff changeset
506 avctx->frame_number = 0;
4762
4d346a3ea729 make AVCodec.init() optional
michael
parents: 4714
diff changeset
507 if(avctx->codec->init){
12108
c35d7bc64882 Add new decoder property max_lowres and do not init decoder if requested value is higher.
cehoyos
parents: 12097
diff changeset
508 if(avctx->codec_type == AVMEDIA_TYPE_VIDEO &&
c35d7bc64882 Add new decoder property max_lowres and do not init decoder if requested value is higher.
cehoyos
parents: 12097
diff changeset
509 avctx->codec->max_lowres < avctx->lowres){
c35d7bc64882 Add new decoder property max_lowres and do not init decoder if requested value is higher.
cehoyos
parents: 12097
diff changeset
510 av_log(avctx, AV_LOG_ERROR, "The maximum value for lowres supported by the decoder is %d\n",
c35d7bc64882 Add new decoder property max_lowres and do not init decoder if requested value is higher.
cehoyos
parents: 12097
diff changeset
511 avctx->codec->max_lowres);
c35d7bc64882 Add new decoder property max_lowres and do not init decoder if requested value is higher.
cehoyos
parents: 12097
diff changeset
512 goto free_and_end;
c35d7bc64882 Add new decoder property max_lowres and do not init decoder if requested value is higher.
cehoyos
parents: 12097
diff changeset
513 }
c35d7bc64882 Add new decoder property max_lowres and do not init decoder if requested value is higher.
cehoyos
parents: 12097
diff changeset
514
4763
28f41c99b704 indention
michael
parents: 4762
diff changeset
515 ret = avctx->codec->init(avctx);
28f41c99b704 indention
michael
parents: 4762
diff changeset
516 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
517 goto free_and_end;
4763
28f41c99b704 indention
michael
parents: 4762
diff changeset
518 }
4762
4d346a3ea729 make AVCodec.init() optional
michael
parents: 4714
diff changeset
519 }
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
520 ret=0;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
521 end:
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
522 entangled_thread_counter--;
9742
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
523
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
524 /* Release any user-supplied mutex. */
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
525 if (ff_lockmgr_cb) {
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
526 (*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE);
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
527 }
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
528 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
529 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
530 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
531 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
532 goto end;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
533 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
534
5542
b0a566346fb1 Add attribute that forces alignment of stack to functions that need it.
ramiro
parents: 5537
diff changeset
535 int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx, uint8_t *buf, int buf_size,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
536 const short *samples)
986e461dc072 Initial revision
glantau
parents:
diff changeset
537 {
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
538 if(buf_size < FF_MIN_BUFFER_SIZE && 0){
4526
30b8672a2357 Spelling fix
mbardiaux
parents: 4523
diff changeset
539 av_log(avctx, AV_LOG_ERROR, "buffer smaller than minimum size\n");
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
540 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
541 }
2091
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
542 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
543 int ret = avctx->codec->encode(avctx, buf, buf_size, samples);
2091
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
544 avctx->frame_number++;
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
545 return ret;
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
546 }else
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
547 return 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
548 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
549
5542
b0a566346fb1 Add attribute that forces alignment of stack to functions that need it.
ramiro
parents: 5537
diff changeset
550 int attribute_align_arg avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
551 const AVFrame *pict)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
552 {
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
553 if(buf_size < FF_MIN_BUFFER_SIZE){
4526
30b8672a2357 Spelling fix
mbardiaux
parents: 4523
diff changeset
554 av_log(avctx, AV_LOG_ERROR, "buffer smaller than minimum size\n");
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
555 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
556 }
12372
914f484bb476 Remove use of the deprecated function avcodec_check_dimensions(), use
stefano
parents: 12371
diff changeset
557 if(av_check_image_size(avctx->width, avctx->height, 0, avctx))
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
558 return -1;
2091
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
559 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
560 int ret = avctx->codec->encode(avctx, buf, buf_size, pict);
2091
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
561 avctx->frame_number++;
2764
2b37bcabe608 spelling fixes
diego
parents: 2756
diff changeset
562 emms_c(); //needed to avoid an emms_c() call before every return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
563
2091
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
564 return ret;
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
565 }else
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
566 return 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
567 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
568
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
569 int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
2756
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
570 const AVSubtitle *sub)
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
571 {
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
572 int ret;
8771
f7442819cacf Check that start_display_time is 0 in avcodec_encode_subtitle()
superdump
parents: 8757
diff changeset
573 if(sub->start_display_time) {
f7442819cacf Check that start_display_time is 0 in avcodec_encode_subtitle()
superdump
parents: 8757
diff changeset
574 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
575 return -1;
f7442819cacf Check that start_display_time is 0 in avcodec_encode_subtitle()
superdump
parents: 8757
diff changeset
576 }
8772
5a9485bd4421 Check that there are subtitle rects to encode in avcodec_encode_subtitle()
superdump
parents: 8771
diff changeset
577 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
578 return -1;
8756
153d7e5d5a5b remove useless cast, it does not remove warning, encode prototype must be changed
bcoudurier
parents: 8752
diff changeset
579 ret = avctx->codec->encode(avctx, buf, buf_size, sub);
2756
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
580 avctx->frame_number++;
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
581 return ret;
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
582 }
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
583
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
584 #if LIBAVCODEC_VERSION_MAJOR < 53
5542
b0a566346fb1 Add attribute that forces alignment of stack to functions that need it.
ramiro
parents: 5537
diff changeset
585 int attribute_align_arg avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
586 int *got_picture_ptr,
6318
73c09e922744 Make avcodec_decode_* functions take const input buffers.
michael
parents: 6219
diff changeset
587 const uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
588 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
589 AVPacket avpkt;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
590 av_init_packet(&avpkt);
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
591 avpkt.data = buf;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
592 avpkt.size = buf_size;
9787
f114b5f2ac47 Set AV_PKT_FLAG_KEY in avcodec_decode_video.
reimar
parents: 9742
diff changeset
593 // HACK for CorePNG to decode as normal PNG by default
f114b5f2ac47 Set AV_PKT_FLAG_KEY in avcodec_decode_video.
reimar
parents: 9742
diff changeset
594 avpkt.flags = AV_PKT_FLAG_KEY;
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
595
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
596 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
597 }
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
598 #endif
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
599
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
600 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
601 int *got_picture_ptr,
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
602 AVPacket *avpkt)
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
603 {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
604 int ret;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
605
2028
141a9539e270 data_size = 0 cleanup
michael
parents: 2013
diff changeset
606 *got_picture_ptr= 0;
12372
914f484bb476 Remove use of the deprecated function avcodec_check_dimensions(), use
stefano
parents: 12371
diff changeset
607 if((avctx->coded_width||avctx->coded_height) && av_check_image_size(avctx->coded_width, avctx->coded_height, 0, avctx))
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
608 return -1;
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
609 if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
610 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
611 avpkt);
814
8f31ed5bacd1 dont call emms_c() for each MB
michaelni
parents: 762
diff changeset
612
2764
2b37bcabe608 spelling fixes
diego
parents: 2756
diff changeset
613 emms_c(); //needed to avoid an emms_c() call before every return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
614
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
615 if (*got_picture_ptr)
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2426
diff changeset
616 avctx->frame_number++;
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2426
diff changeset
617 }else
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2426
diff changeset
618 ret= 0;
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2426
diff changeset
619
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
620 return ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
621 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
622
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
623 #if LIBAVCODEC_VERSION_MAJOR < 53
5542
b0a566346fb1 Add attribute that forces alignment of stack to functions that need it.
ramiro
parents: 5537
diff changeset
624 int attribute_align_arg avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
625 int *frame_size_ptr,
6318
73c09e922744 Make avcodec_decode_* functions take const input buffers.
michael
parents: 6219
diff changeset
626 const uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
627 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
628 AVPacket avpkt;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
629 av_init_packet(&avpkt);
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
630 avpkt.data = buf;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
631 avpkt.size = buf_size;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
632
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
633 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
634 }
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
635 #endif
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
636
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
637 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
638 int *frame_size_ptr,
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
639 AVPacket *avpkt)
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
640 {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
641 int ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
642
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
643 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
644 //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
645 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
646 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
647 return -1;
006563b9ab27 dont check buffer size if the decode function wont be called at all
michael
parents: 4577
diff changeset
648 }
006563b9ab27 dont check buffer size if the decode function wont be called at all
michael
parents: 4577
diff changeset
649 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
650 *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
651 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
652 return -1;
006563b9ab27 dont check buffer size if the decode function wont be called at all
michael
parents: 4577
diff changeset
653 }
006563b9ab27 dont check buffer size if the decode function wont be called at all
michael
parents: 4577
diff changeset
654
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
655 ret = avctx->codec->decode(avctx, samples, frame_size_ptr, avpkt);
2791
f191093dc8fe check for CODEC_CAP_DELAY in audio decoders too
michael
parents: 2764
diff changeset
656 avctx->frame_number++;
4351
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4350
diff changeset
657 }else{
2791
f191093dc8fe check for CODEC_CAP_DELAY in audio decoders too
michael
parents: 2764
diff changeset
658 ret= 0;
4351
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4350
diff changeset
659 *frame_size_ptr=0;
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4350
diff changeset
660 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
661 return ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
662 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
663
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
664 #if LIBAVCODEC_VERSION_MAJOR < 53
2756
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
665 int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub,
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
666 int *got_sub_ptr,
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
667 const uint8_t *buf, int buf_size)
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
668 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
669 AVPacket avpkt;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
670 av_init_packet(&avpkt);
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
671 avpkt.data = buf;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
672 avpkt.size = buf_size;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
673
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
674 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
675 }
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
676 #endif
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
677
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
678 int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
679 int *got_sub_ptr,
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
680 AVPacket *avpkt)
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
681 {
2756
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
682 int ret;
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
683
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
684 *got_sub_ptr = 0;
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9328
diff changeset
685 ret = avctx->codec->decode(avctx, sub, got_sub_ptr, avpkt);
2756
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
686 if (*got_sub_ptr)
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
687 avctx->frame_number++;
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
688 return ret;
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
689 }
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
690
12134
cb3eb3a2fc96 Add avsubtitle_free function.
reimar
parents: 12108
diff changeset
691 void avsubtitle_free(AVSubtitle *sub)
cb3eb3a2fc96 Add avsubtitle_free function.
reimar
parents: 12108
diff changeset
692 {
cb3eb3a2fc96 Add avsubtitle_free function.
reimar
parents: 12108
diff changeset
693 int i;
cb3eb3a2fc96 Add avsubtitle_free function.
reimar
parents: 12108
diff changeset
694
cb3eb3a2fc96 Add avsubtitle_free function.
reimar
parents: 12108
diff changeset
695 for (i = 0; i < sub->num_rects; i++)
cb3eb3a2fc96 Add avsubtitle_free function.
reimar
parents: 12108
diff changeset
696 {
12137
b8a0924d6e42 100l, change avsubtitle_free to the actually tested and working version.
reimar
parents: 12134
diff changeset
697 av_freep(&sub->rects[i]->pict.data[0]);
b8a0924d6e42 100l, change avsubtitle_free to the actually tested and working version.
reimar
parents: 12134
diff changeset
698 av_freep(&sub->rects[i]->pict.data[1]);
b8a0924d6e42 100l, change avsubtitle_free to the actually tested and working version.
reimar
parents: 12134
diff changeset
699 av_freep(&sub->rects[i]->pict.data[2]);
b8a0924d6e42 100l, change avsubtitle_free to the actually tested and working version.
reimar
parents: 12134
diff changeset
700 av_freep(&sub->rects[i]->pict.data[3]);
b8a0924d6e42 100l, change avsubtitle_free to the actually tested and working version.
reimar
parents: 12134
diff changeset
701 av_freep(&sub->rects[i]->text);
b8a0924d6e42 100l, change avsubtitle_free to the actually tested and working version.
reimar
parents: 12134
diff changeset
702 av_freep(&sub->rects[i]->ass);
b8a0924d6e42 100l, change avsubtitle_free to the actually tested and working version.
reimar
parents: 12134
diff changeset
703 av_freep(&sub->rects[i]);
12134
cb3eb3a2fc96 Add avsubtitle_free function.
reimar
parents: 12108
diff changeset
704 }
cb3eb3a2fc96 Add avsubtitle_free function.
reimar
parents: 12108
diff changeset
705
12137
b8a0924d6e42 100l, change avsubtitle_free to the actually tested and working version.
reimar
parents: 12134
diff changeset
706 av_freep(&sub->rects);
12134
cb3eb3a2fc96 Add avsubtitle_free function.
reimar
parents: 12108
diff changeset
707
cb3eb3a2fc96 Add avsubtitle_free function.
reimar
parents: 12108
diff changeset
708 memset(sub, 0, sizeof(AVSubtitle));
cb3eb3a2fc96 Add avsubtitle_free function.
reimar
parents: 12108
diff changeset
709 }
cb3eb3a2fc96 Add avsubtitle_free function.
reimar
parents: 12108
diff changeset
710
10867
bf309c7ce615 More av_cold for infrequently called functions.
zuxy
parents: 10832
diff changeset
711 av_cold int avcodec_close(AVCodecContext *avctx)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
712 {
9742
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
713 /* If there is a user-supplied mutex locking routine, call it. */
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
714 if (ff_lockmgr_cb) {
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
715 if ((*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN))
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
716 return -1;
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
717 }
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
718
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
719 entangled_thread_counter++;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
720 if(entangled_thread_counter != 1){
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
721 av_log(avctx, AV_LOG_ERROR, "insufficient thread locking around avcodec_open/close()\n");
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
722 entangled_thread_counter--;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
723 return -1;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
724 }
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
725
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
726 if (HAVE_THREADS && avctx->thread_opaque)
5234
c94c4aa7d25f free thread context
benoit
parents: 5227
diff changeset
727 avcodec_thread_free(avctx);
10505
e7f082df2d65 Add a NULL pointer check to avcodec_close() this should prevent a segfault
michael
parents: 10501
diff changeset
728 if (avctx->codec && avctx->codec->close)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
729 avctx->codec->close(avctx);
1994
8d3540dddd1b cleanup & memleak fix
michael
parents: 1901
diff changeset
730 avcodec_default_free_buffers(avctx);
11712
25ed71436974 Set coded_frame to NULL when closing a codec, since it might
reimar
parents: 11659
diff changeset
731 avctx->coded_frame = NULL;
394
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
732 av_freep(&avctx->priv_data);
11585
aea1b01ff81b Fix segfault when encoder initialization fails.
benoit
parents: 11567
diff changeset
733 if(avctx->codec && avctx->codec->encode)
11223
a090d10c314f Free encoder extradata in avcodec_close(). Should fix several small memory
vitor
parents: 11134
diff changeset
734 av_freep(&avctx->extradata);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
735 avctx->codec = NULL;
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
736 entangled_thread_counter--;
9742
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
737
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
738 /* Release any user-supplied mutex. */
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
739 if (ff_lockmgr_cb) {
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
740 (*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE);
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
741 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
742 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
743 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
744
986e461dc072 Initial revision
glantau
parents:
diff changeset
745 AVCodec *avcodec_find_encoder(enum CodecID id)
986e461dc072 Initial revision
glantau
parents:
diff changeset
746 {
11771
3c0dffc64d86 Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents: 11742
diff changeset
747 AVCodec *p, *experimental=NULL;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
748 p = first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
749 while (p) {
11771
3c0dffc64d86 Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents: 11742
diff changeset
750 if (p->encode != NULL && p->id == id) {
3c0dffc64d86 Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents: 11742
diff changeset
751 if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) {
3c0dffc64d86 Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents: 11742
diff changeset
752 experimental = p;
3c0dffc64d86 Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents: 11742
diff changeset
753 } else
3c0dffc64d86 Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents: 11742
diff changeset
754 return p;
3c0dffc64d86 Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents: 11742
diff changeset
755 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
756 p = p->next;
986e461dc072 Initial revision
glantau
parents:
diff changeset
757 }
11771
3c0dffc64d86 Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
cehoyos
parents: 11742
diff changeset
758 return experimental;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
759 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
760
177
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
761 AVCodec *avcodec_find_encoder_by_name(const char *name)
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
762 {
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
763 AVCodec *p;
8016
81dba4c59fd6 allows calling avcodec_find_(en|de)coder_by_name with NULL parameter
aurel
parents: 7992
diff changeset
764 if (!name)
81dba4c59fd6 allows calling avcodec_find_(en|de)coder_by_name with NULL parameter
aurel
parents: 7992
diff changeset
765 return NULL;
177
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
766 p = first_avcodec;
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
767 while (p) {
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
768 if (p->encode != NULL && strcmp(name,p->name) == 0)
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
769 return p;
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
770 p = p->next;
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
771 }
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
772 return NULL;
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
773 }
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
774
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
775 AVCodec *avcodec_find_decoder(enum CodecID id)
986e461dc072 Initial revision
glantau
parents:
diff changeset
776 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
777 AVCodec *p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
778 p = first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
779 while (p) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
780 if (p->decode != NULL && p->id == id)
986e461dc072 Initial revision
glantau
parents:
diff changeset
781 return p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
782 p = p->next;
986e461dc072 Initial revision
glantau
parents:
diff changeset
783 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
784 return NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
785 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
786
986e461dc072 Initial revision
glantau
parents:
diff changeset
787 AVCodec *avcodec_find_decoder_by_name(const char *name)
986e461dc072 Initial revision
glantau
parents:
diff changeset
788 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
789 AVCodec *p;
8016
81dba4c59fd6 allows calling avcodec_find_(en|de)coder_by_name with NULL parameter
aurel
parents: 7992
diff changeset
790 if (!name)
81dba4c59fd6 allows calling avcodec_find_(en|de)coder_by_name with NULL parameter
aurel
parents: 7992
diff changeset
791 return NULL;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
792 p = first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
793 while (p) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
794 if (p->decode != NULL && strcmp(name,p->name) == 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
795 return p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
796 p = p->next;
986e461dc072 Initial revision
glantau
parents:
diff changeset
797 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
798 return NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
799 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
800
11323
7089198d1d10 Make av_get_bit_rate() static and remove av_, the function is only used
cehoyos
parents: 11322
diff changeset
801 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
802 {
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
803 int bit_rate;
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
804 int bits_per_sample;
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
805
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
806 switch(ctx->codec_type) {
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11323
diff changeset
807 case AVMEDIA_TYPE_VIDEO:
11629
251ce43203f6 Factorize code in get_bit_rate().
stefano
parents: 11585
diff changeset
808 case AVMEDIA_TYPE_DATA:
251ce43203f6 Factorize code in get_bit_rate().
stefano
parents: 11585
diff changeset
809 case AVMEDIA_TYPE_SUBTITLE:
251ce43203f6 Factorize code in get_bit_rate().
stefano
parents: 11585
diff changeset
810 case AVMEDIA_TYPE_ATTACHMENT:
10550
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
811 bit_rate = ctx->bit_rate;
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
812 break;
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11323
diff changeset
813 case AVMEDIA_TYPE_AUDIO:
10550
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
814 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
815 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
816 break;
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
817 default:
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
818 bit_rate = 0;
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
819 break;
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
820 }
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
821 return bit_rate;
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
822 }
eb415f52f9f9 Factorize av_get_bit_rate (for future use outside of libavcodec).
cehoyos
parents: 10549
diff changeset
823
11809
867d82f512df Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents: 11781
diff changeset
824 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
825 {
867d82f512df Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents: 11781
diff changeset
826 int i, len, ret = 0;
867d82f512df Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents: 11781
diff changeset
827
867d82f512df Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents: 11781
diff changeset
828 for (i = 0; i < 4; i++) {
867d82f512df Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents: 11781
diff changeset
829 len = snprintf(buf, buf_size,
867d82f512df Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents: 11781
diff changeset
830 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
831 buf += len;
867d82f512df Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents: 11781
diff changeset
832 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
833 ret += len;
867d82f512df Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents: 11781
diff changeset
834 codec_tag>>=8;
867d82f512df Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents: 11781
diff changeset
835 }
867d82f512df Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents: 11781
diff changeset
836 return ret;
867d82f512df Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents: 11781
diff changeset
837 }
867d82f512df Implement av_get_codec_tag_string() and use it in ffprobe.
stefano
parents: 11781
diff changeset
838
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
839 void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
986e461dc072 Initial revision
glantau
parents:
diff changeset
840 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
841 const char *codec_name;
986e461dc072 Initial revision
glantau
parents:
diff changeset
842 AVCodec *p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
843 char buf1[32];
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
844 int bitrate;
5837
4400d47f7c91 Print pixel and display aspect ratios
mbardiaux
parents: 5725
diff changeset
845 AVRational display_aspect_ratio;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
846
986e461dc072 Initial revision
glantau
parents:
diff changeset
847 if (encode)
986e461dc072 Initial revision
glantau
parents:
diff changeset
848 p = avcodec_find_encoder(enc->codec_id);
986e461dc072 Initial revision
glantau
parents:
diff changeset
849 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
850 p = avcodec_find_decoder(enc->codec_id);
986e461dc072 Initial revision
glantau
parents:
diff changeset
851
986e461dc072 Initial revision
glantau
parents:
diff changeset
852 if (p) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
853 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
854 } 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
855 /* 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
856 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
857 codec_name = "mpeg2ts";
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
858 } else if (enc->codec_name[0] != '\0') {
986e461dc072 Initial revision
glantau
parents:
diff changeset
859 codec_name = enc->codec_name;
986e461dc072 Initial revision
glantau
parents:
diff changeset
860 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
861 /* output avi tags */
11810
2ae71694d6ae Make avcodec_string() use av_get_codec_tag_string().
stefano
parents: 11809
diff changeset
862 char tag_buf[32];
2ae71694d6ae Make avcodec_string() use av_get_codec_tag_string().
stefano
parents: 11809
diff changeset
863 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
864 snprintf(buf1, sizeof(buf1), "%s / 0x%04X", tag_buf, enc->codec_tag);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
865 codec_name = buf1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
866 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
867
986e461dc072 Initial revision
glantau
parents:
diff changeset
868 switch(enc->codec_type) {
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11323
diff changeset
869 case AVMEDIA_TYPE_VIDEO:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
870 snprintf(buf, buf_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
871 "Video: %s%s",
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1368
diff changeset
872 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
873 if (enc->pix_fmt != PIX_FMT_NONE) {
55
6064342168f4 picture utils
glantau
parents: 24
diff changeset
874 snprintf(buf + strlen(buf), buf_size - strlen(buf),
6064342168f4 picture utils
glantau
parents: 24
diff changeset
875 ", %s",
988
001b7d3045e5 moved avcodec_get_chroma_sub_sample() to imgconvert.c
bellard
parents: 963
diff changeset
876 avcodec_get_pix_fmt_name(enc->pix_fmt));
55
6064342168f4 picture utils
glantau
parents: 24
diff changeset
877 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
878 if (enc->width) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
879 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
880 ", %dx%d",
a332778dfa06 print more time_base fps stuff if av_log level is at debug or above
michael
parents: 2881
diff changeset
881 enc->width, enc->height);
6466
3dae816c2485 do not display par and dar if not available
bcoudurier
parents: 6464
diff changeset
882 if (enc->sample_aspect_ratio.num) {
6467
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
883 av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den,
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
884 enc->width*enc->sample_aspect_ratio.num,
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
885 enc->height*enc->sample_aspect_ratio.den,
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
886 1024*1024);
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
887 snprintf(buf + strlen(buf), buf_size - strlen(buf),
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
888 " [PAR %d:%d DAR %d:%d]",
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
889 enc->sample_aspect_ratio.num, enc->sample_aspect_ratio.den,
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
890 display_aspect_ratio.num, display_aspect_ratio.den);
6466
3dae816c2485 do not display par and dar if not available
bcoudurier
parents: 6464
diff changeset
891 }
6012
085be73cb51c use av_log_get/set_level()
mru
parents: 6011
diff changeset
892 if(av_log_get_level() >= AV_LOG_DEBUG){
8611
a637db9f59b1 export gcd function as av_gcd()
aurel
parents: 8603
diff changeset
893 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
894 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
895 ", %d/%d",
a332778dfa06 print more time_base fps stuff if av_log level is at debug or above
michael
parents: 2881
diff changeset
896 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
897 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
898 }
741
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
899 if (encode) {
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
900 snprintf(buf + strlen(buf), buf_size - strlen(buf),
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
901 ", q=%d-%d", enc->qmin, enc->qmax);
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
902 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
903 break;
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11323
diff changeset
904 case AVMEDIA_TYPE_AUDIO:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
905 snprintf(buf, buf_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
906 "Audio: %s",
986e461dc072 Initial revision
glantau
parents:
diff changeset
907 codec_name);
986e461dc072 Initial revision
glantau
parents:
diff changeset
908 if (enc->sample_rate) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
909 snprintf(buf + strlen(buf), buf_size - strlen(buf),
8098
c2ab7a8958ed Add audio channel layout API to libavcodec.
pross
parents: 8042
diff changeset
910 ", %d Hz", enc->sample_rate);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
911 }
8098
c2ab7a8958ed Add audio channel layout API to libavcodec.
pross
parents: 8042
diff changeset
912 av_strlcat(buf, ", ", buf_size);
c2ab7a8958ed Add audio channel layout API to libavcodec.
pross
parents: 8042
diff changeset
913 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
914 if (enc->sample_fmt != SAMPLE_FMT_NONE) {
bb5e8cae1d71 Write sample format description within avcodec_string()
pross
parents: 7409
diff changeset
915 snprintf(buf + strlen(buf), buf_size - strlen(buf),
bb5e8cae1d71 Write sample format description within avcodec_string()
pross
parents: 7409
diff changeset
916 ", %s", avcodec_get_sample_fmt_name(enc->sample_fmt));
bb5e8cae1d71 Write sample format description within avcodec_string()
pross
parents: 7409
diff changeset
917 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
918 break;
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11323
diff changeset
919 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
920 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
921 break;
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11323
diff changeset
922 case AVMEDIA_TYPE_SUBTITLE:
2756
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
923 snprintf(buf, buf_size, "Subtitle: %s", codec_name);
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
924 break;
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11323
diff changeset
925 case AVMEDIA_TYPE_ATTACHMENT:
6184
4ba171d6d84a Add support for Matroska attachments.
aurel
parents: 6108
diff changeset
926 snprintf(buf, buf_size, "Attachment: %s", codec_name);
4ba171d6d84a Add support for Matroska attachments.
aurel
parents: 6108
diff changeset
927 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
928 default:
2281
7b345b735ac7 do not call (av_)abort()
michael
parents: 2270
diff changeset
929 snprintf(buf, buf_size, "Invalid Codec type %d", enc->codec_type);
7b345b735ac7 do not call (av_)abort()
michael
parents: 2270
diff changeset
930 return;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
931 }
741
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
932 if (encode) {
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
933 if (enc->flags & CODEC_FLAG_PASS1)
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
934 snprintf(buf + strlen(buf), buf_size - strlen(buf),
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
935 ", pass 1");
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
936 if (enc->flags & CODEC_FLAG_PASS2)
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
937 snprintf(buf + strlen(buf), buf_size - strlen(buf),
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
938 ", pass 2");
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
939 }
11323
7089198d1d10 Make av_get_bit_rate() static and remove av_, the function is only used
cehoyos
parents: 11322
diff changeset
940 bitrate = get_bit_rate(enc);
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
941 if (bitrate != 0) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
942 snprintf(buf + strlen(buf), buf_size - strlen(buf),
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
943 ", %d kb/s", bitrate / 1000);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
944 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
945 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
946
362
1ee4ba4ca783 version info
nickols_k
parents: 341
diff changeset
947 unsigned avcodec_version( void )
1ee4ba4ca783 version info
nickols_k
parents: 341
diff changeset
948 {
1ee4ba4ca783 version info
nickols_k
parents: 341
diff changeset
949 return LIBAVCODEC_VERSION_INT;
1ee4ba4ca783 version info
nickols_k
parents: 341
diff changeset
950 }
55
6064342168f4 picture utils
glantau
parents: 24
diff changeset
951
10764
4546d91de818 Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for XXX_configuration() and
stefano
parents: 10684
diff changeset
952 const char *avcodec_configuration(void)
10536
046dcf7aa19c Add functions to return library license and library configuration.
diego
parents: 10505
diff changeset
953 {
046dcf7aa19c Add functions to return library license and library configuration.
diego
parents: 10505
diff changeset
954 return FFMPEG_CONFIGURATION;
046dcf7aa19c Add functions to return library license and library configuration.
diego
parents: 10505
diff changeset
955 }
046dcf7aa19c Add functions to return library license and library configuration.
diego
parents: 10505
diff changeset
956
10764
4546d91de818 Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for XXX_configuration() and
stefano
parents: 10684
diff changeset
957 const char *avcodec_license(void)
10536
046dcf7aa19c Add functions to return library license and library configuration.
diego
parents: 10505
diff changeset
958 {
046dcf7aa19c Add functions to return library license and library configuration.
diego
parents: 10505
diff changeset
959 #define LICENSE_PREFIX "libavcodec license: "
046dcf7aa19c Add functions to return library license and library configuration.
diego
parents: 10505
diff changeset
960 return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
046dcf7aa19c Add functions to return library license and library configuration.
diego
parents: 10505
diff changeset
961 }
046dcf7aa19c Add functions to return library license and library configuration.
diego
parents: 10505
diff changeset
962
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
963 void avcodec_init(void)
986e461dc072 Initial revision
glantau
parents:
diff changeset
964 {
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6346
diff changeset
965 static int initialized = 0;
303
9a931fd8d06c multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents: 267
diff changeset
966
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6346
diff changeset
967 if (initialized != 0)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2969
diff changeset
968 return;
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6346
diff changeset
969 initialized = 1;
303
9a931fd8d06c multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents: 267
diff changeset
970
4197
bbe0bc387a19 revert bad checkin
mru
parents: 4196
diff changeset
971 dsputil_static_init();
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
972 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
973
341
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 337
diff changeset
974 void avcodec_flush_buffers(AVCodecContext *avctx)
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 337
diff changeset
975 {
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1353
diff changeset
976 if(avctx->codec->flush)
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1353
diff changeset
977 avctx->codec->flush(avctx);
341
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 337
diff changeset
978 }
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 337
diff changeset
979
2231
c87bab25f89f changing size segfault fix
michael
parents: 2169
diff changeset
980 void avcodec_default_free_buffers(AVCodecContext *s){
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
981 int i, j;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
982
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
983 if(s->internal_buffer==NULL) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
984
10398
11b685acd280 Print a warning message when avcodec_default_free_buffers finds unreleased
reimar
parents: 10386
diff changeset
985 if (s->internal_buffer_count)
11b685acd280 Print a warning message when avcodec_default_free_buffers finds unreleased
reimar
parents: 10386
diff changeset
986 av_log(s, AV_LOG_WARNING, "Found %i unreleased buffers!\n", s->internal_buffer_count);
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
987 for(i=0; i<INTERNAL_BUFFER_SIZE; i++){
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
988 InternalBuffer *buf= &((InternalBuffer*)s->internal_buffer)[i];
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
989 for(j=0; j<4; j++){
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
990 av_freep(&buf->base[j]);
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
991 buf->data[j]= NULL;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
992 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
993 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
994 av_freep(&s->internal_buffer);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
995
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
996 s->internal_buffer_count=0;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
997 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
998
1264
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
999 char av_get_pict_type_char(int pict_type){
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
1000 switch(pict_type){
6450
c32be43b52b2 remove more useless mpegvideo.h includes
aurel
parents: 6407
diff changeset
1001 case FF_I_TYPE: return 'I';
c32be43b52b2 remove more useless mpegvideo.h includes
aurel
parents: 6407
diff changeset
1002 case FF_P_TYPE: return 'P';
c32be43b52b2 remove more useless mpegvideo.h includes
aurel
parents: 6407
diff changeset
1003 case FF_B_TYPE: return 'B';
c32be43b52b2 remove more useless mpegvideo.h includes
aurel
parents: 6407
diff changeset
1004 case FF_S_TYPE: return 'S';
c32be43b52b2 remove more useless mpegvideo.h includes
aurel
parents: 6407
diff changeset
1005 case FF_SI_TYPE:return 'i';
c32be43b52b2 remove more useless mpegvideo.h includes
aurel
parents: 6407
diff changeset
1006 case FF_SP_TYPE:return 'p';
6456
ff4fa36b555e define BI frame type along with other frame types
aurel
parents: 6455
diff changeset
1007 case FF_BI_TYPE:return 'b';
6455
6efe6fb35b1a cosmetic: align
aurel
parents: 6450
diff changeset
1008 default: return '?';
1264
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
1009 }
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
1010 }
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
1011
3433
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1012 int av_get_bits_per_sample(enum CodecID codec_id){
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1013 switch(codec_id){
3435
ffa9e863f3be simplify the voc demuxer using av_get_bits_per_sample()
aurel
parents: 3433
diff changeset
1014 case CODEC_ID_ADPCM_SBPRO_2:
3438
fbf61a160154 set proper bits_per_sample value for ADPCM codecs
aurel
parents: 3435
diff changeset
1015 return 2;
3435
ffa9e863f3be simplify the voc demuxer using av_get_bits_per_sample()
aurel
parents: 3433
diff changeset
1016 case CODEC_ID_ADPCM_SBPRO_3:
3438
fbf61a160154 set proper bits_per_sample value for ADPCM codecs
aurel
parents: 3435
diff changeset
1017 return 3;
3435
ffa9e863f3be simplify the voc demuxer using av_get_bits_per_sample()
aurel
parents: 3433
diff changeset
1018 case CODEC_ID_ADPCM_SBPRO_4:
3438
fbf61a160154 set proper bits_per_sample value for ADPCM codecs
aurel
parents: 3435
diff changeset
1019 case CODEC_ID_ADPCM_CT:
10779
90f34aa8fe0a 100l: Fix compilation after r21037.
cehoyos
parents: 10777
diff changeset
1020 case CODEC_ID_ADPCM_IMA_WAV:
10777
c4e157b47af5 Handle more ADPCM codecs in av_get_bits_per_sample().
daniel
parents: 10764
diff changeset
1021 case CODEC_ID_ADPCM_MS:
c4e157b47af5 Handle more ADPCM codecs in av_get_bits_per_sample().
daniel
parents: 10764
diff changeset
1022 case CODEC_ID_ADPCM_YAMAHA:
3438
fbf61a160154 set proper bits_per_sample value for ADPCM codecs
aurel
parents: 3435
diff changeset
1023 return 4;
3433
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1024 case CODEC_ID_PCM_ALAW:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1025 case CODEC_ID_PCM_MULAW:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1026 case CODEC_ID_PCM_S8:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1027 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
1028 case CODEC_ID_PCM_ZORK:
3433
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1029 return 8;
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1030 case CODEC_ID_PCM_S16BE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1031 case CODEC_ID_PCM_S16LE:
5940
d63186919b60 add pcm_s16le_planar support for electronicarts files
aurel
parents: 5837
diff changeset
1032 case CODEC_ID_PCM_S16LE_PLANAR:
3433
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1033 case CODEC_ID_PCM_U16BE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1034 case CODEC_ID_PCM_U16LE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1035 return 16;
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1036 case CODEC_ID_PCM_S24DAUD:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1037 case CODEC_ID_PCM_S24BE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1038 case CODEC_ID_PCM_S24LE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1039 case CODEC_ID_PCM_U24BE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1040 case CODEC_ID_PCM_U24LE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1041 return 24;
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1042 case CODEC_ID_PCM_S32BE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1043 case CODEC_ID_PCM_S32LE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1044 case CODEC_ID_PCM_U32BE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1045 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
1046 case CODEC_ID_PCM_F32BE:
7613
ff395fe35161 Add F64BE, F64LE and F64BE PCM codecs.
pross
parents: 7612
diff changeset
1047 case CODEC_ID_PCM_F32LE:
3433
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1048 return 32;
7613
ff395fe35161 Add F64BE, F64LE and F64BE PCM codecs.
pross
parents: 7612
diff changeset
1049 case CODEC_ID_PCM_F64BE:
ff395fe35161 Add F64BE, F64LE and F64BE PCM codecs.
pross
parents: 7612
diff changeset
1050 case CODEC_ID_PCM_F64LE:
ff395fe35161 Add F64BE, F64LE and F64BE PCM codecs.
pross
parents: 7612
diff changeset
1051 return 64;
3433
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1052 default:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1053 return 0;
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1054 }
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1055 }
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
1056
5537
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1057 int av_get_bits_per_sample_format(enum SampleFormat sample_fmt) {
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1058 switch (sample_fmt) {
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1059 case SAMPLE_FMT_U8:
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1060 return 8;
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1061 case SAMPLE_FMT_S16:
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1062 return 16;
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1063 case SAMPLE_FMT_S32:
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1064 case SAMPLE_FMT_FLT:
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1065 return 32;
7612
1302ec81afc0 Add SAMPLE_FMT_DBL.
pross
parents: 7587
diff changeset
1066 case SAMPLE_FMT_DBL:
1302ec81afc0 Add SAMPLE_FMT_DBL.
pross
parents: 7587
diff changeset
1067 return 64;
5537
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1068 default:
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1069 return 0;
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1070 }
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1071 }
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
1072
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8588
diff changeset
1073 #if !HAVE_THREADS
2013
85e547a18d87 dummy avcodec_thread_init() to avoid linking issues
michael
parents: 2002
diff changeset
1074 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
1075 s->thread_count = thread_count;
2013
85e547a18d87 dummy avcodec_thread_init() to avoid linking issues
michael
parents: 2002
diff changeset
1076 return -1;
85e547a18d87 dummy avcodec_thread_init() to avoid linking issues
michael
parents: 2002
diff changeset
1077 }
85e547a18d87 dummy avcodec_thread_init() to avoid linking issues
michael
parents: 2002
diff changeset
1078 #endif
2676
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1079
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1080 unsigned int av_xiphlacing(unsigned char *s, unsigned int v)
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1081 {
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1082 unsigned int n = 0;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1083
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1084 while(v >= 0xff) {
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1085 *s++ = 0xff;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1086 v -= 0xff;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1087 n++;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1088 }
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1089 *s = v;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1090 n++;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1091 return n;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
1092 }
3233
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
1093
12280
fbc6fc80e6c6 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents: 12137
diff changeset
1094 #if LIBAVCODEC_VERSION_MAJOR < 53
fbc6fc80e6c6 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents: 12137
diff changeset
1095 #include "libavcore/parseutils.h"
5126
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1096
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1097 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
1098 {
12280
fbc6fc80e6c6 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents: 12137
diff changeset
1099 return av_parse_video_size(width_ptr, height_ptr, str);
5126
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1100 }
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1101
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1102 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
1103 {
12280
fbc6fc80e6c6 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents: 12137
diff changeset
1104 return av_parse_video_rate(frame_rate, arg);
5126
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1105 }
12280
fbc6fc80e6c6 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents: 12137
diff changeset
1106 #endif
7530
398636f16e7e Add a generic function to lavc to log messages about missing features.
superdump
parents: 7475
diff changeset
1107
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
1108 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
1109 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
1110 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
1111 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
1112 }
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
1113
9891
7ad7d4094d1f Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents: 9787
diff changeset
1114 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
1115 {
398636f16e7e Add a generic function to lavc to log messages about missing features.
superdump
parents: 7475
diff changeset
1116 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
1117 "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
1118 "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
1119 "been implemented.", feature);
398636f16e7e Add a generic function to lavc to log messages about missing features.
superdump
parents: 7475
diff changeset
1120 if(want_sample)
9891
7ad7d4094d1f Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents: 9787
diff changeset
1121 av_log_ask_for_sample(avc, NULL);
8603
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1122 else
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1123 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
1124 }
8603
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1125
9891
7ad7d4094d1f Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents: 9787
diff changeset
1126 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
1127 {
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1128 if (msg)
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1129 av_log(avc, AV_LOG_WARNING, "%s ", msg);
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1130 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
1131 "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
1132 "and contact the ffmpeg-devel mailing list.\n");
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1133 }
9030
c7d783120b99 av_register_hwaccel() from Gwenole Beauchesne.
michael
parents: 9014
diff changeset
1134
c7d783120b99 av_register_hwaccel() from Gwenole Beauchesne.
michael
parents: 9014
diff changeset
1135 static AVHWAccel *first_hwaccel = NULL;
c7d783120b99 av_register_hwaccel() from Gwenole Beauchesne.
michael
parents: 9014
diff changeset
1136
c7d783120b99 av_register_hwaccel() from Gwenole Beauchesne.
michael
parents: 9014
diff changeset
1137 void av_register_hwaccel(AVHWAccel *hwaccel)
c7d783120b99 av_register_hwaccel() from Gwenole Beauchesne.
michael
parents: 9014
diff changeset
1138 {
c7d783120b99 av_register_hwaccel() from Gwenole Beauchesne.
michael
parents: 9014
diff changeset
1139 AVHWAccel **p = &first_hwaccel;
c7d783120b99 av_register_hwaccel() from Gwenole Beauchesne.
michael
parents: 9014
diff changeset
1140 while (*p)
c7d783120b99 av_register_hwaccel() from Gwenole Beauchesne.
michael
parents: 9014
diff changeset
1141 p = &(*p)->next;
c7d783120b99 av_register_hwaccel() from Gwenole Beauchesne.
michael
parents: 9014
diff changeset
1142 *p = hwaccel;
c7d783120b99 av_register_hwaccel() from Gwenole Beauchesne.
michael
parents: 9014
diff changeset
1143 hwaccel->next = NULL;
c7d783120b99 av_register_hwaccel() from Gwenole Beauchesne.
michael
parents: 9014
diff changeset
1144 }
9031
62f346579c36 av_hwaccel_next() by Gwenole Beauchesne.
michael
parents: 9030
diff changeset
1145
62f346579c36 av_hwaccel_next() by Gwenole Beauchesne.
michael
parents: 9030
diff changeset
1146 AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel)
62f346579c36 av_hwaccel_next() by Gwenole Beauchesne.
michael
parents: 9030
diff changeset
1147 {
62f346579c36 av_hwaccel_next() by Gwenole Beauchesne.
michael
parents: 9030
diff changeset
1148 return hwaccel ? hwaccel->next : first_hwaccel;
62f346579c36 av_hwaccel_next() by Gwenole Beauchesne.
michael
parents: 9030
diff changeset
1149 }
9032
caee3bed2145 ff_find_hwaccel()
michael
parents: 9031
diff changeset
1150
caee3bed2145 ff_find_hwaccel()
michael
parents: 9031
diff changeset
1151 AVHWAccel *ff_find_hwaccel(enum CodecID codec_id, enum PixelFormat pix_fmt)
caee3bed2145 ff_find_hwaccel()
michael
parents: 9031
diff changeset
1152 {
caee3bed2145 ff_find_hwaccel()
michael
parents: 9031
diff changeset
1153 AVHWAccel *hwaccel=NULL;
caee3bed2145 ff_find_hwaccel()
michael
parents: 9031
diff changeset
1154
caee3bed2145 ff_find_hwaccel()
michael
parents: 9031
diff changeset
1155 while((hwaccel= av_hwaccel_next(hwaccel))){
caee3bed2145 ff_find_hwaccel()
michael
parents: 9031
diff changeset
1156 if ( hwaccel->id == codec_id
caee3bed2145 ff_find_hwaccel()
michael
parents: 9031
diff changeset
1157 && hwaccel->pix_fmt == pix_fmt)
caee3bed2145 ff_find_hwaccel()
michael
parents: 9031
diff changeset
1158 return hwaccel;
caee3bed2145 ff_find_hwaccel()
michael
parents: 9031
diff changeset
1159 }
caee3bed2145 ff_find_hwaccel()
michael
parents: 9031
diff changeset
1160 return NULL;
caee3bed2145 ff_find_hwaccel()
michael
parents: 9031
diff changeset
1161 }
9742
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1162
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1163 int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op))
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1164 {
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1165 if (ff_lockmgr_cb) {
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1166 if (ff_lockmgr_cb(&codec_mutex, AV_LOCK_DESTROY))
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1167 return -1;
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1168 }
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1169
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1170 ff_lockmgr_cb = cb;
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1171
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1172 if (ff_lockmgr_cb) {
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1173 if (ff_lockmgr_cb(&codec_mutex, AV_LOCK_CREATE))
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1174 return -1;
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1175 }
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1176 return 0;
0d6f887d91fb Add a lock manager API to libavcodec.
andoma
parents: 9686
diff changeset
1177 }
11742
a37818ac3817 Factorize some code into the new function ff_toupper4().
cehoyos
parents: 11712
diff changeset
1178
a37818ac3817 Factorize some code into the new function ff_toupper4().
cehoyos
parents: 11712
diff changeset
1179 unsigned int ff_toupper4(unsigned int x)
a37818ac3817 Factorize some code into the new function ff_toupper4().
cehoyos
parents: 11712
diff changeset
1180 {
a37818ac3817 Factorize some code into the new function ff_toupper4().
cehoyos
parents: 11712
diff changeset
1181 return toupper( x &0xFF)
a37818ac3817 Factorize some code into the new function ff_toupper4().
cehoyos
parents: 11712
diff changeset
1182 + (toupper((x>>8 )&0xFF)<<8 )
a37818ac3817 Factorize some code into the new function ff_toupper4().
cehoyos
parents: 11712
diff changeset
1183 + (toupper((x>>16)&0xFF)<<16)
a37818ac3817 Factorize some code into the new function ff_toupper4().
cehoyos
parents: 11712
diff changeset
1184 + (toupper((x>>24)&0xFF)<<24);
a37818ac3817 Factorize some code into the new function ff_toupper4().
cehoyos
parents: 11712
diff changeset
1185 }