Mercurial > libavcodec.hg
annotate h263dec.c @ 939:3800f9c70736 libavcodec
better set pix_fmt explicitly
author | michaelni |
---|---|
date | Sun, 29 Dec 2002 22:20:03 +0000 |
parents | 1e22655551b9 |
children | ca2a303ea039 |
rev | line source |
---|---|
0 | 1 /* |
2 * H263 decoder | |
429 | 3 * Copyright (c) 2001 Fabrice Bellard. |
0 | 4 * |
429 | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Lesser General Public | |
7 * License as published by the Free Software Foundation; either | |
8 * version 2 of the License, or (at your option) any later version. | |
0 | 9 * |
429 | 10 * This library is distributed in the hope that it will be useful, |
0 | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
429 | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 * Lesser General Public License for more details. | |
0 | 14 * |
429 | 15 * You should have received a copy of the GNU Lesser General Public |
16 * License along with this library; if not, write to the Free Software | |
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
0 | 18 */ |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
384
diff
changeset
|
19 #include "avcodec.h" |
0 | 20 #include "dsputil.h" |
21 #include "mpegvideo.h" | |
22 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
23 #if 1 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
24 #define PRINT_QP(a, b) {} |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
25 #else |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
26 #define PRINT_QP(a, b) printf(a, b) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
27 #endif |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
28 |
0 | 29 //#define DEBUG |
384 | 30 //#define PRINT_FRAME_TIME |
31 #ifdef PRINT_FRAME_TIME | |
32 static inline long long rdtsc() | |
33 { | |
34 long long l; | |
35 asm volatile( "rdtsc\n\t" | |
36 : "=A" (l) | |
37 ); | |
38 // printf("%d\n", int(l/1000)); | |
39 return l; | |
40 } | |
41 #endif | |
0 | 42 |
936 | 43 int ff_h263_decode_init(AVCodecContext *avctx) |
0 | 44 { |
45 MpegEncContext *s = avctx->priv_data; | |
60 | 46 |
67 | 47 s->avctx = avctx; |
0 | 48 s->out_format = FMT_H263; |
49 | |
50 s->width = avctx->width; | |
51 s->height = avctx->height; | |
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
52 s->workaround_bugs= avctx->workaround_bugs; |
0 | 53 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
54 // set defaults |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
55 s->quant_precision=5; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
56 s->progressive_sequence=1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
57 s->decode_mb= ff_h263_decode_mb; |
924 | 58 s->low_delay= 1; |
939 | 59 avctx->pix_fmt= PIX_FMT_YUV420P; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
60 |
0 | 61 /* select sub codec */ |
62 switch(avctx->codec->id) { | |
63 case CODEC_ID_H263: | |
154
f914f710b8d0
- Fixed a bug on H.263 MV prediction for MB on GOBs limits.
pulento
parents:
144
diff
changeset
|
64 s->gob_number = 0; |
0 | 65 break; |
67 | 66 case CODEC_ID_MPEG4: |
0 | 67 s->time_increment_bits = 4; /* default value for broken headers */ |
68 s->h263_pred = 1; | |
924 | 69 s->low_delay = 0; //default, might be overriden in the vol header during header parsing |
0 | 70 break; |
307 | 71 case CODEC_ID_MSMPEG4V1: |
0 | 72 s->h263_msmpeg4 = 1; |
73 s->h263_pred = 1; | |
307 | 74 s->msmpeg4_version=1; |
75 break; | |
76 case CODEC_ID_MSMPEG4V2: | |
77 s->h263_msmpeg4 = 1; | |
78 s->h263_pred = 1; | |
79 s->msmpeg4_version=2; | |
80 break; | |
81 case CODEC_ID_MSMPEG4V3: | |
82 s->h263_msmpeg4 = 1; | |
83 s->h263_pred = 1; | |
84 s->msmpeg4_version=3; | |
0 | 85 break; |
311 | 86 case CODEC_ID_WMV1: |
87 s->h263_msmpeg4 = 1; | |
88 s->h263_pred = 1; | |
89 s->msmpeg4_version=4; | |
90 break; | |
498 | 91 case CODEC_ID_WMV2: |
92 s->h263_msmpeg4 = 1; | |
93 s->h263_pred = 1; | |
94 s->msmpeg4_version=5; | |
95 break; | |
0 | 96 case CODEC_ID_H263I: |
97 s->h263_intel = 1; | |
98 break; | |
99 default: | |
100 return -1; | |
101 } | |
344 | 102 s->codec_id= avctx->codec->id; |
553 | 103 |
0 | 104 /* for h263, we allocate the images after having read the header */ |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
105 if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4) |
144 | 106 if (MPV_common_init(s) < 0) |
107 return -1; | |
0 | 108 |
109 if (s->h263_msmpeg4) | |
498 | 110 ff_msmpeg4_decode_init(s); |
0 | 111 else |
112 h263_decode_init_vlc(s); | |
113 | |
114 return 0; | |
115 } | |
116 | |
936 | 117 int ff_h263_decode_end(AVCodecContext *avctx) |
0 | 118 { |
119 MpegEncContext *s = avctx->priv_data; | |
120 | |
121 MPV_common_end(s); | |
122 return 0; | |
123 } | |
124 | |
655 | 125 /** |
126 * retunrs the number of bytes consumed for building the current frame | |
127 */ | |
128 static int get_consumed_bytes(MpegEncContext *s, int buf_size){ | |
129 int pos= (get_bits_count(&s->gb)+7)>>3; | |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
130 |
655 | 131 if(s->divx_version>=500){ |
132 //we would have to scan through the whole buf to handle the weird reordering ... | |
133 return buf_size; | |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
134 }else if(s->flags&CODEC_FLAG_TRUNCATED){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
135 pos -= s->parse_context.last_index; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
136 if(pos<0) pos=0; // padding is not really read so this might be -1 |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
137 return pos; |
655 | 138 }else{ |
139 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...) | |
658 | 140 if(pos+10>buf_size) pos=buf_size; // oops ;) |
655 | 141 |
142 return pos; | |
143 } | |
144 } | |
145 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
146 static int decode_slice(MpegEncContext *s){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
147 s->last_resync_gb= s->gb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
148 s->first_slice_line= 1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
149 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
150 s->resync_mb_x= s->mb_x; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
151 s->resync_mb_y= s->mb_y; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
152 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
153 s->y_dc_scale= s->y_dc_scale_table[ s->qscale ]; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
154 s->c_dc_scale= s->c_dc_scale_table[ s->qscale ]; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
155 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
156 if(s->partitioned_frame){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
157 const int qscale= s->qscale; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
158 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
159 if(s->codec_id==CODEC_ID_MPEG4){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
160 if(ff_mpeg4_decode_partitions(s) < 0) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
161 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
162 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
163 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
164 /* restore variables which where modified */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
165 s->first_slice_line=1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
166 s->mb_x= s->resync_mb_x; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
167 s->mb_y= s->resync_mb_y; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
168 s->qscale= qscale; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
169 s->y_dc_scale= s->y_dc_scale_table[ s->qscale ]; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
170 s->c_dc_scale= s->c_dc_scale_table[ s->qscale ]; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
171 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
172 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
173 for(; s->mb_y < s->mb_height; s->mb_y++) { |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
174 /* per-row end of slice checks */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
175 if(s->msmpeg4_version){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
176 if(s->resync_mb_y + s->slice_height == s->mb_y){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
177 const int xy= s->mb_x + s->mb_y*s->mb_width; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
178 s->error_status_table[xy-1]|= AC_END|DC_END|MV_END; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
179 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
180 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
181 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
182 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
183 if(s->msmpeg4_version==1){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
184 s->last_dc[0]= |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
185 s->last_dc[1]= |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
186 s->last_dc[2]= 128; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
187 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
188 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
189 ff_init_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
190 for(; s->mb_x < s->mb_width; s->mb_x++) { |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
191 int ret; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
192 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
193 ff_update_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
194 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
195 if(s->resync_mb_x == s->mb_x && s->resync_mb_y+1 == s->mb_y){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
196 s->first_slice_line=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
197 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
198 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
199 /* DCT & quantize */ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
845
diff
changeset
|
200 s->dsp.clear_blocks(s->block[0]); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
201 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
202 s->mv_dir = MV_DIR_FORWARD; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
203 s->mv_type = MV_TYPE_16X16; |
903 | 204 // s->mb_skiped = 0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
205 //printf("%d %d %06X\n", ret, get_bits_count(&s->gb), show_bits(&s->gb, 24)); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
206 ret= s->decode_mb(s, s->block); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
207 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
208 PRINT_QP("%2d", s->qscale); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
209 MPV_decode_mb(s, s->block); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
210 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
211 if(ret<0){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
212 const int xy= s->mb_x + s->mb_y*s->mb_width; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
213 if(ret==SLICE_END){ |
758 | 214 //printf("%d %d %d %06X\n", s->mb_x, s->mb_y, s->gb.size*8 - get_bits_count(&s->gb), show_bits(&s->gb, 24)); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
215 s->error_status_table[xy]|= AC_END; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
216 if(!s->partitioned_frame) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
217 s->error_status_table[xy]|= MV_END|DC_END; |
750 | 218 |
219 s->padding_bug_score--; | |
220 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
221 if(++s->mb_x >= s->mb_width){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
222 s->mb_x=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
223 ff_draw_horiz_band(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
224 s->mb_y++; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
225 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
226 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
227 }else if(ret==SLICE_NOEND){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
228 fprintf(stderr,"Slice mismatch at MB: %d\n", xy); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
229 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
230 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
231 fprintf(stderr,"Error at MB: %d\n", xy); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
232 s->error_status_table[xy]|= AC_ERROR; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
233 if(!s->partitioned_frame) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
234 s->error_status_table[xy]|= DC_ERROR|MV_ERROR; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
235 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
236 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
237 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
238 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
239 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
240 ff_draw_horiz_band(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
241 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
242 PRINT_QP("%s", "\n"); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
243 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
244 s->mb_x= 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
245 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
246 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
247 assert(s->mb_x==0 && s->mb_y==s->mb_height); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
248 |
750 | 249 /* try to detect the padding bug */ |
250 if( s->codec_id==CODEC_ID_MPEG4 | |
251 && (s->workaround_bugs&FF_BUG_AUTODETECT) | |
252 && s->gb.size*8 - get_bits_count(&s->gb) >=0 | |
253 && s->gb.size*8 - get_bits_count(&s->gb) < 48 | |
928
5627a7b7ce83
fixing playback of DaveMatthews_Crash_PocketPC.avi
michaelni
parents:
925
diff
changeset
|
254 // && !s->resync_marker |
750 | 255 && !s->data_partitioning){ |
256 | |
257 const int bits_count= get_bits_count(&s->gb); | |
258 const int bits_left = s->gb.size*8 - bits_count; | |
259 | |
260 if(bits_left==0 || bits_left>8){ | |
261 s->padding_bug_score++; | |
824 | 262 } else if(bits_left != 1){ |
750 | 263 int v= show_bits(&s->gb, 8); |
264 v|= 0x7F >> (7-(bits_count&7)); | |
824 | 265 |
750 | 266 if(v==0x7F) |
267 s->padding_bug_score--; | |
268 else | |
269 s->padding_bug_score++; | |
270 } | |
271 | |
272 if(s->padding_bug_score > -2) | |
273 s->workaround_bugs |= FF_BUG_NO_PADDING; | |
274 else | |
275 s->workaround_bugs &= ~FF_BUG_NO_PADDING; | |
276 } | |
277 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
278 // handle formats which dont have unique end markers |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
279 if(s->msmpeg4_version || (s->workaround_bugs&FF_BUG_NO_PADDING)){ //FIXME perhaps solve this more cleanly |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
280 int left= s->gb.size*8 - get_bits_count(&s->gb); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
281 int max_extra=7; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
282 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
283 /* no markers in M$ crap */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
284 if(s->msmpeg4_version && s->pict_type==I_TYPE) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
285 max_extra+= 17; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
286 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
287 /* buggy padding but the frame should still end approximately at the bitstream end */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
288 if((s->workaround_bugs&FF_BUG_NO_PADDING) && s->error_resilience>=3) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
289 max_extra+= 48; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
290 else if((s->workaround_bugs&FF_BUG_NO_PADDING)) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
291 max_extra+= 256*256*256*64; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
292 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
293 if(left>max_extra){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
294 fprintf(stderr, "discarding %d junk bits at end, next would be %X\n", left, show_bits(&s->gb, 24)); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
295 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
296 else if(left<0){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
297 fprintf(stderr, "overreading %d bits\n", -left); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
298 }else |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
299 s->error_status_table[s->mb_num-1]|= AC_END|MV_END|DC_END; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
300 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
301 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
302 } |
750 | 303 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
304 fprintf(stderr, "slice end not reached but screenspace end (%d left %06X)\n", |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
305 s->gb.size*8 - get_bits_count(&s->gb), |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
306 show_bits(&s->gb, 24)); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
307 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
308 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
309 |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
310 /** |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
311 * finds the end of the current frame in the bitstream. |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
312 * @return the position of the first byte of the next frame, or -1 |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
313 */ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
314 static int mpeg4_find_frame_end(MpegEncContext *s, UINT8 *buf, int buf_size){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
315 ParseContext *pc= &s->parse_context; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
316 int vop_found, i; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
317 uint32_t state; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
318 |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
319 vop_found= pc->frame_start_found; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
320 state= pc->state; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
321 |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
322 i=0; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
323 if(!vop_found){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
324 for(i=0; i<buf_size; i++){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
325 state= (state<<8) | buf[i]; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
326 if(state == 0x1B6){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
327 i++; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
328 vop_found=1; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
329 break; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
330 } |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
331 } |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
332 } |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
333 |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
334 for(; i<buf_size; i++){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
335 state= (state<<8) | buf[i]; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
336 if((state&0xFFFFFF00) == 0x100){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
337 pc->frame_start_found=0; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
338 pc->state=-1; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
339 return i-3; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
340 } |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
341 } |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
342 pc->frame_start_found= vop_found; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
343 pc->state= state; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
344 return -1; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
345 } |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
346 |
936 | 347 int ff_h263_decode_frame(AVCodecContext *avctx, |
0 | 348 void *data, int *data_size, |
349 UINT8 *buf, int buf_size) | |
350 { | |
351 MpegEncContext *s = avctx->priv_data; | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
352 int ret,i; |
925 | 353 AVFrame *pict = data; |
880 | 354 float new_aspect; |
355 | |
384 | 356 #ifdef PRINT_FRAME_TIME |
357 uint64_t time= rdtsc(); | |
358 #endif | |
0 | 359 #ifdef DEBUG |
360 printf("*****frame %d size=%d\n", avctx->frame_number, buf_size); | |
361 printf("bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]); | |
362 #endif | |
485 | 363 s->flags= avctx->flags; |
454 | 364 |
657 | 365 *data_size = 0; |
366 | |
367 /* no supplementary picture */ | |
0 | 368 if (buf_size == 0) { |
369 return 0; | |
370 } | |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
371 |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
372 if(s->flags&CODEC_FLAG_TRUNCATED){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
373 int next; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
374 ParseContext *pc= &s->parse_context; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
375 |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
376 pc->last_index= pc->index; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
377 |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
378 if(s->codec_id==CODEC_ID_MPEG4){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
379 next= mpeg4_find_frame_end(s, buf, buf_size); |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
380 }else{ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
381 fprintf(stderr, "this codec doesnt support truncated bitstreams\n"); |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
382 return -1; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
383 } |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
384 if(next==-1){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
385 if(buf_size + FF_INPUT_BUFFER_PADDING_SIZE + pc->index > pc->buffer_size){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
386 pc->buffer_size= buf_size + pc->index + 10*1024; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
387 pc->buffer= realloc(pc->buffer, pc->buffer_size); |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
388 } |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
389 |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
390 memcpy(&pc->buffer[pc->index], buf, buf_size); |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
391 pc->index += buf_size; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
392 return buf_size; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
393 } |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
394 |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
395 if(pc->index){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
396 if(next + FF_INPUT_BUFFER_PADDING_SIZE + pc->index > pc->buffer_size){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
397 pc->buffer_size= next + pc->index + 10*1024; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
398 pc->buffer= realloc(pc->buffer, pc->buffer_size); |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
399 } |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
400 |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
401 memcpy(&pc->buffer[pc->index], buf, next + FF_INPUT_BUFFER_PADDING_SIZE ); |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
402 pc->index = 0; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
403 buf= pc->buffer; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
404 buf_size= pc->last_index + next; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
405 } |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
406 } |
0 | 407 |
763 | 408 retry: |
409 | |
465 | 410 if(s->bitstream_buffer_size && buf_size<20){ //divx 5.01+ frame reorder |
333 | 411 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size); |
353 | 412 }else |
333 | 413 init_get_bits(&s->gb, buf, buf_size); |
465 | 414 s->bitstream_buffer_size=0; |
0 | 415 |
718 | 416 if (!s->context_initialized) { |
752
97077dd24bfa
fixing alt_scan for the first frame (variable was reset)
michaelni
parents:
750
diff
changeset
|
417 if (MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix |
718 | 418 return -1; |
419 } | |
936 | 420 |
0 | 421 /* let's go :-) */ |
936 | 422 if (s->msmpeg4_version==5) { |
423 ret= ff_wmv2_decode_picture_header(s); | |
424 } else if (s->msmpeg4_version) { | |
0 | 425 ret = msmpeg4_decode_picture_header(s); |
426 } else if (s->h263_pred) { | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
427 if(s->avctx->extradata_size && s->picture_number==0){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
428 GetBitContext gb; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
429 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
430 init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
431 ret = ff_mpeg4_decode_picture_header(s, &gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
432 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
433 ret = ff_mpeg4_decode_picture_header(s, &s->gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
434 |
831 | 435 if(s->flags& CODEC_FLAG_LOW_DELAY) |
436 s->low_delay=1; | |
0 | 437 } else if (s->h263_intel) { |
438 ret = intel_h263_decode_picture_header(s); | |
439 } else { | |
440 ret = h263_decode_picture_header(s); | |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
441 } |
924 | 442 avctx->has_b_frames= !s->low_delay; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
443 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
444 if(s->workaround_bugs&FF_BUG_AUTODETECT){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
445 if(s->avctx->fourcc == ff_get_fourcc("XVIX")) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
446 s->workaround_bugs|= FF_BUG_XVID_ILACE; |
921 | 447 #if 0 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
448 if(s->avctx->fourcc == ff_get_fourcc("MP4S")) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
449 s->workaround_bugs|= FF_BUG_AC_VLC; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
450 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
451 if(s->avctx->fourcc == ff_get_fourcc("M4S2")) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
452 s->workaround_bugs|= FF_BUG_AC_VLC; |
921 | 453 #endif |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
454 if(s->avctx->fourcc == ff_get_fourcc("UMP4")){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
455 s->workaround_bugs|= FF_BUG_UMP4; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
456 s->workaround_bugs|= FF_BUG_AC_VLC; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
457 } |
760 | 458 |
459 if(s->divx_version){ | |
460 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; | |
461 } | |
761 | 462 |
463 if(s->avctx->fourcc == ff_get_fourcc("XVID") && s->xvid_build==0) | |
464 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; | |
465 | |
907 | 466 if(s->avctx->fourcc == ff_get_fourcc("XVID") && s->xvid_build==0) |
467 s->padding_bug_score= 256*256*256*64; | |
468 | |
938
1e22655551b9
xvid build 3 still has the padding wrong in 1/8 of the cases :(((((
michaelni
parents:
936
diff
changeset
|
469 if(s->xvid_build && s->xvid_build<=3) |
1e22655551b9
xvid build 3 still has the padding wrong in 1/8 of the cases :(((((
michaelni
parents:
936
diff
changeset
|
470 s->padding_bug_score= 256*256*256*64; |
1e22655551b9
xvid build 3 still has the padding wrong in 1/8 of the cases :(((((
michaelni
parents:
936
diff
changeset
|
471 |
761 | 472 if(s->xvid_build && s->xvid_build<=1) |
473 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; | |
474 | |
750 | 475 //printf("padding_bug_score: %d\n", s->padding_bug_score); |
476 #if 0 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
477 if(s->divx_version==500) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
478 s->workaround_bugs|= FF_BUG_NO_PADDING; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
479 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
480 /* very ugly XVID padding bug detection FIXME/XXX solve this differently |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
481 * lets hope this at least works |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
482 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
483 if( s->resync_marker==0 && s->data_partitioning==0 && s->divx_version==0 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
484 && s->codec_id==CODEC_ID_MPEG4 && s->vo_type==0) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
485 s->workaround_bugs|= FF_BUG_NO_PADDING; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
486 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
487 if(s->lavc_build && s->lavc_build<4609) //FIXME not sure about the version num but a 4609 file seems ok |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
488 s->workaround_bugs|= FF_BUG_NO_PADDING; |
750 | 489 #endif |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
490 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
491 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
492 |
585
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
493 #if 0 // dump bits per frame / qp / complexity |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
494 { |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
495 static FILE *f=NULL; |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
496 if(!f) f=fopen("rate_qp_cplx.txt", "w"); |
589
507e688d57b2
10l found by R«±mi Guyomarch <rguyom at pobox dot com>
michaelni
parents:
585
diff
changeset
|
497 fprintf(f, "%d %d %f\n", buf_size, s->qscale, buf_size*(double)s->qscale); |
585
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
498 } |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
499 #endif |
553 | 500 |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
501 /* After H263 & mpeg4 header decode we have the height, width,*/ |
160 | 502 /* and other parameters. So then we could init the picture */ |
503 /* FIXME: By the way H263 decoder is evolving it should have */ | |
504 /* an H263EncContext */ | |
880 | 505 if(s->aspected_height) |
887 | 506 new_aspect= s->aspected_width*s->width / (float)(s->height*s->aspected_height); |
880 | 507 else |
508 new_aspect=0; | |
887 | 509 |
718 | 510 if ( s->width != avctx->width || s->height != avctx->height |
880 | 511 || ABS(new_aspect - avctx->aspect_ratio) > 0.001) { |
553 | 512 /* H.263 could change picture size any time */ |
513 MPV_common_end(s); | |
514 s->context_initialized=0; | |
515 } | |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
516 if (!s->context_initialized) { |
888 | 517 avctx->width = s->width; |
518 avctx->height = s->height; | |
880 | 519 avctx->aspect_ratio= new_aspect; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
520 |
763 | 521 goto retry; |
0 | 522 } |
758 | 523 |
524 if((s->codec_id==CODEC_ID_H263 || s->codec_id==CODEC_ID_H263P)) | |
525 s->gob_index = ff_h263_get_gob_height(s); | |
526 | |
655 | 527 if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_size); |
454 | 528 /* skip if the header was thrashed */ |
498 | 529 if (ret < 0){ |
530 fprintf(stderr, "header damaged\n"); | |
0 | 531 return -1; |
498 | 532 } |
845
32de034be20e
hurry_up>=5 -> skip everything except header & set pict_type&key_frame
michaelni
parents:
842
diff
changeset
|
533 |
903 | 534 // for hurry_up==5 |
535 s->current_picture.pict_type= s->pict_type; | |
536 s->current_picture.key_frame= s->pict_type == I_TYPE; | |
845
32de034be20e
hurry_up>=5 -> skip everything except header & set pict_type&key_frame
michaelni
parents:
842
diff
changeset
|
537 |
341 | 538 /* skip b frames if we dont have reference frames */ |
924 | 539 if(s->last_picture.data[0]==NULL && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size); |
345 | 540 /* skip b frames if we are in a hurry */ |
885
35d28522a1c5
moving init of some variables (hurry_up,...) to MPV_frame_start()
michaelni
parents:
880
diff
changeset
|
541 if(avctx->hurry_up && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size); |
845
32de034be20e
hurry_up>=5 -> skip everything except header & set pict_type&key_frame
michaelni
parents:
842
diff
changeset
|
542 /* skip everything if we are in a hurry>=5 */ |
885
35d28522a1c5
moving init of some variables (hurry_up,...) to MPV_frame_start()
michaelni
parents:
880
diff
changeset
|
543 if(avctx->hurry_up>=5) return get_consumed_bytes(s, buf_size); |
454 | 544 |
545 if(s->next_p_frame_damaged){ | |
546 if(s->pict_type==B_TYPE) | |
655 | 547 return get_consumed_bytes(s, buf_size); |
454 | 548 else |
549 s->next_p_frame_damaged=0; | |
550 } | |
551 | |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
763
diff
changeset
|
552 if(MPV_frame_start(s, avctx) < 0) |
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
763
diff
changeset
|
553 return -1; |
0 | 554 |
555 #ifdef DEBUG | |
556 printf("qscale=%d\n", s->qscale); | |
557 #endif | |
558 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
559 if(s->error_resilience) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
560 memset(s->error_status_table, MV_ERROR|AC_ERROR|DC_ERROR|VP_START|AC_END|DC_END|MV_END, s->mb_num*sizeof(UINT8)); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
561 |
0 | 562 /* decode each macroblock */ |
266 | 563 s->block_wrap[0]= |
564 s->block_wrap[1]= | |
565 s->block_wrap[2]= | |
566 s->block_wrap[3]= s->mb_width*2 + 2; | |
567 s->block_wrap[4]= | |
568 s->block_wrap[5]= s->mb_width + 2; | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
569 s->mb_x=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
570 s->mb_y=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
571 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
572 decode_slice(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
573 s->error_status_table[0]|= VP_START; |
822
21d400c67fc5
fixing msmpeg4v3 with mb_height % slice_height != 0
michaelni
parents:
771
diff
changeset
|
574 while(s->mb_y<s->mb_height && s->gb.size*8 - get_bits_count(&s->gb)>16){ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
575 if(s->msmpeg4_version){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
576 if(s->mb_x!=0 || (s->mb_y%s->slice_height)!=0) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
577 break; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
578 }else{ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
579 if(ff_h263_resync(s)<0) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
580 break; |
454 | 581 } |
582 | |
756 | 583 if(s->msmpeg4_version!=4 && s->h263_pred) |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
584 ff_mpeg4_clean_buffers(s); |
454 | 585 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
586 decode_slice(s); |
756 | 587 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
588 s->error_status_table[s->resync_mb_x + s->resync_mb_y*s->mb_width]|= VP_START; |
0 | 589 } |
756 | 590 |
311 | 591 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==I_TYPE) |
903 | 592 if(msmpeg4_decode_ext_header(s, buf_size) < 0){ |
593 s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR; | |
594 } | |
333 | 595 |
596 /* divx 5.01+ bistream reorder stuff */ | |
655 | 597 if(s->codec_id==CODEC_ID_MPEG4 && s->bitstream_buffer_size==0 && s->divx_version>=500){ |
454 | 598 int current_pos= get_bits_count(&s->gb)>>3; |
599 | |
333 | 600 if( buf_size - current_pos > 5 |
601 && buf_size - current_pos < BITSTREAM_BUFFER_SIZE){ | |
454 | 602 int i; |
603 int startcode_found=0; | |
655 | 604 for(i=current_pos; i<buf_size-3; i++){ |
454 | 605 if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1 && buf[i+3]==0xB6){ |
606 startcode_found=1; | |
607 break; | |
608 } | |
609 } | |
610 if(startcode_found){ | |
611 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos); | |
612 s->bitstream_buffer_size= buf_size - current_pos; | |
613 } | |
614 } | |
615 } | |
616 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
617 if(s->error_resilience){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
618 int error=0, num_end_markers=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
619 for(i=0; i<s->mb_num; i++){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
620 int status= s->error_status_table[i]; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
621 #if 0 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
622 if(i%s->mb_width == 0) printf("\n"); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
623 printf("%2X ", status); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
624 #endif |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
625 if(status==0) continue; |
454 | 626 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
627 if(status&(DC_ERROR|AC_ERROR|MV_ERROR)) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
628 error=1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
629 if(status&VP_START){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
630 if(num_end_markers) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
631 error=1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
632 num_end_markers=3; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
633 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
634 if(status&AC_END) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
635 num_end_markers--; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
636 if(status&DC_END) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
637 num_end_markers--; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
638 if(status&MV_END) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
639 num_end_markers--; |
454 | 640 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
641 if(num_end_markers || error){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
642 fprintf(stderr, "concealing errors\n"); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
643 ff_error_resilience(s); |
333 | 644 } |
353 | 645 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
646 |
0 | 647 MPV_frame_end(s); |
361 | 648 #if 0 //dirty show MVs, we should export the MV tables and write a filter to show them |
649 { | |
650 int mb_y; | |
651 s->has_b_frames=1; | |
652 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
653 int mb_x; | |
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
654 int y= mb_y*16 + 8; |
361 | 655 for(mb_x=0; mb_x<s->mb_width; mb_x++){ |
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
656 int x= mb_x*16 + 8; |
903 | 657 uint8_t *ptr= s->last_picture.data[0]; |
361 | 658 int xy= 1 + mb_x*2 + (mb_y*2 + 1)*(s->mb_width*2 + 2); |
659 int mx= (s->motion_val[xy][0]>>1) + x; | |
660 int my= (s->motion_val[xy][1]>>1) + y; | |
661 int i; | |
662 int max; | |
663 | |
664 if(mx<0) mx=0; | |
665 if(my<0) my=0; | |
666 if(mx>=s->width) mx= s->width -1; | |
667 if(my>=s->height) my= s->height-1; | |
668 max= ABS(mx-x); | |
669 if(ABS(my-y) > max) max= ABS(my-y); | |
670 /* the ugliest linedrawing routine ... */ | |
671 for(i=0; i<max; i++){ | |
672 int x1= x + (mx-x)*i/max; | |
673 int y1= y + (my-y)*i/max; | |
674 ptr[y1*s->linesize + x1]+=100; | |
675 } | |
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
676 ptr[y*s->linesize + x]+=100; |
361 | 677 s->mbskip_table[mb_x + mb_y*s->mb_width]=0; |
678 } | |
679 } | |
680 | |
681 } | |
903 | 682 #endif |
931 | 683 |
924 | 684 if(s->pict_type==B_TYPE || s->low_delay){ |
925 | 685 *pict= *(AVFrame*)&s->current_picture; |
262 | 686 } else { |
925 | 687 *pict= *(AVFrame*)&s->last_picture; |
262 | 688 } |
231 | 689 |
931 | 690 if(avctx->debug&FF_DEBUG_QP){ |
691 int8_t *qtab= pict->qscale_table; | |
692 int x,y; | |
693 | |
694 for(y=0; y<s->mb_height; y++){ | |
695 for(x=0; x<s->mb_width; x++){ | |
696 printf("%2d ", qtab[x + y*s->mb_width]); | |
697 } | |
698 printf("\n"); | |
699 } | |
700 printf("\n"); | |
701 } | |
702 | |
231 | 703 /* Return the Picture timestamp as the frame number */ |
704 /* we substract 1 because it is added on utils.c */ | |
705 avctx->frame_number = s->picture_number - 1; | |
706 | |
924 | 707 /* dont output the last pic after seeking */ |
708 if(s->last_picture.data[0] || s->low_delay) | |
925 | 709 *data_size = sizeof(AVFrame); |
384 | 710 #ifdef PRINT_FRAME_TIME |
711 printf("%Ld\n", rdtsc()-time); | |
712 #endif | |
655 | 713 return get_consumed_bytes(s, buf_size); |
0 | 714 } |
715 | |
67 | 716 AVCodec mpeg4_decoder = { |
717 "mpeg4", | |
0 | 718 CODEC_TYPE_VIDEO, |
67 | 719 CODEC_ID_MPEG4, |
0 | 720 sizeof(MpegEncContext), |
936 | 721 ff_h263_decode_init, |
0 | 722 NULL, |
936 | 723 ff_h263_decode_end, |
724 ff_h263_decode_frame, | |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
725 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED, |
0 | 726 }; |
727 | |
728 AVCodec h263_decoder = { | |
729 "h263", | |
730 CODEC_TYPE_VIDEO, | |
731 CODEC_ID_H263, | |
732 sizeof(MpegEncContext), | |
936 | 733 ff_h263_decode_init, |
0 | 734 NULL, |
936 | 735 ff_h263_decode_end, |
736 ff_h263_decode_frame, | |
553 | 737 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 738 }; |
739 | |
307 | 740 AVCodec msmpeg4v1_decoder = { |
741 "msmpeg4v1", | |
742 CODEC_TYPE_VIDEO, | |
743 CODEC_ID_MSMPEG4V1, | |
744 sizeof(MpegEncContext), | |
936 | 745 ff_h263_decode_init, |
307 | 746 NULL, |
936 | 747 ff_h263_decode_end, |
748 ff_h263_decode_frame, | |
553 | 749 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
307 | 750 }; |
751 | |
752 AVCodec msmpeg4v2_decoder = { | |
753 "msmpeg4v2", | |
754 CODEC_TYPE_VIDEO, | |
755 CODEC_ID_MSMPEG4V2, | |
756 sizeof(MpegEncContext), | |
936 | 757 ff_h263_decode_init, |
307 | 758 NULL, |
936 | 759 ff_h263_decode_end, |
760 ff_h263_decode_frame, | |
553 | 761 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
307 | 762 }; |
763 | |
764 AVCodec msmpeg4v3_decoder = { | |
0 | 765 "msmpeg4", |
766 CODEC_TYPE_VIDEO, | |
307 | 767 CODEC_ID_MSMPEG4V3, |
0 | 768 sizeof(MpegEncContext), |
936 | 769 ff_h263_decode_init, |
0 | 770 NULL, |
936 | 771 ff_h263_decode_end, |
772 ff_h263_decode_frame, | |
553 | 773 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 774 }; |
775 | |
311 | 776 AVCodec wmv1_decoder = { |
777 "wmv1", | |
778 CODEC_TYPE_VIDEO, | |
779 CODEC_ID_WMV1, | |
780 sizeof(MpegEncContext), | |
936 | 781 ff_h263_decode_init, |
311 | 782 NULL, |
936 | 783 ff_h263_decode_end, |
784 ff_h263_decode_frame, | |
553 | 785 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
498 | 786 }; |
787 | |
0 | 788 AVCodec h263i_decoder = { |
789 "h263i", | |
790 CODEC_TYPE_VIDEO, | |
791 CODEC_ID_H263I, | |
792 sizeof(MpegEncContext), | |
936 | 793 ff_h263_decode_init, |
0 | 794 NULL, |
936 | 795 ff_h263_decode_end, |
796 ff_h263_decode_frame, | |
553 | 797 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 798 }; |
799 |