annotate utils.c @ 8631:2d7269e13a8d libavcodec

Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can be used by video players. Original patch by NVIDIA corporation.
author cehoyos
date Tue, 20 Jan 2009 09:28:36 +0000
parents 04423b2f6e0b
children e9d9d946f213
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 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
24 * @file utils.c
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
2652
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
48 const uint8_t ff_reverse[256]={
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
49 0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
50 0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
51 0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
52 0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
53 0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
54 0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
55 0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
56 0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
57 0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
58 0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
59 0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
60 0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
61 0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
62 0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
63 0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
64 0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF,
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
65 };
659b92488061 ff_reverse to utils.c patch by (Roine Gustafsson )roine users.sourceforge net)
michael
parents: 2637
diff changeset
66
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
67 static int volatile entangled_thread_counter=0;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
68
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1032
diff changeset
69 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
70 {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
71 if(min_size < *size)
1031
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
72 return ptr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
73
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
74 *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
75
6532
8aafb712389e Fix possible heap overflow caused by av_fast_realloc()
michael
parents: 6488
diff changeset
76 ptr= av_realloc(ptr, *size);
8aafb712389e Fix possible heap overflow caused by av_fast_realloc()
michael
parents: 6488
diff changeset
77 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
78 *size= 0;
8aafb712389e Fix possible heap overflow caused by av_fast_realloc()
michael
parents: 6488
diff changeset
79
8aafb712389e Fix possible heap overflow caused by av_fast_realloc()
michael
parents: 6488
diff changeset
80 return ptr;
1031
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
81 }
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
82
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
83 /* encoder management */
7992
b5f5257c0c70 Mark list heads static. Patch by Diego Petten?
lu_zero
parents: 7983
diff changeset
84 static AVCodec *first_avcodec = NULL;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
85
6011
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 5979
diff changeset
86 AVCodec *av_codec_next(AVCodec *c){
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 5979
diff changeset
87 if(c) return c->next;
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 5979
diff changeset
88 else return first_avcodec;
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 5979
diff changeset
89 }
b1fe945d73f9 av_*_next() API for libavcodec
michael
parents: 5979
diff changeset
90
8324
343f0476fd1d Use a more explicit "codec" rather than "format" as the parameter of
stefano
parents: 8281
diff changeset
91 void register_avcodec(AVCodec *codec)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
92 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
93 AVCodec **p;
8325
0b905a126bc9 Make register_avcodec() call avcodec_init().
stefano
parents: 8324
diff changeset
94 avcodec_init();
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
95 p = &first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
96 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
97 *p = codec;
343f0476fd1d Use a more explicit "codec" rather than "format" as the parameter of
stefano
parents: 8281
diff changeset
98 codec->next = NULL;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
99 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
100
2270
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
101 void avcodec_set_dimensions(AVCodecContext *s, int width, int height){
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
102 s->coded_width = width;
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
103 s->coded_height= height;
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
104 s->width = -((-width )>>s->lowres);
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
105 s->height= -((-height)>>s->lowres);
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
106 }
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
107
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
108 typedef struct InternalBuffer{
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
109 int last_pic_num;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
110 uint8_t *base[4];
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
111 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
112 int linesize[4];
5522
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
113 int width, height;
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
114 enum PixelFormat pix_fmt;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
115 }InternalBuffer;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
116
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
117 #define INTERNAL_BUFFER_SIZE 32
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
118
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
119 #define ALIGN(x, a) (((x)+(a)-1)&~((a)-1))
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
120
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
121 void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
122 int w_align= 1;
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
123 int h_align= 1;
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
124
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
125 switch(s->pix_fmt){
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
126 case PIX_FMT_YUV420P:
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4453
diff changeset
127 case PIX_FMT_YUYV422:
2137
ef47c0b1ff28 UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents: 2125
diff changeset
128 case PIX_FMT_UYVY422:
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
129 case PIX_FMT_YUV422P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
130 case PIX_FMT_YUV444P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
131 case PIX_FMT_GRAY8:
4066
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 4030
diff changeset
132 case PIX_FMT_GRAY16BE:
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 4030
diff changeset
133 case PIX_FMT_GRAY16LE:
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
134 case PIX_FMT_YUVJ420P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
135 case PIX_FMT_YUVJ422P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
136 case PIX_FMT_YUVJ444P:
5706
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5576
diff changeset
137 case PIX_FMT_YUVA420P:
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
138 w_align= 16; //FIXME check for non mpeg style codecs and use less alignment
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
139 h_align= 16;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
140 break;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
141 case PIX_FMT_YUV411P:
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4453
diff changeset
142 case PIX_FMT_UYYVYY411:
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
143 w_align=32;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
144 h_align=8;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
145 break;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
146 case PIX_FMT_YUV410P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
147 if(s->codec_id == CODEC_ID_SVQ1){
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
148 w_align=64;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
149 h_align=64;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
150 }
2104
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
151 case PIX_FMT_RGB555:
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
152 if(s->codec_id == CODEC_ID_RPZA){
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
153 w_align=4;
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
154 h_align=4;
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
155 }
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
156 case PIX_FMT_PAL8:
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
157 if(s->codec_id == CODEC_ID_SMC){
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
158 w_align=4;
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
159 h_align=4;
586a6e8f3290 Force alignement for rpza and smc
rtognimp
parents: 2091
diff changeset
160 }
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
161 break;
2418
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
162 case PIX_FMT_BGR24:
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
163 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
164 w_align=4;
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
165 h_align=4;
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
166 }
82af834636c2 Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents: 2398
diff changeset
167 break;
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
168 default:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
169 w_align= 1;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
170 h_align= 1;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
171 break;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
172 }
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
173
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
174 *width = ALIGN(*width , w_align);
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
175 *height= ALIGN(*height, h_align);
7942
64f35acc2407 Allocate 1 line more in the chroma plane for H.264, this avoids some
michael
parents: 7941
diff changeset
176 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
177 *height+=2; // some of the optimized chroma MC reads one line too much
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
178 }
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
179
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
180 int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
181 if((int)w>0 && (int)h>0 && (w+128)*(uint64_t)(h+128) < INT_MAX/4)
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
182 return 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
183
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
184 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
185 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
186 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
187
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
188 int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
189 int i;
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
190 int w= s->width;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
191 int h= s->height;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
192 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
193 int *picture_number;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
194
4453
22827cd6b228 Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents: 4351
diff changeset
195 if(pic->data[0]!=NULL) {
22827cd6b228 Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents: 4351
diff changeset
196 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
197 return -1;
22827cd6b228 Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents: 4351
diff changeset
198 }
22827cd6b228 Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents: 4351
diff changeset
199 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
200 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
201 return -1;
22827cd6b228 Activate guards in avcodec_default_get_buffer. Patch by Michel Bardiaux,
takis
parents: 4351
diff changeset
202 }
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
203
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
204 if(avcodec_check_dimensions(s,w,h))
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
205 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
206
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
207 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
208 s->internal_buffer= av_mallocz((INTERNAL_BUFFER_SIZE+1)*sizeof(InternalBuffer));
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
209 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
210 #if 0
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
211 s->internal_buffer= av_fast_realloc(
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
212 s->internal_buffer,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
213 &s->internal_buffer_size,
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
214 sizeof(InternalBuffer)*FFMAX(99, s->internal_buffer_count+1)/*FIXME*/
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
215 );
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
216 #endif
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
217
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
218 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
219 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
220 (*picture_number)++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
221
5522
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
222 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
223 for(i=0; i<4; i++){
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
224 av_freep(&buf->base[i]);
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
225 buf->data[i]= NULL;
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
226 }
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
227 }
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
228
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
229 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
230 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
231 buf->last_pic_num= *picture_number;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
232 }else{
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
233 int h_chroma_shift, v_chroma_shift;
6360
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
234 int size[4] = {0};
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
235 int tmpsize;
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
236 AVPicture picture;
7941
8a3f24796fa9 Replace second (and wrong) call to avcodec_align_dimensions() by adjusting
michael
parents: 7936
diff changeset
237 int stride_align[4];
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
238
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
239 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
240
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
241 avcodec_align_dimensions(s, &w, &h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
242
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
243 if(!(s->flags&CODEC_FLAG_EMU_EDGE)){
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
244 w+= EDGE_WIDTH*2;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
245 h+= EDGE_WIDTH*2;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
246 }
4986
270e6cce0be3 fix a crash with svq1 + sse2.
lorenm
parents: 4891
diff changeset
247
6360
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
248 ff_fill_linesize(&picture, s->pix_fmt, w);
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
249
7941
8a3f24796fa9 Replace second (and wrong) call to avcodec_align_dimensions() by adjusting
michael
parents: 7936
diff changeset
250 for (i=0; i<4; i++){
8a3f24796fa9 Replace second (and wrong) call to avcodec_align_dimensions() by adjusting
michael
parents: 7936
diff changeset
251 //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
252 //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
253 //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
254 //pretty and better ideas are welcome!
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8588
diff changeset
255 #if HAVE_MMX
7941
8a3f24796fa9 Replace second (and wrong) call to avcodec_align_dimensions() by adjusting
michael
parents: 7936
diff changeset
256 if(s->codec_id == CODEC_ID_SVQ1)
8a3f24796fa9 Replace second (and wrong) call to avcodec_align_dimensions() by adjusting
michael
parents: 7936
diff changeset
257 stride_align[i]= 16;
8a3f24796fa9 Replace second (and wrong) call to avcodec_align_dimensions() by adjusting
michael
parents: 7936
diff changeset
258 else
8a3f24796fa9 Replace second (and wrong) call to avcodec_align_dimensions() by adjusting
michael
parents: 7936
diff changeset
259 #endif
8a3f24796fa9 Replace second (and wrong) call to avcodec_align_dimensions() by adjusting
michael
parents: 7936
diff changeset
260 stride_align[i] = STRIDE_ALIGN;
8a3f24796fa9 Replace second (and wrong) call to avcodec_align_dimensions() by adjusting
michael
parents: 7936
diff changeset
261 picture.linesize[i] = ALIGN(picture.linesize[i], stride_align[i]);
8a3f24796fa9 Replace second (and wrong) call to avcodec_align_dimensions() by adjusting
michael
parents: 7936
diff changeset
262 }
6360
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
263
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
264 tmpsize = ff_fill_pointer(&picture, NULL, s->pix_fmt, h);
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
265
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
266 for (i=0; i<3 && picture.data[i+1]; i++)
e961197141c0 Simplify avcodec_default_get_buffer()
vitor
parents: 6350
diff changeset
267 size[i] = picture.data[i+1] - picture.data[i];
6390
27a6801cbb27 Fix bug I introduced in r11962.
vitor
parents: 6388
diff changeset
268 size[i] = tmpsize - (picture.data[i] - picture.data[0]);
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
269
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
270 buf->last_pic_num= -256*256*256*64;
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
271 memset(buf->base, 0, sizeof(buf->base));
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
272 memset(buf->data, 0, sizeof(buf->data));
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
273
5706
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5576
diff changeset
274 for(i=0; i<4 && size[i]; i++){
1165
michaelni
parents: 1150
diff changeset
275 const int h_shift= i==0 ? 0 : h_chroma_shift;
michaelni
parents: 1150
diff changeset
276 const int v_shift= i==0 ? 0 : v_chroma_shift;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
277
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
278 buf->linesize[i]= picture.linesize[i];
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
279
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
280 buf->base[i]= av_malloc(size[i]+16); //FIXME 16
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
281 if(buf->base[i]==NULL) return -1;
2950
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
282 memset(buf->base[i], 128, size[i]);
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
283
2c4753d27834 default_get_buffer() cleanup
michael
parents: 2927
diff changeset
284 // no edge if EDEG EMU or not planar YUV, we check for PAL8 redundantly to protect against a exploitable bug regression ...
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
285 if((s->flags&CODEC_FLAG_EMU_EDGE) || (s->pix_fmt == PIX_FMT_PAL8) || !size[2])
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
286 buf->data[i] = buf->base[i];
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
287 else
7941
8a3f24796fa9 Replace second (and wrong) call to avcodec_align_dimensions() by adjusting
michael
parents: 7936
diff changeset
288 buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), stride_align[i]);
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
289 }
5522
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
290 buf->width = s->width;
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
291 buf->height = s->height;
acaaff7b6fb8 ensure that default_get_buffer() doesnt reuse images if the dimension or
michael
parents: 5383
diff changeset
292 buf->pix_fmt= s->pix_fmt;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
293 pic->age= 256*256*256*64;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
294 }
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
295 pic->type= FF_BUFFER_TYPE_INTERNAL;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
296
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
297 for(i=0; i<4; i++){
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
298 pic->base[i]= buf->base[i];
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
299 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
300 pic->linesize[i]= buf->linesize[i];
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
301 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
302 s->internal_buffer_count++;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
303
7631
b5b4bf0944b8 Provide a simpler way for the user to reorder her timestamps.
michael
parents: 7613
diff changeset
304 pic->reordered_opaque= s->reordered_opaque;
b5b4bf0944b8 Provide a simpler way for the user to reorder her timestamps.
michael
parents: 7613
diff changeset
305
7406
7b2819083061 Add a new -debug option for tracing calls to the default get/release_buffer functions.
astrange
parents: 7331
diff changeset
306 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
307 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
308
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
309 return 0;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
310 }
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
311
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
312 void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic){
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
313 int i;
4558
4d1b45b20f8c simplify release_buffer using FFSWAP
aurel
parents: 4552
diff changeset
314 InternalBuffer *buf, *last;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
315
924
3814e9115672 cleanup / messup?
michaelni
parents: 908
diff changeset
316 assert(pic->type==FF_BUFFER_TYPE_INTERNAL);
1396
e380ac39024a cleanup / fixes
michaelni
parents: 1389
diff changeset
317 assert(s->internal_buffer_count);
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
318
1455
c4539ef4d8cb removed warnings
bellard
parents: 1449
diff changeset
319 buf = NULL; /* avoids warning */
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
320 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
321 buf= &((InternalBuffer*)s->internal_buffer)[i];
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
322 if(buf->data[0] == pic->data[0])
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
323 break;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
324 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
325 assert(i < s->internal_buffer_count);
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
326 s->internal_buffer_count--;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
327 last = &((InternalBuffer*)s->internal_buffer)[s->internal_buffer_count];
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
328
4558
4d1b45b20f8c simplify release_buffer using FFSWAP
aurel
parents: 4552
diff changeset
329 FFSWAP(InternalBuffer, *buf, *last);
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
330
5706
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5576
diff changeset
331 for(i=0; i<4; i++){
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
332 pic->data[i]=NULL;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
333 // pic->base[i]=NULL;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
334 }
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
335 //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
336
7b2819083061 Add a new -debug option for tracing calls to the default get/release_buffer functions.
astrange
parents: 7331
diff changeset
337 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
338 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
339 }
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
340
1630
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
341 int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
342 AVFrame temp_pic;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
343 int i;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
344
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
345 /* If no picture return a new buffer */
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
346 if(pic->data[0] == NULL) {
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
347 /* We will copy from buffer, so must be readable */
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
348 pic->buffer_hints |= FF_BUFFER_HINTS_READABLE;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
349 return s->get_buffer(s, pic);
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
350 }
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
351
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
352 /* If internal buffer type return the same buffer */
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
353 if(pic->type == FF_BUFFER_TYPE_INTERNAL)
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
354 return 0;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
355
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
356 /*
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
357 * Not internal type and reget_buffer not overridden, emulate cr buffer
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
358 */
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
359 temp_pic = *pic;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
360 for(i = 0; i < 4; i++)
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
361 pic->data[i] = pic->base[i] = NULL;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
362 pic->opaque = NULL;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
363 /* Allocate new frame */
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
364 if (s->get_buffer(s, pic))
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
365 return -1;
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
366 /* 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
367 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
368 s->height);
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
369 s->release_buffer(s, &temp_pic); // Release old frame
586b5c08863c - Add reget_buffer() function to AVCodecContext
rtognimp
parents: 1606
diff changeset
370 return 0;
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
8129
a9734fe0811e Making it easier to send arbitrary structures as work orders to MT workers
romansh
parents: 8110
diff changeset
373 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
374 int i;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
375
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
376 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
377 int r= func(c, (char*)arg + i*size);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
378 if(ret) ret[i]= r;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
379 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
380 return 0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
381 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1798
diff changeset
382
1858
ea2a4058441c silence warnings
iive
parents: 1856
diff changeset
383 enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt){
998
6129c88a6393 get_format()
michaelni
parents: 992
diff changeset
384 return fmt[0];
6129c88a6393 get_format()
michaelni
parents: 992
diff changeset
385 }
6129c88a6393 get_format()
michaelni
parents: 992
diff changeset
386
1831
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
387 void avcodec_get_frame_defaults(AVFrame *pic){
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
388 memset(pic, 0, sizeof(AVFrame));
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
389
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
390 pic->pts= AV_NOPTS_VALUE;
2488
8dd4672b9f74 make keyframe default for AVFrames
michael
parents: 2453
diff changeset
391 pic->key_frame= 1;
1831
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
392 }
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
393
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
394 AVFrame *avcodec_alloc_frame(void){
1831
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
395 AVFrame *pic= av_malloc(sizeof(AVFrame));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
396
1831
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
397 if(pic==NULL) return NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
398
1831
cd2d7fcfab7a use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents: 1823
diff changeset
399 avcodec_get_frame_defaults(pic);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
400
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
401 return pic;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
402 }
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
403
5542
b0a566346fb1 Add attribute that forces alignment of stack to functions that need it.
ramiro
parents: 5537
diff changeset
404 int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
405 {
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
406 int ret= -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
407
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
408 entangled_thread_counter++;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
409 if(entangled_thread_counter != 1){
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
410 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
411 goto end;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
412 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
413
6069
3670c9e7ff4d Check for avcodec_open codec parameter == NULL and return error in that case
reimar
parents: 6047
diff changeset
414 if(avctx->codec || !codec)
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
415 goto end;
1456
670fca257a69 detect avcodec_open() on an already opened AVCodecContext
michaelni
parents: 1455
diff changeset
416
374
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
417 if (codec->priv_data_size > 0) {
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
418 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
419 if (!avctx->priv_data) {
7f96f6e16f81 Return AVERROR(ENOMEM) on memory allocation failure of avcodec_open.
takis
parents: 5356
diff changeset
420 ret = AVERROR(ENOMEM);
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
421 goto end;
5382
7f96f6e16f81 Return AVERROR(ENOMEM) on memory allocation failure of avcodec_open.
takis
parents: 5356
diff changeset
422 }
374
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
423 } else {
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
424 avctx->priv_data = NULL;
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
425 }
2270
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
426
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
427 if(avctx->coded_width && avctx->coded_height)
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
428 avcodec_set_dimensions(avctx, avctx->coded_width, avctx->coded_height);
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
429 else if(avctx->width && avctx->height)
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
430 avcodec_set_dimensions(avctx, avctx->width, avctx->height);
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2242
diff changeset
431
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
432 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
433 av_freep(&avctx->priv_data);
5383
8a28860d54ba Return AVERROR(EINVAL) when invalid width and/or height are specified to
takis
parents: 5382
diff changeset
434 ret = AVERROR(EINVAL);
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
435 goto end;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
436 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
437
3159
e1157712c1d5 fix segfault with BLUR8.AVI
michael
parents: 3136
diff changeset
438 avctx->codec = codec;
e1157712c1d5 fix segfault with BLUR8.AVI
michael
parents: 3136
diff changeset
439 avctx->codec_id = codec->id;
e1157712c1d5 fix segfault with BLUR8.AVI
michael
parents: 3136
diff changeset
440 avctx->frame_number = 0;
4762
4d346a3ea729 make AVCodec.init() optional
michael
parents: 4714
diff changeset
441 if(avctx->codec->init){
4763
28f41c99b704 indention
michael
parents: 4762
diff changeset
442 ret = avctx->codec->init(avctx);
28f41c99b704 indention
michael
parents: 4762
diff changeset
443 if (ret < 0) {
28f41c99b704 indention
michael
parents: 4762
diff changeset
444 av_freep(&avctx->priv_data);
28f41c99b704 indention
michael
parents: 4762
diff changeset
445 avctx->codec= NULL;
28f41c99b704 indention
michael
parents: 4762
diff changeset
446 goto end;
28f41c99b704 indention
michael
parents: 4762
diff changeset
447 }
4762
4d346a3ea729 make AVCodec.init() optional
michael
parents: 4714
diff changeset
448 }
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
449 ret=0;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
450 end:
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
451 entangled_thread_counter--;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
452 return ret;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
453 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
454
5542
b0a566346fb1 Add attribute that forces alignment of stack to functions that need it.
ramiro
parents: 5537
diff changeset
455 int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx, uint8_t *buf, int buf_size,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
456 const short *samples)
986e461dc072 Initial revision
glantau
parents:
diff changeset
457 {
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
458 if(buf_size < FF_MIN_BUFFER_SIZE && 0){
4526
30b8672a2357 Spelling fix
mbardiaux
parents: 4523
diff changeset
459 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
460 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
461 }
2091
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
462 if((avctx->codec->capabilities & CODEC_CAP_DELAY) || samples){
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
463 int ret = avctx->codec->encode(avctx, buf, buf_size, (void *)samples);
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
464 avctx->frame_number++;
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
465 return ret;
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
466 }else
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
467 return 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
468 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
469
5542
b0a566346fb1 Add attribute that forces alignment of stack to functions that need it.
ramiro
parents: 5537
diff changeset
470 int attribute_align_arg avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
471 const AVFrame *pict)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
472 {
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
473 if(buf_size < FF_MIN_BUFFER_SIZE){
4526
30b8672a2357 Spelling fix
mbardiaux
parents: 4523
diff changeset
474 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
475 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
476 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
477 if(avcodec_check_dimensions(avctx,avctx->width,avctx->height))
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
478 return -1;
2091
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
479 if((avctx->codec->capabilities & CODEC_CAP_DELAY) || pict){
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
480 int ret = avctx->codec->encode(avctx, buf, buf_size, (void *)pict);
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
481 avctx->frame_number++;
2764
2b37bcabe608 spelling fixes
diego
parents: 2756
diff changeset
482 emms_c(); //needed to avoid an emms_c() call before every return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
483
2091
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
484 return ret;
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
485 }else
02a4fd7c606c flush audio encoder buffers at the end
michael
parents: 2032
diff changeset
486 return 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
487 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
488
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
489 int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
2756
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
490 const AVSubtitle *sub)
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
491 {
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
492 int ret;
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
493 ret = avctx->codec->encode(avctx, buf, buf_size, (void *)sub);
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
494 avctx->frame_number++;
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
495 return ret;
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
496 }
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
497
5542
b0a566346fb1 Add attribute that forces alignment of stack to functions that need it.
ramiro
parents: 5537
diff changeset
498 int attribute_align_arg avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
499 int *got_picture_ptr,
6318
73c09e922744 Make avcodec_decode_* functions take const input buffers.
michael
parents: 6219
diff changeset
500 const uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
501 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
502 int ret;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
503
2028
141a9539e270 data_size = 0 cleanup
michael
parents: 2013
diff changeset
504 *got_picture_ptr= 0;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2418
diff changeset
505 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
506 return -1;
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2426
diff changeset
507 if((avctx->codec->capabilities & CODEC_CAP_DELAY) || buf_size){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
508 ret = avctx->codec->decode(avctx, picture, got_picture_ptr,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2426
diff changeset
509 buf, buf_size);
814
8f31ed5bacd1 dont call emms_c() for each MB
michaelni
parents: 762
diff changeset
510
2764
2b37bcabe608 spelling fixes
diego
parents: 2756
diff changeset
511 emms_c(); //needed to avoid an emms_c() call before every return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
512
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
513 if (*got_picture_ptr)
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2426
diff changeset
514 avctx->frame_number++;
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2426
diff changeset
515 }else
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2426
diff changeset
516 ret= 0;
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2426
diff changeset
517
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
518 return ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
519 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
520
5542
b0a566346fb1 Add attribute that forces alignment of stack to functions that need it.
ramiro
parents: 5537
diff changeset
521 int attribute_align_arg avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
522 int *frame_size_ptr,
6318
73c09e922744 Make avcodec_decode_* functions take const input buffers.
michael
parents: 6219
diff changeset
523 const uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
524 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
525 int ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
526
2791
f191093dc8fe check for CODEC_CAP_DELAY in audio decoders too
michael
parents: 2764
diff changeset
527 if((avctx->codec->capabilities & CODEC_CAP_DELAY) || buf_size){
4578
006563b9ab27 dont check buffer size if the decode function wont be called at all
michael
parents: 4577
diff changeset
528 //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
529 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
530 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
531 return -1;
006563b9ab27 dont check buffer size if the decode function wont be called at all
michael
parents: 4577
diff changeset
532 }
006563b9ab27 dont check buffer size if the decode function wont be called at all
michael
parents: 4577
diff changeset
533 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
534 *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
535 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
536 return -1;
006563b9ab27 dont check buffer size if the decode function wont be called at all
michael
parents: 4577
diff changeset
537 }
006563b9ab27 dont check buffer size if the decode function wont be called at all
michael
parents: 4577
diff changeset
538
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
539 ret = avctx->codec->decode(avctx, samples, frame_size_ptr,
2791
f191093dc8fe check for CODEC_CAP_DELAY in audio decoders too
michael
parents: 2764
diff changeset
540 buf, buf_size);
f191093dc8fe check for CODEC_CAP_DELAY in audio decoders too
michael
parents: 2764
diff changeset
541 avctx->frame_number++;
4351
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4350
diff changeset
542 }else{
2791
f191093dc8fe check for CODEC_CAP_DELAY in audio decoders too
michael
parents: 2764
diff changeset
543 ret= 0;
4351
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4350
diff changeset
544 *frame_size_ptr=0;
1e251b54cba2 avcodec_decode_audio2()
michael
parents: 4350
diff changeset
545 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
546 return ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
547 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
548
2756
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
549 int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub,
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
550 int *got_sub_ptr,
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
551 const uint8_t *buf, int buf_size)
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
552 {
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
553 int ret;
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
554
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
555 *got_sub_ptr = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
556 ret = avctx->codec->decode(avctx, sub, got_sub_ptr,
6219
a0a645626940 one "cast discards qualifiers from pointer target type" less
michael
parents: 6184
diff changeset
557 buf, buf_size);
2756
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
558 if (*got_sub_ptr)
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
559 avctx->frame_number++;
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
560 return ret;
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
561 }
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
562
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
563 int avcodec_close(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
564 {
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
565 entangled_thread_counter++;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
566 if(entangled_thread_counter != 1){
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
567 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
568 entangled_thread_counter--;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
569 return -1;
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
570 }
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
571
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
572 if (HAVE_THREADS && avctx->thread_opaque)
5234
c94c4aa7d25f free thread context
benoit
parents: 5227
diff changeset
573 avcodec_thread_free(avctx);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
574 if (avctx->codec->close)
986e461dc072 Initial revision
glantau
parents:
diff changeset
575 avctx->codec->close(avctx);
1994
8d3540dddd1b cleanup & memleak fix
michael
parents: 1901
diff changeset
576 avcodec_default_free_buffers(avctx);
394
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
577 av_freep(&avctx->priv_data);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
578 avctx->codec = NULL;
2806
af3a36e20010 thread mess check for avcodec_open/close()
michael
parents: 2800
diff changeset
579 entangled_thread_counter--;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
580 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
581 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
582
986e461dc072 Initial revision
glantau
parents:
diff changeset
583 AVCodec *avcodec_find_encoder(enum CodecID id)
986e461dc072 Initial revision
glantau
parents:
diff changeset
584 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
585 AVCodec *p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
586 p = first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
587 while (p) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
588 if (p->encode != NULL && p->id == id)
986e461dc072 Initial revision
glantau
parents:
diff changeset
589 return p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
590 p = p->next;
986e461dc072 Initial revision
glantau
parents:
diff changeset
591 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
592 return NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
593 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
594
177
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
595 AVCodec *avcodec_find_encoder_by_name(const char *name)
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
596 {
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
597 AVCodec *p;
8016
81dba4c59fd6 allows calling avcodec_find_(en|de)coder_by_name with NULL parameter
aurel
parents: 7992
diff changeset
598 if (!name)
81dba4c59fd6 allows calling avcodec_find_(en|de)coder_by_name with NULL parameter
aurel
parents: 7992
diff changeset
599 return NULL;
177
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
600 p = first_avcodec;
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
601 while (p) {
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
602 if (p->encode != NULL && strcmp(name,p->name) == 0)
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
603 return p;
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
604 p = p->next;
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
605 }
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
606 return NULL;
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
607 }
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
608
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
609 AVCodec *avcodec_find_decoder(enum CodecID id)
986e461dc072 Initial revision
glantau
parents:
diff changeset
610 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
611 AVCodec *p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
612 p = first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
613 while (p) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
614 if (p->decode != NULL && p->id == id)
986e461dc072 Initial revision
glantau
parents:
diff changeset
615 return p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
616 p = p->next;
986e461dc072 Initial revision
glantau
parents:
diff changeset
617 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
618 return NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
619 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
620
986e461dc072 Initial revision
glantau
parents:
diff changeset
621 AVCodec *avcodec_find_decoder_by_name(const char *name)
986e461dc072 Initial revision
glantau
parents:
diff changeset
622 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
623 AVCodec *p;
8016
81dba4c59fd6 allows calling avcodec_find_(en|de)coder_by_name with NULL parameter
aurel
parents: 7992
diff changeset
624 if (!name)
81dba4c59fd6 allows calling avcodec_find_(en|de)coder_by_name with NULL parameter
aurel
parents: 7992
diff changeset
625 return NULL;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
626 p = first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
627 while (p) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
628 if (p->decode != NULL && strcmp(name,p->name) == 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
629 return p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
630 p = p->next;
986e461dc072 Initial revision
glantau
parents:
diff changeset
631 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
632 return NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
633 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
634
986e461dc072 Initial revision
glantau
parents:
diff changeset
635 void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
986e461dc072 Initial revision
glantau
parents:
diff changeset
636 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
637 const char *codec_name;
986e461dc072 Initial revision
glantau
parents:
diff changeset
638 AVCodec *p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
639 char buf1[32];
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
640 int bitrate;
5837
4400d47f7c91 Print pixel and display aspect ratios
mbardiaux
parents: 5725
diff changeset
641 AVRational display_aspect_ratio;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
642
986e461dc072 Initial revision
glantau
parents:
diff changeset
643 if (encode)
986e461dc072 Initial revision
glantau
parents:
diff changeset
644 p = avcodec_find_encoder(enc->codec_id);
986e461dc072 Initial revision
glantau
parents:
diff changeset
645 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
646 p = avcodec_find_decoder(enc->codec_id);
986e461dc072 Initial revision
glantau
parents:
diff changeset
647
986e461dc072 Initial revision
glantau
parents:
diff changeset
648 if (p) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
649 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
650 } 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
651 /* 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
652 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
653 codec_name = "mpeg2ts";
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
654 } else if (enc->codec_name[0] != '\0') {
986e461dc072 Initial revision
glantau
parents:
diff changeset
655 codec_name = enc->codec_name;
986e461dc072 Initial revision
glantau
parents:
diff changeset
656 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
657 /* output avi tags */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
658 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
659 && isprint((enc->codec_tag>>16)&0xFF) && isprint((enc->codec_tag>>24)&0xFF)){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
660 snprintf(buf1, sizeof(buf1), "%c%c%c%c / 0x%04X",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
661 enc->codec_tag & 0xff,
986e461dc072 Initial revision
glantau
parents:
diff changeset
662 (enc->codec_tag >> 8) & 0xff,
986e461dc072 Initial revision
glantau
parents:
diff changeset
663 (enc->codec_tag >> 16) & 0xff,
2856
9211043e0784 print fourcc in a readable form if possible
michael
parents: 2852
diff changeset
664 (enc->codec_tag >> 24) & 0xff,
9211043e0784 print fourcc in a readable form if possible
michael
parents: 2852
diff changeset
665 enc->codec_tag);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
666 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
667 snprintf(buf1, sizeof(buf1), "0x%04x", enc->codec_tag);
986e461dc072 Initial revision
glantau
parents:
diff changeset
668 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
669 codec_name = buf1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
670 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
671
986e461dc072 Initial revision
glantau
parents:
diff changeset
672 switch(enc->codec_type) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
673 case CODEC_TYPE_VIDEO:
986e461dc072 Initial revision
glantau
parents:
diff changeset
674 snprintf(buf, buf_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
675 "Video: %s%s",
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1368
diff changeset
676 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
677 if (enc->pix_fmt != PIX_FMT_NONE) {
55
6064342168f4 picture utils
glantau
parents: 24
diff changeset
678 snprintf(buf + strlen(buf), buf_size - strlen(buf),
6064342168f4 picture utils
glantau
parents: 24
diff changeset
679 ", %s",
988
001b7d3045e5 moved avcodec_get_chroma_sub_sample() to imgconvert.c
bellard
parents: 963
diff changeset
680 avcodec_get_pix_fmt_name(enc->pix_fmt));
55
6064342168f4 picture utils
glantau
parents: 24
diff changeset
681 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
682 if (enc->width) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
683 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
684 ", %dx%d",
a332778dfa06 print more time_base fps stuff if av_log level is at debug or above
michael
parents: 2881
diff changeset
685 enc->width, enc->height);
6466
3dae816c2485 do not display par and dar if not available
bcoudurier
parents: 6464
diff changeset
686 if (enc->sample_aspect_ratio.num) {
6467
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
687 av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den,
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
688 enc->width*enc->sample_aspect_ratio.num,
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
689 enc->height*enc->sample_aspect_ratio.den,
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
690 1024*1024);
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
691 snprintf(buf + strlen(buf), buf_size - strlen(buf),
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
692 " [PAR %d:%d DAR %d:%d]",
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
693 enc->sample_aspect_ratio.num, enc->sample_aspect_ratio.den,
8cb6b0f6f759 indentation
bcoudurier
parents: 6466
diff changeset
694 display_aspect_ratio.num, display_aspect_ratio.den);
6466
3dae816c2485 do not display par and dar if not available
bcoudurier
parents: 6464
diff changeset
695 }
6012
085be73cb51c use av_log_get/set_level()
mru
parents: 6011
diff changeset
696 if(av_log_get_level() >= AV_LOG_DEBUG){
8611
a637db9f59b1 export gcd function as av_gcd()
aurel
parents: 8603
diff changeset
697 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
698 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
699 ", %d/%d",
a332778dfa06 print more time_base fps stuff if av_log level is at debug or above
michael
parents: 2881
diff changeset
700 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
701 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
702 }
741
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
703 if (encode) {
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
704 snprintf(buf + strlen(buf), buf_size - strlen(buf),
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
705 ", q=%d-%d", enc->qmin, enc->qmax);
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
706 }
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
707 bitrate = enc->bit_rate;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
708 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
709 case CODEC_TYPE_AUDIO:
986e461dc072 Initial revision
glantau
parents:
diff changeset
710 snprintf(buf, buf_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
711 "Audio: %s",
986e461dc072 Initial revision
glantau
parents:
diff changeset
712 codec_name);
986e461dc072 Initial revision
glantau
parents:
diff changeset
713 if (enc->sample_rate) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
714 snprintf(buf + strlen(buf), buf_size - strlen(buf),
8098
c2ab7a8958ed Add audio channel layout API to libavcodec.
pross
parents: 8042
diff changeset
715 ", %d Hz", enc->sample_rate);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
716 }
8098
c2ab7a8958ed Add audio channel layout API to libavcodec.
pross
parents: 8042
diff changeset
717 av_strlcat(buf, ", ", buf_size);
c2ab7a8958ed Add audio channel layout API to libavcodec.
pross
parents: 8042
diff changeset
718 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
719 if (enc->sample_fmt != SAMPLE_FMT_NONE) {
bb5e8cae1d71 Write sample format description within avcodec_string()
pross
parents: 7409
diff changeset
720 snprintf(buf + strlen(buf), buf_size - strlen(buf),
bb5e8cae1d71 Write sample format description within avcodec_string()
pross
parents: 7409
diff changeset
721 ", %s", avcodec_get_sample_fmt_name(enc->sample_fmt));
bb5e8cae1d71 Write sample format description within avcodec_string()
pross
parents: 7409
diff changeset
722 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
723
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
724 /* for PCM codecs, compute bitrate directly */
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
725 switch(enc->codec_id) {
7613
ff395fe35161 Add F64BE, F64LE and F64BE PCM codecs.
pross
parents: 7612
diff changeset
726 case CODEC_ID_PCM_F64BE:
ff395fe35161 Add F64BE, F64LE and F64BE PCM codecs.
pross
parents: 7612
diff changeset
727 case CODEC_ID_PCM_F64LE:
ff395fe35161 Add F64BE, F64LE and F64BE PCM codecs.
pross
parents: 7612
diff changeset
728 bitrate = enc->sample_rate * enc->channels * 64;
ff395fe35161 Add F64BE, F64LE and F64BE PCM codecs.
pross
parents: 7612
diff changeset
729 break;
2852
6f7428adc6ad Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 2840
diff changeset
730 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
731 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
732 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
733 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
734 case CODEC_ID_PCM_F32BE:
7613
ff395fe35161 Add F64BE, F64LE and F64BE PCM codecs.
pross
parents: 7612
diff changeset
735 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
736 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
737 break;
6f7428adc6ad Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 2840
diff changeset
738 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
739 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
740 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
741 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
742 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
743 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
744 break;
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
745 case CODEC_ID_PCM_S16LE:
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
746 case CODEC_ID_PCM_S16BE:
5940
d63186919b60 add pcm_s16le_planar support for electronicarts files
aurel
parents: 5837
diff changeset
747 case CODEC_ID_PCM_S16LE_PLANAR:
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
748 case CODEC_ID_PCM_U16LE:
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
749 case CODEC_ID_PCM_U16BE:
94
7e263a256a6f fixed pcm bitrate
glantau
parents: 92
diff changeset
750 bitrate = enc->sample_rate * enc->channels * 16;
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
751 break;
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
752 case CODEC_ID_PCM_S8:
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
753 case CODEC_ID_PCM_U8:
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
754 case CODEC_ID_PCM_ALAW:
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
755 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
756 case CODEC_ID_PCM_ZORK:
94
7e263a256a6f fixed pcm bitrate
glantau
parents: 92
diff changeset
757 bitrate = enc->sample_rate * enc->channels * 8;
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
758 break;
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
759 default:
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
760 bitrate = enc->bit_rate;
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
761 break;
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
762 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
763 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
764 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
765 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
766 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
767 break;
2756
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
768 case CODEC_TYPE_SUBTITLE:
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
769 snprintf(buf, buf_size, "Subtitle: %s", codec_name);
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
770 bitrate = enc->bit_rate;
d8874c8749ec subtitle codec type support
bellard
parents: 2733
diff changeset
771 break;
6184
4ba171d6d84a Add support for Matroska attachments.
aurel
parents: 6108
diff changeset
772 case CODEC_TYPE_ATTACHMENT:
4ba171d6d84a Add support for Matroska attachments.
aurel
parents: 6108
diff changeset
773 snprintf(buf, buf_size, "Attachment: %s", codec_name);
4ba171d6d84a Add support for Matroska attachments.
aurel
parents: 6108
diff changeset
774 bitrate = enc->bit_rate;
4ba171d6d84a Add support for Matroska attachments.
aurel
parents: 6108
diff changeset
775 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
776 default:
2281
7b345b735ac7 do not call (av_)abort()
michael
parents: 2270
diff changeset
777 snprintf(buf, buf_size, "Invalid Codec type %d", enc->codec_type);
7b345b735ac7 do not call (av_)abort()
michael
parents: 2270
diff changeset
778 return;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
779 }
741
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
780 if (encode) {
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
781 if (enc->flags & CODEC_FLAG_PASS1)
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
782 snprintf(buf + strlen(buf), buf_size - strlen(buf),
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
783 ", pass 1");
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
784 if (enc->flags & CODEC_FLAG_PASS2)
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
785 snprintf(buf + strlen(buf), buf_size - strlen(buf),
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
786 ", pass 2");
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
787 }
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
788 if (bitrate != 0) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
789 snprintf(buf + strlen(buf), buf_size - strlen(buf),
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
790 ", %d kb/s", bitrate / 1000);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
791 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
792 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
793
362
1ee4ba4ca783 version info
nickols_k
parents: 341
diff changeset
794 unsigned avcodec_version( void )
1ee4ba4ca783 version info
nickols_k
parents: 341
diff changeset
795 {
1ee4ba4ca783 version info
nickols_k
parents: 341
diff changeset
796 return LIBAVCODEC_VERSION_INT;
1ee4ba4ca783 version info
nickols_k
parents: 341
diff changeset
797 }
55
6064342168f4 picture utils
glantau
parents: 24
diff changeset
798
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
799 void avcodec_init(void)
986e461dc072 Initial revision
glantau
parents:
diff changeset
800 {
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6346
diff changeset
801 static int initialized = 0;
303
9a931fd8d06c multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents: 267
diff changeset
802
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6346
diff changeset
803 if (initialized != 0)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2969
diff changeset
804 return;
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6346
diff changeset
805 initialized = 1;
303
9a931fd8d06c multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents: 267
diff changeset
806
4197
bbe0bc387a19 revert bad checkin
mru
parents: 4196
diff changeset
807 dsputil_static_init();
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
808 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
809
341
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 337
diff changeset
810 void avcodec_flush_buffers(AVCodecContext *avctx)
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 337
diff changeset
811 {
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1353
diff changeset
812 if(avctx->codec->flush)
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1353
diff changeset
813 avctx->codec->flush(avctx);
341
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 337
diff changeset
814 }
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 337
diff changeset
815
2231
c87bab25f89f changing size segfault fix
michael
parents: 2169
diff changeset
816 void avcodec_default_free_buffers(AVCodecContext *s){
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
817 int i, j;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
818
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
819 if(s->internal_buffer==NULL) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
820
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
821 for(i=0; i<INTERNAL_BUFFER_SIZE; i++){
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
822 InternalBuffer *buf= &((InternalBuffer*)s->internal_buffer)[i];
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
823 for(j=0; j<4; j++){
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
824 av_freep(&buf->base[j]);
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
825 buf->data[j]= NULL;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
826 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
827 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
828 av_freep(&s->internal_buffer);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2950
diff changeset
829
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
830 s->internal_buffer_count=0;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
831 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
832
1264
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
833 char av_get_pict_type_char(int pict_type){
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
834 switch(pict_type){
6450
c32be43b52b2 remove more useless mpegvideo.h includes
aurel
parents: 6407
diff changeset
835 case FF_I_TYPE: return 'I';
c32be43b52b2 remove more useless mpegvideo.h includes
aurel
parents: 6407
diff changeset
836 case FF_P_TYPE: return 'P';
c32be43b52b2 remove more useless mpegvideo.h includes
aurel
parents: 6407
diff changeset
837 case FF_B_TYPE: return 'B';
c32be43b52b2 remove more useless mpegvideo.h includes
aurel
parents: 6407
diff changeset
838 case FF_S_TYPE: return 'S';
c32be43b52b2 remove more useless mpegvideo.h includes
aurel
parents: 6407
diff changeset
839 case FF_SI_TYPE:return 'i';
c32be43b52b2 remove more useless mpegvideo.h includes
aurel
parents: 6407
diff changeset
840 case FF_SP_TYPE:return 'p';
6456
ff4fa36b555e define BI frame type along with other frame types
aurel
parents: 6455
diff changeset
841 case FF_BI_TYPE:return 'b';
6455
6efe6fb35b1a cosmetic: align
aurel
parents: 6450
diff changeset
842 default: return '?';
1264
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
843 }
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
844 }
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
845
3433
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
846 int av_get_bits_per_sample(enum CodecID codec_id){
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
847 switch(codec_id){
3435
ffa9e863f3be simplify the voc demuxer using av_get_bits_per_sample()
aurel
parents: 3433
diff changeset
848 case CODEC_ID_ADPCM_SBPRO_2:
3438
fbf61a160154 set proper bits_per_sample value for ADPCM codecs
aurel
parents: 3435
diff changeset
849 return 2;
3435
ffa9e863f3be simplify the voc demuxer using av_get_bits_per_sample()
aurel
parents: 3433
diff changeset
850 case CODEC_ID_ADPCM_SBPRO_3:
3438
fbf61a160154 set proper bits_per_sample value for ADPCM codecs
aurel
parents: 3435
diff changeset
851 return 3;
3435
ffa9e863f3be simplify the voc demuxer using av_get_bits_per_sample()
aurel
parents: 3433
diff changeset
852 case CODEC_ID_ADPCM_SBPRO_4:
3438
fbf61a160154 set proper bits_per_sample value for ADPCM codecs
aurel
parents: 3435
diff changeset
853 case CODEC_ID_ADPCM_CT:
fbf61a160154 set proper bits_per_sample value for ADPCM codecs
aurel
parents: 3435
diff changeset
854 return 4;
3433
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
855 case CODEC_ID_PCM_ALAW:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
856 case CODEC_ID_PCM_MULAW:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
857 case CODEC_ID_PCM_S8:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
858 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
859 case CODEC_ID_PCM_ZORK:
3433
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
860 return 8;
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
861 case CODEC_ID_PCM_S16BE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
862 case CODEC_ID_PCM_S16LE:
5940
d63186919b60 add pcm_s16le_planar support for electronicarts files
aurel
parents: 5837
diff changeset
863 case CODEC_ID_PCM_S16LE_PLANAR:
3433
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
864 case CODEC_ID_PCM_U16BE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
865 case CODEC_ID_PCM_U16LE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
866 return 16;
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
867 case CODEC_ID_PCM_S24DAUD:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
868 case CODEC_ID_PCM_S24BE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
869 case CODEC_ID_PCM_S24LE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
870 case CODEC_ID_PCM_U24BE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
871 case CODEC_ID_PCM_U24LE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
872 return 24;
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
873 case CODEC_ID_PCM_S32BE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
874 case CODEC_ID_PCM_S32LE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
875 case CODEC_ID_PCM_U32BE:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
876 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
877 case CODEC_ID_PCM_F32BE:
7613
ff395fe35161 Add F64BE, F64LE and F64BE PCM codecs.
pross
parents: 7612
diff changeset
878 case CODEC_ID_PCM_F32LE:
3433
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
879 return 32;
7613
ff395fe35161 Add F64BE, F64LE and F64BE PCM codecs.
pross
parents: 7612
diff changeset
880 case CODEC_ID_PCM_F64BE:
ff395fe35161 Add F64BE, F64LE and F64BE PCM codecs.
pross
parents: 7612
diff changeset
881 case CODEC_ID_PCM_F64LE:
ff395fe35161 Add F64BE, F64LE and F64BE PCM codecs.
pross
parents: 7612
diff changeset
882 return 64;
3433
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
883 default:
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
884 return 0;
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
885 }
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
886 }
e1906b2f1daf av_get_bits_per_sample and due simplifications
bcoudurier
parents: 3420
diff changeset
887
5537
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
888 int av_get_bits_per_sample_format(enum SampleFormat sample_fmt) {
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
889 switch (sample_fmt) {
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
890 case SAMPLE_FMT_U8:
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
891 return 8;
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
892 case SAMPLE_FMT_S16:
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
893 return 16;
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
894 case SAMPLE_FMT_S32:
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
895 case SAMPLE_FMT_FLT:
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
896 return 32;
7612
1302ec81afc0 Add SAMPLE_FMT_DBL.
pross
parents: 7587
diff changeset
897 case SAMPLE_FMT_DBL:
1302ec81afc0 Add SAMPLE_FMT_DBL.
pross
parents: 7587
diff changeset
898 return 64;
5537
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
899 default:
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
900 return 0;
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
901 }
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
902 }
3d10c3e84f96 Add av_get_bits_per_sample_format()
conrad
parents: 5522
diff changeset
903
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8588
diff changeset
904 #if !HAVE_THREADS
2013
85e547a18d87 dummy avcodec_thread_init() to avoid linking issues
michael
parents: 2002
diff changeset
905 int avcodec_thread_init(AVCodecContext *s, int thread_count){
85e547a18d87 dummy avcodec_thread_init() to avoid linking issues
michael
parents: 2002
diff changeset
906 return -1;
85e547a18d87 dummy avcodec_thread_init() to avoid linking issues
michael
parents: 2002
diff changeset
907 }
85e547a18d87 dummy avcodec_thread_init() to avoid linking issues
michael
parents: 2002
diff changeset
908 #endif
2676
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
909
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
910 unsigned int av_xiphlacing(unsigned char *s, unsigned int v)
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
911 {
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
912 unsigned int n = 0;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
913
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
914 while(v >= 0xff) {
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
915 *s++ = 0xff;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
916 v -= 0xff;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
917 n++;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
918 }
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
919 *s = v;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
920 n++;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
921 return n;
0975710cf7f4 change extradata format for vorbis
mru
parents: 2652
diff changeset
922 }
3233
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
923
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
924 /* 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
925 * 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
926 * *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
927 * 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
928 * and opened file name in **filename. */
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
929 int av_tempfile(char *prefix, char **filename) {
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
930 int fd=-1;
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8588
diff changeset
931 #if !HAVE_MKSTEMP
3233
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
932 *filename = tempnam(".", prefix);
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
933 #else
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
934 size_t len = strlen(prefix) + 12; /* room for "/tmp/" and "XXXXXX\0" */
3372
055f0405c523 anothe useless sizeof(char)
reynaldo
parents: 3336
diff changeset
935 *filename = av_malloc(len);
3233
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
936 #endif
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
937 /* -----common section-----*/
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
938 if (*filename == NULL) {
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
939 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
940 return -1;
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
941 }
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8588
diff changeset
942 #if !HAVE_MKSTEMP
5285
6661692d34b4 Remove underscores before fcntl flags
ramiro
parents: 5284
diff changeset
943 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
944 #else
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
945 snprintf(*filename, len, "/tmp/%sXXXXXX", prefix);
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
946 fd = mkstemp(*filename);
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
947 if (fd < 0) {
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
948 snprintf(*filename, len, "./%sXXXXXX", prefix);
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
949 fd = mkstemp(*filename);
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
950 }
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
951 #endif
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
952 /* -----common section-----*/
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
953 if (fd < 0) {
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
954 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
955 return -1;
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
956 }
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
957 return fd; /* success */
18af2f7788c6 - Add new file internal.h for common internal-use-only functions.
corey
parents: 3171
diff changeset
958 }
5126
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
959
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
960 typedef struct {
5176
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
961 const char *abbr;
5126
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
962 int width, height;
5176
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
963 } VideoFrameSizeAbbr;
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
964
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
965 typedef struct {
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
966 const char *abbr;
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
967 int rate_num, rate_den;
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
968 } VideoFrameRateAbbr;
5126
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
969
7129
322023e630a6 mark read-only data as const
stefang
parents: 7036
diff changeset
970 static const VideoFrameSizeAbbr video_frame_size_abbrs[] = {
5176
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
971 { "ntsc", 720, 480 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
972 { "pal", 720, 576 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
973 { "qntsc", 352, 240 }, /* VCD compliant NTSC */
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
974 { "qpal", 352, 288 }, /* VCD compliant PAL */
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
975 { "sntsc", 640, 480 }, /* square pixel NTSC */
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
976 { "spal", 768, 576 }, /* square pixel PAL */
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
977 { "film", 352, 240 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
978 { "ntsc-film", 352, 240 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
979 { "sqcif", 128, 96 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
980 { "qcif", 176, 144 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
981 { "cif", 352, 288 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
982 { "4cif", 704, 576 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
983 { "qqvga", 160, 120 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
984 { "qvga", 320, 240 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
985 { "vga", 640, 480 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
986 { "svga", 800, 600 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
987 { "xga", 1024, 768 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
988 { "uxga", 1600,1200 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
989 { "qxga", 2048,1536 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
990 { "sxga", 1280,1024 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
991 { "qsxga", 2560,2048 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
992 { "hsxga", 5120,4096 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
993 { "wvga", 852, 480 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
994 { "wxga", 1366, 768 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
995 { "wsxga", 1600,1024 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
996 { "wuxga", 1920,1200 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
997 { "woxga", 2560,1600 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
998 { "wqsxga", 3200,2048 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
999 { "wquxga", 3840,2400 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1000 { "whsxga", 6400,4096 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1001 { "whuxga", 7680,4800 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1002 { "cga", 320, 200 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1003 { "ega", 640, 350 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1004 { "hd480", 852, 480 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1005 { "hd720", 1280, 720 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1006 { "hd1080", 1920,1080 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1007 };
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1008
7129
322023e630a6 mark read-only data as const
stefang
parents: 7036
diff changeset
1009 static const VideoFrameRateAbbr video_frame_rate_abbrs[]= {
5176
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1010 { "ntsc", 30000, 1001 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1011 { "pal", 25, 1 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1012 { "qntsc", 30000, 1001 }, /* VCD compliant NTSC */
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1013 { "qpal", 25, 1 }, /* VCD compliant PAL */
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1014 { "sntsc", 30000, 1001 }, /* square pixel NTSC */
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1015 { "spal", 25, 1 }, /* square pixel PAL */
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1016 { "film", 24, 1 },
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1017 { "ntsc-film", 24000, 1001 },
5126
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1018 };
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1019
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1020 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
1021 {
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1022 int i;
8042
e70975d5ff80 uses FF_ARRAY_ELEMS() where appropriate
aurel
parents: 8016
diff changeset
1023 int n = FF_ARRAY_ELEMS(video_frame_size_abbrs);
5126
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1024 const char *p;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1025 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
1026
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1027 for(i=0;i<n;i++) {
5176
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1028 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
1029 frame_width = video_frame_size_abbrs[i].width;
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1030 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
1031 break;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1032 }
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1033 }
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1034 if (i == n) {
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1035 p = str;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1036 frame_width = strtol(p, (char **)&p, 10);
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1037 if (*p)
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1038 p++;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1039 frame_height = strtol(p, (char **)&p, 10);
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1040 }
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1041 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
1042 return -1;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1043 *width_ptr = frame_width;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1044 *height_ptr = frame_height;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1045 return 0;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1046 }
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1047
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1048 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
1049 {
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1050 int i;
8042
e70975d5ff80 uses FF_ARRAY_ELEMS() where appropriate
aurel
parents: 8016
diff changeset
1051 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
1052 char* cp;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1053
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1054 /* First, we check our abbreviation table */
5176
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1055 for (i = 0; i < n; ++i)
82f7eaa32f46 split frame rate and frame size abbreviation into two structures
benoit
parents: 5127
diff changeset
1056 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
1057 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
1058 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
1059 return 0;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1060 }
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1061
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1062 /* 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
1063 cp = strchr(arg, '/');
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1064 if (!cp)
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1065 cp = strchr(arg, ':');
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1066 if (cp) {
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1067 char* cpp;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1068 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
1069 if (cpp != arg || cpp == cp)
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1070 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
1071 else
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1072 frame_rate->num = 0;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1073 }
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1074 else {
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1075 /* Finally we give up and parse it as double */
7826
ddbb45888e46 Remove DEFAULT_FRAME_RATE_BASE.
michael
parents: 7825
diff changeset
1076 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
1077 frame_rate->den = time_base.den;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1078 frame_rate->num = time_base.num;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1079 }
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1080 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
1081 return -1;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1082 else
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1083 return 0;
7982b376b58a Move the video size and rate abbreviations system from libavformat to libavcodec
benoit
parents: 4986
diff changeset
1084 }
7530
398636f16e7e Add a generic function to lavc to log messages about missing features.
superdump
parents: 7475
diff changeset
1085
8281
f93efc084e41 Make av_log_missing_feature an internal function, and change its name
stefano
parents: 8227
diff changeset
1086 void ff_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
1087 {
398636f16e7e Add a generic function to lavc to log messages about missing features.
superdump
parents: 7475
diff changeset
1088 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
1089 "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
1090 "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
1091 "been implemented.", feature);
398636f16e7e Add a generic function to lavc to log messages about missing features.
superdump
parents: 7475
diff changeset
1092 if(want_sample)
8603
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1093 ff_log_ask_for_sample(avc, NULL);
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1094 else
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1095 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
1096 }
8603
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1097
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1098 void ff_log_ask_for_sample(void *avc, const char *msg)
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1099 {
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1100 if (msg)
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1101 av_log(avc, AV_LOG_WARNING, "%s ", msg);
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1102 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
1103 "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
1104 "and contact the ffmpeg-devel mailing list.\n");
555c2ab21d84 Split ff_log_missing_feature into ff_log_missing_feature
benoit
parents: 8596
diff changeset
1105 }