annotate utils.c @ 1588:de5e2acd0f80 libavcodec

initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
author michael
date Thu, 30 Oct 2003 21:05:00 +0000
parents 6b224ca24033
children 932d306bf1dc
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
429
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
3 * Copyright (c) 2001 Fabrice Bellard.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4 *
429
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
5 * This library is free software; you can redistribute it and/or
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
7 * License as published by the Free Software Foundation; either
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
8 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
9 *
429
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
10 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
13 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 *
429
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
16 * License along with this library; if not, write to the Free Software
718a22dc121f license/copyright change
glantau
parents: 400
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
18 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
19
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
20 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
21 * @file utils.c
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
22 * utils.
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
23 */
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
24
394
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
25 #include "avcodec.h"
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
26 #include "dsputil.h"
341
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 337
diff changeset
27 #include "mpegvideo.h"
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
28
862
058194d7ade6 * fixing some minor const warnings
kabi
parents: 851
diff changeset
29 void *av_mallocz(unsigned int size)
394
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
30 {
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
31 void *ptr;
908
2ac4caad5ca6 print a warning if something allocates 0 bytes
michaelni
parents: 903
diff changeset
32
394
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
33 ptr = av_malloc(size);
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
34 if (!ptr)
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
35 return NULL;
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
36 memset(ptr, 0, size);
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
37 return ptr;
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
38 }
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
39
1031
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
40 char *av_strdup(const char *s)
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
41 {
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
42 char *ptr;
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
43 int len;
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
44 len = strlen(s) + 1;
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
45 ptr = av_malloc(len);
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
46 if (!ptr)
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
47 return NULL;
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
48 memcpy(ptr, s, len);
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
49 return ptr;
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
50 }
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
51
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
52 /**
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
53 * realloc which does nothing if the block is large enough
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
54 */
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1032
diff changeset
55 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
56 {
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
57 if(min_size < *size)
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
58 return ptr;
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
59
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
60 *size= min_size + 10*1024;
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
61
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
62 return av_realloc(ptr, *size);
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
63 }
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
64
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
65
902
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
66 /* allocation of static arrays - do not use for normal allocation */
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
67 static unsigned int last_static = 0;
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
68 static char*** array_static = NULL;
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
69 static const unsigned int grow_static = 64; // ^2
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
70 void *__av_mallocz_static(void** location, unsigned int size)
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
71 {
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1032
diff changeset
72 unsigned int l = (last_static + grow_static) & ~(grow_static - 1);
902
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
73 void *ptr = av_mallocz(size);
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
74 if (!ptr)
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
75 return NULL;
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
76
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
77 if (location)
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
78 {
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
79 if (l > last_static)
1031
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
80 array_static = av_realloc(array_static, l);
902
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
81 array_static[last_static++] = (char**) location;
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
82 *location = ptr;
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
83 }
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
84 return ptr;
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
85 }
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
86 /* free all static arrays and reset pointers to 0 */
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1264
diff changeset
87 void av_free_static(void)
902
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
88 {
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
89 if (array_static)
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
90 {
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
91 unsigned i;
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
92 for (i = 0; i < last_static; i++)
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
93 {
1031
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
94 av_free(*array_static[i]);
902
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
95 *array_static[i] = NULL;
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
96 }
1031
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 998
diff changeset
97 av_free(array_static);
902
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
98 array_static = 0;
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
99 }
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
100 last_static = 0;
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
101 }
6acc8394960d * two functions to handle allocation of static data more simple
kabi
parents: 862
diff changeset
102
400
b0aed401a756 better av_freep()
glantau
parents: 394
diff changeset
103 /* cannot call it directly because of 'void **' casting is not automatic */
b0aed401a756 better av_freep()
glantau
parents: 394
diff changeset
104 void __av_freep(void **ptr)
b0aed401a756 better av_freep()
glantau
parents: 394
diff changeset
105 {
b0aed401a756 better av_freep()
glantau
parents: 394
diff changeset
106 av_free(*ptr);
b0aed401a756 better av_freep()
glantau
parents: 394
diff changeset
107 *ptr = NULL;
b0aed401a756 better av_freep()
glantau
parents: 394
diff changeset
108 }
b0aed401a756 better av_freep()
glantau
parents: 394
diff changeset
109
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
110 /* encoder management */
986e461dc072 Initial revision
glantau
parents:
diff changeset
111 AVCodec *first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
112
986e461dc072 Initial revision
glantau
parents:
diff changeset
113 void register_avcodec(AVCodec *format)
986e461dc072 Initial revision
glantau
parents:
diff changeset
114 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
115 AVCodec **p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
116 p = &first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
117 while (*p != NULL) p = &(*p)->next;
986e461dc072 Initial revision
glantau
parents:
diff changeset
118 *p = format;
986e461dc072 Initial revision
glantau
parents:
diff changeset
119 format->next = NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
120 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
121
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
122 typedef struct InternalBuffer{
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
123 int last_pic_num;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
124 uint8_t *base[4];
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
125 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
126 int linesize[4];
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
127 }InternalBuffer;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
128
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
129 #define INTERNAL_BUFFER_SIZE 32
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
130
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
131 #define ALIGN(x, a) (((x)+(a)-1)&~((a)-1))
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
132
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
133 void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
134 int w_align= 1;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
135 int h_align= 1;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
136
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
137 switch(s->pix_fmt){
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
138 case PIX_FMT_YUV420P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
139 case PIX_FMT_YUV422:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
140 case PIX_FMT_YUV422P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
141 case PIX_FMT_YUV444P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
142 case PIX_FMT_GRAY8:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
143 case PIX_FMT_YUVJ420P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
144 case PIX_FMT_YUVJ422P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
145 case PIX_FMT_YUVJ444P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
146 w_align= 16; //FIXME check for non mpeg style codecs and use less alignment
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
147 h_align= 16;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
148 break;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
149 case PIX_FMT_YUV411P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
150 w_align=32;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
151 h_align=8;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
152 break;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
153 case PIX_FMT_YUV410P:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
154 if(s->codec_id == CODEC_ID_SVQ1){
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
155 w_align=64;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
156 h_align=64;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
157 }
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
158 break;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
159 default:
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
160 w_align= 1;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
161 h_align= 1;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
162 break;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
163 }
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
164
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
165 *width = ALIGN(*width , w_align);
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
166 *height= ALIGN(*height, h_align);
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
167 }
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
168
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
169 int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
170 int i;
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
171 int w= s->width;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
172 int h= s->height;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
173 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
174 int *picture_number;
924
3814e9115672 cleanup / messup?
michaelni
parents: 908
diff changeset
175
3814e9115672 cleanup / messup?
michaelni
parents: 908
diff changeset
176 assert(pic->data[0]==NULL);
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
177 assert(INTERNAL_BUFFER_SIZE > s->internal_buffer_count);
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
178
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
179 if(s->internal_buffer==NULL){
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
180 s->internal_buffer= av_mallocz(INTERNAL_BUFFER_SIZE*sizeof(InternalBuffer));
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
181 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
182 #if 0
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
183 s->internal_buffer= av_fast_realloc(
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
184 s->internal_buffer,
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
185 &s->internal_buffer_size,
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
186 sizeof(InternalBuffer)*FFMAX(99, s->internal_buffer_count+1)/*FIXME*/
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
187 );
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
188 #endif
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
189
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
190 buf= &((InternalBuffer*)s->internal_buffer)[s->internal_buffer_count];
1588
de5e2acd0f80 initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents: 1585
diff changeset
191 picture_number= &(((InternalBuffer*)s->internal_buffer)[INTERNAL_BUFFER_SIZE-1]).last_pic_num; //FIXME ugly hack
de5e2acd0f80 initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents: 1585
diff changeset
192 (*picture_number)++;
de5e2acd0f80 initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents: 1585
diff changeset
193
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
194 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
195 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
196 buf->last_pic_num= *picture_number;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
197 }else{
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
198 int h_chroma_shift, v_chroma_shift;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
199 int s_align, pixel_size;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
200
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
201 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
202
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
203 switch(s->pix_fmt){
1291
384110c44dec rgb15 & rgb16 fix
michaelni
parents: 1282
diff changeset
204 case PIX_FMT_RGB555:
384110c44dec rgb15 & rgb16 fix
michaelni
parents: 1282
diff changeset
205 case PIX_FMT_RGB565:
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
206 case PIX_FMT_YUV422:
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
207 pixel_size=2;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
208 break;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
209 case PIX_FMT_RGB24:
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
210 case PIX_FMT_BGR24:
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
211 pixel_size=3;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
212 break;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
213 case PIX_FMT_RGBA32:
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
214 pixel_size=4;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
215 break;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
216 default:
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
217 pixel_size=1;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
218 }
1538
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
219
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
220 avcodec_align_dimensions(s, &w, &h);
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
221 #if defined(ARCH_POWERPC) || defined(HAVE_MMI) //FIXME some cleaner check
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
222 s_align= 16;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
223 #else
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
224 s_align= 8;
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
225 #endif
2312ceb69d17 default_get_buffer() fixes
michael
parents: 1505
diff changeset
226
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
227 if(!(s->flags&CODEC_FLAG_EMU_EDGE)){
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
228 w+= EDGE_WIDTH*2;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
229 h+= EDGE_WIDTH*2;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
230 }
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
231
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
232 buf->last_pic_num= -256*256*256*64;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
233
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
234 for(i=0; i<3; i++){
1165
michaelni
parents: 1150
diff changeset
235 const int h_shift= i==0 ? 0 : h_chroma_shift;
michaelni
parents: 1150
diff changeset
236 const int v_shift= i==0 ? 0 : v_chroma_shift;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
237
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
238 buf->linesize[i]= ALIGN(pixel_size*w>>h_shift, s_align);
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
239
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
240 buf->base[i]= av_mallocz((buf->linesize[i]*h>>v_shift)+16); //FIXME 16
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
241 if(buf->base[i]==NULL) return -1;
1588
de5e2acd0f80 initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents: 1585
diff changeset
242 memset(buf->base[i], 128, buf->linesize[i]*h>>v_shift);
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
243
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
244 if(s->flags&CODEC_FLAG_EMU_EDGE)
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
245 buf->data[i] = buf->base[i];
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
246 else
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
247 buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), s_align);
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
248 }
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
249 pic->age= 256*256*256*64;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
250 }
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
251 pic->type= FF_BUFFER_TYPE_INTERNAL;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
252
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
253 for(i=0; i<4; i++){
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
254 pic->base[i]= buf->base[i];
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
255 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
256 pic->linesize[i]= buf->linesize[i];
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
257 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
258 s->internal_buffer_count++;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
259
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
260 return 0;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
261 }
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
262
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
263 void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic){
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
264 int i;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
265 InternalBuffer *buf, *last, temp;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
266
924
3814e9115672 cleanup / messup?
michaelni
parents: 908
diff changeset
267 assert(pic->type==FF_BUFFER_TYPE_INTERNAL);
1396
e380ac39024a cleanup / fixes
michaelni
parents: 1389
diff changeset
268 assert(s->internal_buffer_count);
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
269
1455
c4539ef4d8cb removed warnings
bellard
parents: 1449
diff changeset
270 buf = NULL; /* avoids warning */
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
271 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
272 buf= &((InternalBuffer*)s->internal_buffer)[i];
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
273 if(buf->data[0] == pic->data[0])
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
274 break;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
275 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
276 assert(i < s->internal_buffer_count);
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
277 s->internal_buffer_count--;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
278 last = &((InternalBuffer*)s->internal_buffer)[s->internal_buffer_count];
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
279
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
280 temp= *buf;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
281 *buf= *last;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
282 *last= temp;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
283
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
284 for(i=0; i<3; i++){
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
285 pic->data[i]=NULL;
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
286 // pic->base[i]=NULL;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
287 }
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
288 //printf("R%X\n", pic->opaque);
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
289 }
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
290
998
6129c88a6393 get_format()
michaelni
parents: 992
diff changeset
291 enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, enum PixelFormat * fmt){
6129c88a6393 get_format()
michaelni
parents: 992
diff changeset
292 return fmt[0];
6129c88a6393 get_format()
michaelni
parents: 992
diff changeset
293 }
6129c88a6393 get_format()
michaelni
parents: 992
diff changeset
294
681
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
295 void avcodec_get_context_defaults(AVCodecContext *s){
685
44a1dab0205c fixing apiexample
michaelni
parents: 681
diff changeset
296 s->bit_rate= 800*1000;
44a1dab0205c fixing apiexample
michaelni
parents: 681
diff changeset
297 s->bit_rate_tolerance= s->bit_rate*10;
681
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
298 s->qmin= 2;
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
299 s->qmax= 31;
932
176fd8c8e8a8 mb qp limits
michaelni
parents: 927
diff changeset
300 s->mb_qmin= 2;
176fd8c8e8a8 mb qp limits
michaelni
parents: 927
diff changeset
301 s->mb_qmax= 31;
681
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
302 s->rc_eq= "tex^qComp";
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
303 s->qcompress= 0.5;
685
44a1dab0205c fixing apiexample
michaelni
parents: 681
diff changeset
304 s->max_qdiff= 3;
44a1dab0205c fixing apiexample
michaelni
parents: 681
diff changeset
305 s->b_quant_factor=1.25;
44a1dab0205c fixing apiexample
michaelni
parents: 681
diff changeset
306 s->b_quant_offset=1.25;
686
83d2c9d50d7d fixing i_quant_factor, this should finally fix the bitrate bug with ffserver hopefully
michaelni
parents: 685
diff changeset
307 s->i_quant_factor=-0.8;
685
44a1dab0205c fixing apiexample
michaelni
parents: 681
diff changeset
308 s->i_quant_offset=0.0;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 742
diff changeset
309 s->error_concealment= 3;
762
5da504c8c90e more defaults
michaelni
parents: 745
diff changeset
310 s->error_resilience= 1;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 742
diff changeset
311 s->workaround_bugs= FF_BUG_AUTODETECT;
1126
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
312 s->frame_rate_base= 1;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
313 s->frame_rate = 25;
762
5da504c8c90e more defaults
michaelni
parents: 745
diff changeset
314 s->gop_size= 50;
5da504c8c90e more defaults
michaelni
parents: 745
diff changeset
315 s->me_method= ME_EPZS;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
316 s->get_buffer= avcodec_default_get_buffer;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
317 s->release_buffer= avcodec_default_release_buffer;
998
6129c88a6393 get_format()
michaelni
parents: 992
diff changeset
318 s->get_format= avcodec_default_get_format;
954
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 932
diff changeset
319 s->me_subpel_quality=8;
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1456
diff changeset
320 s->lmin= FF_QP2LAMBDA * s->qmin;
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1456
diff changeset
321 s->lmax= FF_QP2LAMBDA * s->qmax;
1548
dd544554ed42 AVRational
michael
parents: 1541
diff changeset
322 s->sample_aspect_ratio= (AVRational){0,1};
1150
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1139
diff changeset
323
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1139
diff changeset
324 s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS;
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1139
diff changeset
325 s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS;
1585
6b224ca24033 revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents: 1582
diff changeset
326 s->palctrl = NULL;
681
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
327 }
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
328
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
329 /**
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
330 * allocates a AVCodecContext and set it to defaults.
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
331 * this can be deallocated by simply calling free()
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
332 */
703
65f9e32225ba Minor warning fix.
mellum
parents: 686
diff changeset
333 AVCodecContext *avcodec_alloc_context(void){
681
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
334 AVCodecContext *avctx= av_mallocz(sizeof(AVCodecContext));
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
335
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
336 if(avctx==NULL) return NULL;
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
337
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
338 avcodec_get_context_defaults(avctx);
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
339
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
340 return avctx;
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
341 }
b3869ffff47a avcodec_alloc_context()
michaelni
parents: 583
diff changeset
342
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
343 /**
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
344 * allocates a AVPFrame and set it to defaults.
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
345 * this can be deallocated by simply calling free()
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
346 */
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
347 AVFrame *avcodec_alloc_frame(void){
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
348 AVFrame *pic= av_mallocz(sizeof(AVFrame));
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
349
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
350 return pic;
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
351 }
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
352
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
353 int avcodec_open(AVCodecContext *avctx, AVCodec *codec)
986e461dc072 Initial revision
glantau
parents:
diff changeset
354 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
355 int ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
356
1456
670fca257a69 detect avcodec_open() on an already opened AVCodecContext
michaelni
parents: 1455
diff changeset
357 if(avctx->codec)
670fca257a69 detect avcodec_open() on an already opened AVCodecContext
michaelni
parents: 1455
diff changeset
358 return -1;
670fca257a69 detect avcodec_open() on an already opened AVCodecContext
michaelni
parents: 1455
diff changeset
359
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
360 avctx->codec = codec;
927
60241e4290e3 * fill codec_id in codec_open
kabi
parents: 925
diff changeset
361 avctx->codec_id = codec->id;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
362 avctx->frame_number = 0;
374
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
363 if (codec->priv_data_size > 0) {
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
364 avctx->priv_data = av_mallocz(codec->priv_data_size);
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
365 if (!avctx->priv_data)
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
366 return -ENOMEM;
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
367 } else {
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
368 avctx->priv_data = NULL;
02147e22f8c8 * Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents: 362
diff changeset
369 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
370 ret = avctx->codec->init(avctx);
986e461dc072 Initial revision
glantau
parents:
diff changeset
371 if (ret < 0) {
394
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
372 av_freep(&avctx->priv_data);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
373 return ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
374 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
375 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
376 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
377
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
378 int avcodec_encode_audio(AVCodecContext *avctx, uint8_t *buf, int buf_size,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
379 const short *samples)
986e461dc072 Initial revision
glantau
parents:
diff changeset
380 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
381 int ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
382
986e461dc072 Initial revision
glantau
parents:
diff changeset
383 ret = avctx->codec->encode(avctx, buf, buf_size, (void *)samples);
986e461dc072 Initial revision
glantau
parents:
diff changeset
384 avctx->frame_number++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
385 return ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
386 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
387
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
388 int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
389 const AVFrame *pict)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
390 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
391 int ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
392
986e461dc072 Initial revision
glantau
parents:
diff changeset
393 ret = avctx->codec->encode(avctx, buf, buf_size, (void *)pict);
814
8f31ed5bacd1 dont call emms_c() for each MB
michaelni
parents: 762
diff changeset
394
8f31ed5bacd1 dont call emms_c() for each MB
michaelni
parents: 762
diff changeset
395 emms_c(); //needed to avoid a emms_c() call before every return;
8f31ed5bacd1 dont call emms_c() for each MB
michaelni
parents: 762
diff changeset
396
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
397 avctx->frame_number++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
398 return ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
399 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
400
1249
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1217
diff changeset
401 /**
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1217
diff changeset
402 * decode a frame.
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1217
diff changeset
403 * @param buf bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE larger then the actual read bytes
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1217
diff changeset
404 * because some optimized bitstream readers read 32 or 64 bit at once and could read over the end
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1217
diff changeset
405 * @param buf_size the size of the buffer in bytes
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1217
diff changeset
406 * @param got_picture_ptr zero if no frame could be decompressed, Otherwise, it is non zero
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1217
diff changeset
407 * @return -1 if error, otherwise return the number of
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1217
diff changeset
408 * bytes used.
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1217
diff changeset
409 */
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
410 int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
411 int *got_picture_ptr,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
412 uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
413 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
414 int ret;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
415
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
416 ret = avctx->codec->decode(avctx, picture, got_picture_ptr,
986e461dc072 Initial revision
glantau
parents:
diff changeset
417 buf, buf_size);
814
8f31ed5bacd1 dont call emms_c() for each MB
michaelni
parents: 762
diff changeset
418
8f31ed5bacd1 dont call emms_c() for each MB
michaelni
parents: 762
diff changeset
419 emms_c(); //needed to avoid a emms_c() call before every return;
903
22ee74da2cd3 cleanup
michaelni
parents: 902
diff changeset
420
267
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 260
diff changeset
421 if (*got_picture_ptr)
e10840e4f773 - Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents: 260
diff changeset
422 avctx->frame_number++;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
423 return ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
424 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
425
986e461dc072 Initial revision
glantau
parents:
diff changeset
426 /* decode an audio frame. return -1 if error, otherwise return the
986e461dc072 Initial revision
glantau
parents:
diff changeset
427 *number of bytes used. If no frame could be decompressed,
986e461dc072 Initial revision
glantau
parents:
diff changeset
428 *frame_size_ptr is zero. Otherwise, it is the decompressed frame
986e461dc072 Initial revision
glantau
parents:
diff changeset
429 *size in BYTES. */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
430 int avcodec_decode_audio(AVCodecContext *avctx, int16_t *samples,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
431 int *frame_size_ptr,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
432 uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
433 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
434 int ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
435
986e461dc072 Initial revision
glantau
parents:
diff changeset
436 ret = avctx->codec->decode(avctx, samples, frame_size_ptr,
986e461dc072 Initial revision
glantau
parents:
diff changeset
437 buf, buf_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
438 avctx->frame_number++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
439 return ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
440 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
441
986e461dc072 Initial revision
glantau
parents:
diff changeset
442 int avcodec_close(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
443 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
444 if (avctx->codec->close)
986e461dc072 Initial revision
glantau
parents:
diff changeset
445 avctx->codec->close(avctx);
394
e2cb8a4ee0c5 proper memory handling functions
glantau
parents: 379
diff changeset
446 av_freep(&avctx->priv_data);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
447 avctx->codec = NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
448 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
449 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
450
986e461dc072 Initial revision
glantau
parents:
diff changeset
451 AVCodec *avcodec_find_encoder(enum CodecID id)
986e461dc072 Initial revision
glantau
parents:
diff changeset
452 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
453 AVCodec *p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
454 p = first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
455 while (p) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
456 if (p->encode != NULL && p->id == id)
986e461dc072 Initial revision
glantau
parents:
diff changeset
457 return p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
458 p = p->next;
986e461dc072 Initial revision
glantau
parents:
diff changeset
459 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
460 return NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
461 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
462
177
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
463 AVCodec *avcodec_find_encoder_by_name(const char *name)
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
464 {
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
465 AVCodec *p;
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
466 p = first_avcodec;
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
467 while (p) {
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
468 if (p->encode != NULL && strcmp(name,p->name) == 0)
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
469 return p;
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
470 p = p->next;
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
471 }
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
472 return NULL;
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
473 }
53da914d6f46 avcodec_find_encoder_by_name() patch by Alex
arpi_esp
parents: 94
diff changeset
474
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
475 AVCodec *avcodec_find_decoder(enum CodecID id)
986e461dc072 Initial revision
glantau
parents:
diff changeset
476 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
477 AVCodec *p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
478 p = first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
479 while (p) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
480 if (p->decode != NULL && p->id == id)
986e461dc072 Initial revision
glantau
parents:
diff changeset
481 return p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
482 p = p->next;
986e461dc072 Initial revision
glantau
parents:
diff changeset
483 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
484 return NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
485 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
486
986e461dc072 Initial revision
glantau
parents:
diff changeset
487 AVCodec *avcodec_find_decoder_by_name(const char *name)
986e461dc072 Initial revision
glantau
parents:
diff changeset
488 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
489 AVCodec *p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
490 p = first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
491 while (p) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
492 if (p->decode != NULL && strcmp(name,p->name) == 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
493 return p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
494 p = p->next;
986e461dc072 Initial revision
glantau
parents:
diff changeset
495 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
496 return NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
497 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
498
986e461dc072 Initial revision
glantau
parents:
diff changeset
499 AVCodec *avcodec_find(enum CodecID id)
986e461dc072 Initial revision
glantau
parents:
diff changeset
500 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
501 AVCodec *p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
502 p = first_avcodec;
986e461dc072 Initial revision
glantau
parents:
diff changeset
503 while (p) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
504 if (p->id == id)
986e461dc072 Initial revision
glantau
parents:
diff changeset
505 return p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
506 p = p->next;
986e461dc072 Initial revision
glantau
parents:
diff changeset
507 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
508 return NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
509 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
510
986e461dc072 Initial revision
glantau
parents:
diff changeset
511 void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
986e461dc072 Initial revision
glantau
parents:
diff changeset
512 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
513 const char *codec_name;
986e461dc072 Initial revision
glantau
parents:
diff changeset
514 AVCodec *p;
986e461dc072 Initial revision
glantau
parents:
diff changeset
515 char buf1[32];
337
8899c3b35b57 * using some small char buffer - needed for sprintf
kabi
parents: 322
diff changeset
516 char channels_str[100];
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
517 int bitrate;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
518
986e461dc072 Initial revision
glantau
parents:
diff changeset
519 if (encode)
986e461dc072 Initial revision
glantau
parents:
diff changeset
520 p = avcodec_find_encoder(enc->codec_id);
986e461dc072 Initial revision
glantau
parents:
diff changeset
521 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
522 p = avcodec_find_decoder(enc->codec_id);
986e461dc072 Initial revision
glantau
parents:
diff changeset
523
986e461dc072 Initial revision
glantau
parents:
diff changeset
524 if (p) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
525 codec_name = p->name;
1449
7fbe89a76b73 update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents: 1396
diff changeset
526 if (!encode && enc->codec_id == CODEC_ID_MP3) {
7fbe89a76b73 update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents: 1396
diff changeset
527 if (enc->sub_id == 2)
7fbe89a76b73 update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents: 1396
diff changeset
528 codec_name = "mp2";
7fbe89a76b73 update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents: 1396
diff changeset
529 else if (enc->sub_id == 1)
7fbe89a76b73 update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents: 1396
diff changeset
530 codec_name = "mp1";
7fbe89a76b73 update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents: 1396
diff changeset
531 }
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
532 } 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
533 /* 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
534 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
535 codec_name = "mpeg2ts";
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
536 } else if (enc->codec_name[0] != '\0') {
986e461dc072 Initial revision
glantau
parents:
diff changeset
537 codec_name = enc->codec_name;
986e461dc072 Initial revision
glantau
parents:
diff changeset
538 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
539 /* output avi tags */
986e461dc072 Initial revision
glantau
parents:
diff changeset
540 if (enc->codec_type == CODEC_TYPE_VIDEO) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
541 snprintf(buf1, sizeof(buf1), "%c%c%c%c",
986e461dc072 Initial revision
glantau
parents:
diff changeset
542 enc->codec_tag & 0xff,
986e461dc072 Initial revision
glantau
parents:
diff changeset
543 (enc->codec_tag >> 8) & 0xff,
986e461dc072 Initial revision
glantau
parents:
diff changeset
544 (enc->codec_tag >> 16) & 0xff,
986e461dc072 Initial revision
glantau
parents:
diff changeset
545 (enc->codec_tag >> 24) & 0xff);
986e461dc072 Initial revision
glantau
parents:
diff changeset
546 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
547 snprintf(buf1, sizeof(buf1), "0x%04x", enc->codec_tag);
986e461dc072 Initial revision
glantau
parents:
diff changeset
548 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
549 codec_name = buf1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
550 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
551
986e461dc072 Initial revision
glantau
parents:
diff changeset
552 switch(enc->codec_type) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
553 case CODEC_TYPE_VIDEO:
986e461dc072 Initial revision
glantau
parents:
diff changeset
554 snprintf(buf, buf_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
555 "Video: %s%s",
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1368
diff changeset
556 codec_name, enc->mb_decision ? " (hq)" : "");
55
6064342168f4 picture utils
glantau
parents: 24
diff changeset
557 if (enc->codec_id == CODEC_ID_RAWVIDEO) {
6064342168f4 picture utils
glantau
parents: 24
diff changeset
558 snprintf(buf + strlen(buf), buf_size - strlen(buf),
6064342168f4 picture utils
glantau
parents: 24
diff changeset
559 ", %s",
988
001b7d3045e5 moved avcodec_get_chroma_sub_sample() to imgconvert.c
bellard
parents: 963
diff changeset
560 avcodec_get_pix_fmt_name(enc->pix_fmt));
55
6064342168f4 picture utils
glantau
parents: 24
diff changeset
561 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
562 if (enc->width) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
563 snprintf(buf + strlen(buf), buf_size - strlen(buf),
986e461dc072 Initial revision
glantau
parents:
diff changeset
564 ", %dx%d, %0.2f fps",
986e461dc072 Initial revision
glantau
parents:
diff changeset
565 enc->width, enc->height,
1126
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
566 (float)enc->frame_rate / enc->frame_rate_base);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
567 }
741
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
568 if (encode) {
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
569 snprintf(buf + strlen(buf), buf_size - strlen(buf),
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
570 ", q=%d-%d", enc->qmin, enc->qmax);
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
571 }
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
572 bitrate = enc->bit_rate;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
573 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
574 case CODEC_TYPE_AUDIO:
986e461dc072 Initial revision
glantau
parents:
diff changeset
575 snprintf(buf, buf_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
576 "Audio: %s",
986e461dc072 Initial revision
glantau
parents:
diff changeset
577 codec_name);
318
21697f35a9ca - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents: 315
diff changeset
578 switch (enc->channels) {
21697f35a9ca - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents: 315
diff changeset
579 case 1:
337
8899c3b35b57 * using some small char buffer - needed for sprintf
kabi
parents: 322
diff changeset
580 strcpy(channels_str, "mono");
318
21697f35a9ca - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents: 315
diff changeset
581 break;
21697f35a9ca - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents: 315
diff changeset
582 case 2:
337
8899c3b35b57 * using some small char buffer - needed for sprintf
kabi
parents: 322
diff changeset
583 strcpy(channels_str, "stereo");
318
21697f35a9ca - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents: 315
diff changeset
584 break;
21697f35a9ca - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents: 315
diff changeset
585 case 6:
337
8899c3b35b57 * using some small char buffer - needed for sprintf
kabi
parents: 322
diff changeset
586 strcpy(channels_str, "5:1");
318
21697f35a9ca - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents: 315
diff changeset
587 break;
21697f35a9ca - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents: 315
diff changeset
588 default:
21697f35a9ca - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents: 315
diff changeset
589 sprintf(channels_str, "%d channels", enc->channels);
21697f35a9ca - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents: 315
diff changeset
590 break;
21697f35a9ca - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents: 315
diff changeset
591 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
592 if (enc->sample_rate) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
593 snprintf(buf + strlen(buf), buf_size - strlen(buf),
986e461dc072 Initial revision
glantau
parents:
diff changeset
594 ", %d Hz, %s",
986e461dc072 Initial revision
glantau
parents:
diff changeset
595 enc->sample_rate,
318
21697f35a9ca - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents: 315
diff changeset
596 channels_str);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
597 }
318
21697f35a9ca - Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents: 315
diff changeset
598
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
599 /* for PCM codecs, compute bitrate directly */
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
600 switch(enc->codec_id) {
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
601 case CODEC_ID_PCM_S16LE:
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
602 case CODEC_ID_PCM_S16BE:
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
603 case CODEC_ID_PCM_U16LE:
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
604 case CODEC_ID_PCM_U16BE:
94
7e263a256a6f fixed pcm bitrate
glantau
parents: 92
diff changeset
605 bitrate = enc->sample_rate * enc->channels * 16;
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
606 break;
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
607 case CODEC_ID_PCM_S8:
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
608 case CODEC_ID_PCM_U8:
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
609 case CODEC_ID_PCM_ALAW:
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
610 case CODEC_ID_PCM_MULAW:
94
7e263a256a6f fixed pcm bitrate
glantau
parents: 92
diff changeset
611 bitrate = enc->sample_rate * enc->channels * 8;
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
612 break;
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
613 default:
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
614 bitrate = enc->bit_rate;
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
615 break;
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
616 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
617 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
618 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
619 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
620 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
621 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
622 default:
583
d6955d0d7d27 Add conversions to and from RGBA32 and BGRA32.
philipjsg
parents: 521
diff changeset
623 av_abort();
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
624 }
741
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
625 if (encode) {
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
626 if (enc->flags & CODEC_FLAG_PASS1)
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
627 snprintf(buf + strlen(buf), buf_size - strlen(buf),
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
628 ", pass 1");
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
629 if (enc->flags & CODEC_FLAG_PASS2)
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
630 snprintf(buf + strlen(buf), buf_size - strlen(buf),
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
631 ", pass 2");
3be57e506f01 added two pass info
bellard
parents: 703
diff changeset
632 }
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
633 if (bitrate != 0) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
634 snprintf(buf + strlen(buf), buf_size - strlen(buf),
92
1d3eb6cdc6b5 added pcm codecs
glantau
parents: 91
diff changeset
635 ", %d kb/s", bitrate / 1000);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
636 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
637 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
638
362
1ee4ba4ca783 version info
nickols_k
parents: 341
diff changeset
639 unsigned avcodec_version( void )
1ee4ba4ca783 version info
nickols_k
parents: 341
diff changeset
640 {
1ee4ba4ca783 version info
nickols_k
parents: 341
diff changeset
641 return LIBAVCODEC_VERSION_INT;
1ee4ba4ca783 version info
nickols_k
parents: 341
diff changeset
642 }
55
6064342168f4 picture utils
glantau
parents: 24
diff changeset
643
379
47c878305986 build info for ABI
nickols_k
parents: 374
diff changeset
644 unsigned avcodec_build( void )
47c878305986 build info for ABI
nickols_k
parents: 374
diff changeset
645 {
47c878305986 build info for ABI
nickols_k
parents: 374
diff changeset
646 return LIBAVCODEC_BUILD;
47c878305986 build info for ABI
nickols_k
parents: 374
diff changeset
647 }
47c878305986 build info for ABI
nickols_k
parents: 374
diff changeset
648
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
649 /* must be called before any other functions */
986e461dc072 Initial revision
glantau
parents:
diff changeset
650 void avcodec_init(void)
986e461dc072 Initial revision
glantau
parents:
diff changeset
651 {
303
9a931fd8d06c multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents: 267
diff changeset
652 static int inited = 0;
9a931fd8d06c multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents: 267
diff changeset
653
9a931fd8d06c multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents: 267
diff changeset
654 if (inited != 0)
9a931fd8d06c multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents: 267
diff changeset
655 return;
9a931fd8d06c multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents: 267
diff changeset
656 inited = 1;
9a931fd8d06c multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents: 267
diff changeset
657
1201
e0fc95a6eb4e fixed static init
bellard
parents: 1165
diff changeset
658 dsputil_static_init();
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
659 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
660
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1353
diff changeset
661 /**
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1353
diff changeset
662 * Flush buffers, should be called when seeking or when swicthing to a different stream.
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1353
diff changeset
663 */
341
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 337
diff changeset
664 void avcodec_flush_buffers(AVCodecContext *avctx)
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 337
diff changeset
665 {
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1353
diff changeset
666 if(avctx->codec->flush)
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1353
diff changeset
667 avctx->codec->flush(avctx);
341
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 337
diff changeset
668 }
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 337
diff changeset
669
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
670 void avcodec_default_free_buffers(AVCodecContext *s){
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
671 int i, j;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
672
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
673 if(s->internal_buffer==NULL) return;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
674
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
675 for(i=0; i<INTERNAL_BUFFER_SIZE; i++){
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
676 InternalBuffer *buf= &((InternalBuffer*)s->internal_buffer)[i];
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
677 for(j=0; j<4; j++){
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
678 av_freep(&buf->base[j]);
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
679 buf->data[j]= NULL;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
680 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
681 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
682 av_freep(&s->internal_buffer);
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
683
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
684 s->internal_buffer_count=0;
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
685 }
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1201
diff changeset
686
1264
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
687 char av_get_pict_type_char(int pict_type){
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
688 switch(pict_type){
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
689 case I_TYPE: return 'I';
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
690 case P_TYPE: return 'P';
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
691 case B_TYPE: return 'B';
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
692 case S_TYPE: return 'S';
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
693 case SI_TYPE:return 'i';
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
694 case SP_TYPE:return 'p';
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
695 default: return '?';
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
696 }
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
697 }
2fa34e615c76 cleanup
michaelni
parents: 1249
diff changeset
698
1126
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
699 int av_reduce(int *dst_nom, int *dst_den, int64_t nom, int64_t den, int64_t max){
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
700 int exact=1, sign=0;
1549
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
701 int64_t gcd;
1126
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
702
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
703 assert(den != 0);
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
704
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
705 if(den < 0){
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
706 den= -den;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
707 nom= -nom;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
708 }
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
709
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
710 if(nom < 0){
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
711 nom= -nom;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
712 sign= 1;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
713 }
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
714
1549
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
715 gcd = ff_gcd(nom, den);
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
716 nom /= gcd;
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
717 den /= gcd;
1126
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
718
1549
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
719 if(nom > max || den > max){
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
720 AVRational a0={0,1}, a1={1,0};
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
721 exact=0;
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
722
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
723 for(;;){
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
724 int64_t x= nom / den;
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
725 int64_t a2n= x*a1.num + a0.num;
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
726 int64_t a2d= x*a1.den + a0.den;
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
727
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
728 if(a2n > max || a2d > max) break;
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
729
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
730 nom %= den;
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
731
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
732 a0= a1;
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
733 a1= (AVRational){a2n, a2d};
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
734 if(nom==0) break;
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
735 x= nom; nom=den; den=x;
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
736 }
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
737 nom= a1.num;
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
738 den= a1.den;
1126
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
739 }
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
740
1549
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
741 assert(ff_gcd(nom, den) == 1);
5e643dd7e889 use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents: 1548
diff changeset
742
1126
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
743 if(sign) nom= -nom;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
744
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
745 *dst_nom = nom;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
746 *dst_den = den;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
747
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
748 return exact;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
749 }
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
750
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
751 int64_t av_rescale(int64_t a, int b, int c){
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
752 uint64_t h, l;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
753 assert(c > 0);
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
754 assert(b >=0);
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
755
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
756 if(a<0) return -av_rescale(-a, b, c);
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
757
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
758 h= a>>32;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
759 if(h==0) return a*b/c;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
760
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
761 l= a&0xFFFFFFFF;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
762 l *= b;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
763 h *= b;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
764
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
765 l += (h%c)<<32;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
766
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
767 return ((h/c)<<32) + l/c;
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
768 }