annotate utils.c @ 10505:e7f082df2d65 libavcodec

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