Mercurial > libavcodec.hg
annotate h263dec.c @ 760:e858fe220ce0 libavcodec
xvid qpel bug workaround
author | michaelni |
---|---|
date | Tue, 22 Oct 2002 18:55:20 +0000 |
parents | cca620e89cf0 |
children | 7f4cc2f6d642 |
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 |
43 static int h263_decode_init(AVCodecContext *avctx) | |
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; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
58 |
0 | 59 /* select sub codec */ |
60 switch(avctx->codec->id) { | |
61 case CODEC_ID_H263: | |
154
f914f710b8d0
- Fixed a bug on H.263 MV prediction for MB on GOBs limits.
pulento
parents:
144
diff
changeset
|
62 s->gob_number = 0; |
454 | 63 s->first_slice_line = 0; |
0 | 64 break; |
67 | 65 case CODEC_ID_MPEG4: |
0 | 66 s->time_increment_bits = 4; /* default value for broken headers */ |
67 s->h263_pred = 1; | |
336 | 68 s->has_b_frames = 1; //default, might be overriden in the vol header during header parsing |
0 | 69 break; |
307 | 70 case CODEC_ID_MSMPEG4V1: |
0 | 71 s->h263_msmpeg4 = 1; |
72 s->h263_pred = 1; | |
307 | 73 s->msmpeg4_version=1; |
74 break; | |
75 case CODEC_ID_MSMPEG4V2: | |
76 s->h263_msmpeg4 = 1; | |
77 s->h263_pred = 1; | |
78 s->msmpeg4_version=2; | |
79 break; | |
80 case CODEC_ID_MSMPEG4V3: | |
81 s->h263_msmpeg4 = 1; | |
82 s->h263_pred = 1; | |
83 s->msmpeg4_version=3; | |
0 | 84 break; |
311 | 85 case CODEC_ID_WMV1: |
86 s->h263_msmpeg4 = 1; | |
87 s->h263_pred = 1; | |
88 s->msmpeg4_version=4; | |
89 break; | |
498 | 90 case CODEC_ID_WMV2: |
91 s->h263_msmpeg4 = 1; | |
92 s->h263_pred = 1; | |
93 s->msmpeg4_version=5; | |
94 break; | |
0 | 95 case CODEC_ID_H263I: |
96 s->h263_intel = 1; | |
97 break; | |
98 default: | |
99 return -1; | |
100 } | |
344 | 101 s->codec_id= avctx->codec->id; |
553 | 102 |
0 | 103 /* 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
|
104 if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4) |
144 | 105 if (MPV_common_init(s) < 0) |
106 return -1; | |
0 | 107 |
108 if (s->h263_msmpeg4) | |
498 | 109 ff_msmpeg4_decode_init(s); |
0 | 110 else |
111 h263_decode_init_vlc(s); | |
112 | |
113 return 0; | |
114 } | |
115 | |
116 static int h263_decode_end(AVCodecContext *avctx) | |
117 { | |
118 MpegEncContext *s = avctx->priv_data; | |
119 | |
120 MPV_common_end(s); | |
121 return 0; | |
122 } | |
123 | |
655 | 124 /** |
125 * retunrs the number of bytes consumed for building the current frame | |
126 */ | |
127 static int get_consumed_bytes(MpegEncContext *s, int buf_size){ | |
128 int pos= (get_bits_count(&s->gb)+7)>>3; | |
129 if(s->divx_version>=500){ | |
130 //we would have to scan through the whole buf to handle the weird reordering ... | |
131 return buf_size; | |
132 }else{ | |
133 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...) | |
658 | 134 if(pos+10>buf_size) pos=buf_size; // oops ;) |
655 | 135 |
136 return pos; | |
137 } | |
138 } | |
139 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
140 static int decode_slice(MpegEncContext *s){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
141 s->last_resync_gb= s->gb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
142 s->first_slice_line= 1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
143 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
144 s->resync_mb_x= s->mb_x; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
145 s->resync_mb_y= s->mb_y; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
146 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
147 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
|
148 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
|
149 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
150 if(s->partitioned_frame){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
151 const int qscale= s->qscale; |
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 if(s->codec_id==CODEC_ID_MPEG4){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
154 if(ff_mpeg4_decode_partitions(s) < 0) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
155 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
156 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
157 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
158 /* restore variables which where modified */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
159 s->first_slice_line=1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
160 s->mb_x= s->resync_mb_x; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
161 s->mb_y= s->resync_mb_y; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
162 s->qscale= qscale; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
163 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
|
164 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
|
165 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
166 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
167 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
|
168 /* per-row end of slice checks */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
169 if(s->msmpeg4_version){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
170 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
|
171 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
|
172 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
|
173 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
174 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
175 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
176 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
177 if(s->msmpeg4_version==1){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
178 s->last_dc[0]= |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
179 s->last_dc[1]= |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
180 s->last_dc[2]= 128; |
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 ff_init_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
184 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
|
185 int ret; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
186 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
187 ff_update_block_index(s); |
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 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
|
190 s->first_slice_line=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
191 } |
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 /* DCT & quantize */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
194 clear_blocks(s->block[0]); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
195 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
196 s->mv_dir = MV_DIR_FORWARD; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
197 s->mv_type = MV_TYPE_16X16; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
198 //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
|
199 ret= s->decode_mb(s, s->block); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
200 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
201 PRINT_QP("%2d", s->qscale); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
202 MPV_decode_mb(s, s->block); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
203 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
204 if(ret<0){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
205 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
|
206 if(ret==SLICE_END){ |
758 | 207 //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
|
208 s->error_status_table[xy]|= AC_END; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
209 if(!s->partitioned_frame) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
210 s->error_status_table[xy]|= MV_END|DC_END; |
750 | 211 |
212 s->padding_bug_score--; | |
213 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
214 if(++s->mb_x >= s->mb_width){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
215 s->mb_x=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
216 ff_draw_horiz_band(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
217 s->mb_y++; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
218 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
219 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
220 }else if(ret==SLICE_NOEND){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
221 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
|
222 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
223 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
224 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
|
225 s->error_status_table[xy]|= AC_ERROR; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
226 if(!s->partitioned_frame) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
227 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
|
228 |
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 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
232 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
233 ff_draw_horiz_band(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
234 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
235 PRINT_QP("%s", "\n"); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
236 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
237 s->mb_x= 0; |
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 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
|
241 |
750 | 242 /* try to detect the padding bug */ |
243 if( s->codec_id==CODEC_ID_MPEG4 | |
244 && (s->workaround_bugs&FF_BUG_AUTODETECT) | |
245 && s->gb.size*8 - get_bits_count(&s->gb) >=0 | |
246 && s->gb.size*8 - get_bits_count(&s->gb) < 48 | |
247 && !s->resync_marker | |
248 && !s->data_partitioning){ | |
249 | |
250 const int bits_count= get_bits_count(&s->gb); | |
251 const int bits_left = s->gb.size*8 - bits_count; | |
252 | |
253 if(bits_left==0 || bits_left>8){ | |
254 s->padding_bug_score++; | |
255 } else { | |
256 int v= show_bits(&s->gb, 8); | |
257 v|= 0x7F >> (7-(bits_count&7)); | |
258 | |
259 if(v==0x7F) | |
260 s->padding_bug_score--; | |
261 else | |
262 s->padding_bug_score++; | |
263 } | |
264 | |
265 if(s->padding_bug_score > -2) | |
266 s->workaround_bugs |= FF_BUG_NO_PADDING; | |
267 else | |
268 s->workaround_bugs &= ~FF_BUG_NO_PADDING; | |
269 } | |
270 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
271 // 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
|
272 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
|
273 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
|
274 int max_extra=7; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
275 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
276 /* no markers in M$ crap */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
277 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
|
278 max_extra+= 17; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
279 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
280 /* 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
|
281 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
|
282 max_extra+= 48; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
283 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
|
284 max_extra+= 256*256*256*64; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
285 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
286 if(left>max_extra){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
287 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
|
288 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
289 else if(left<0){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
290 fprintf(stderr, "overreading %d bits\n", -left); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
291 }else |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
292 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
|
293 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
294 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
295 } |
750 | 296 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
297 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
|
298 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
|
299 show_bits(&s->gb, 24)); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
300 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
301 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
302 |
0 | 303 static int h263_decode_frame(AVCodecContext *avctx, |
304 void *data, int *data_size, | |
305 UINT8 *buf, int buf_size) | |
306 { | |
307 MpegEncContext *s = avctx->priv_data; | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
308 int ret,i; |
0 | 309 AVPicture *pict = data; |
384 | 310 #ifdef PRINT_FRAME_TIME |
311 uint64_t time= rdtsc(); | |
312 #endif | |
0 | 313 #ifdef DEBUG |
314 printf("*****frame %d size=%d\n", avctx->frame_number, buf_size); | |
315 printf("bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]); | |
316 #endif | |
345 | 317 |
318 s->hurry_up= avctx->hurry_up; | |
454 | 319 s->error_resilience= avctx->error_resilience; |
701 | 320 |
485 | 321 s->flags= avctx->flags; |
454 | 322 |
657 | 323 *data_size = 0; |
324 | |
325 /* no supplementary picture */ | |
0 | 326 if (buf_size == 0) { |
327 return 0; | |
328 } | |
329 | |
465 | 330 if(s->bitstream_buffer_size && buf_size<20){ //divx 5.01+ frame reorder |
333 | 331 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size); |
353 | 332 }else |
333 | 333 init_get_bits(&s->gb, buf, buf_size); |
465 | 334 s->bitstream_buffer_size=0; |
0 | 335 |
718 | 336 if (!s->context_initialized) { |
752
97077dd24bfa
fixing alt_scan for the first frame (variable was reset)
michaelni
parents:
750
diff
changeset
|
337 if (MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix |
718 | 338 return -1; |
339 } | |
340 | |
0 | 341 /* let's go :-) */ |
342 if (s->h263_msmpeg4) { | |
343 ret = msmpeg4_decode_picture_header(s); | |
344 } 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
|
345 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
|
346 GetBitContext gb; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
347 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
348 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
|
349 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
|
350 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
351 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
|
352 |
336 | 353 s->has_b_frames= !s->low_delay; |
0 | 354 } else if (s->h263_intel) { |
355 ret = intel_h263_decode_picture_header(s); | |
356 } else { | |
357 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
|
358 } |
556 | 359 avctx->has_b_frames= s->has_b_frames; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
360 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
361 if(s->workaround_bugs&FF_BUG_AUTODETECT){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
362 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
|
363 s->workaround_bugs|= FF_BUG_XVID_ILACE; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
364 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
365 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
|
366 s->workaround_bugs|= FF_BUG_AC_VLC; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
367 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
368 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
|
369 s->workaround_bugs|= FF_BUG_AC_VLC; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
370 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
371 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
|
372 s->workaround_bugs|= FF_BUG_UMP4; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
373 s->workaround_bugs|= FF_BUG_AC_VLC; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
374 } |
760 | 375 |
376 if(s->divx_version){ | |
377 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; | |
378 } | |
750 | 379 //printf("padding_bug_score: %d\n", s->padding_bug_score); |
380 #if 0 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
381 if(s->divx_version==500) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
382 s->workaround_bugs|= FF_BUG_NO_PADDING; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
383 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
384 /* 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
|
385 * lets hope this at least works |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
386 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
387 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
|
388 && 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
|
389 s->workaround_bugs|= FF_BUG_NO_PADDING; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
390 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
391 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
|
392 s->workaround_bugs|= FF_BUG_NO_PADDING; |
750 | 393 #endif |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
394 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
395 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
396 |
585
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
397 #if 0 // dump bits per frame / qp / complexity |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
398 { |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
399 static FILE *f=NULL; |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
400 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
|
401 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
|
402 } |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
403 #endif |
553 | 404 |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
405 /* After H263 & mpeg4 header decode we have the height, width,*/ |
160 | 406 /* and other parameters. So then we could init the picture */ |
407 /* FIXME: By the way H263 decoder is evolving it should have */ | |
408 /* an H263EncContext */ | |
718 | 409 if ( s->width != avctx->width || s->height != avctx->height |
410 || avctx->aspect_ratio_info != s->aspect_ratio_info | |
411 || avctx->aspected_width != s->aspected_width | |
412 || avctx->aspected_height != s->aspected_height) { | |
553 | 413 /* H.263 could change picture size any time */ |
414 MPV_common_end(s); | |
415 s->context_initialized=0; | |
416 } | |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
417 if (!s->context_initialized) { |
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
418 avctx->width = s->width; |
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
419 avctx->height = s->height; |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
274
diff
changeset
|
420 avctx->aspect_ratio_info= s->aspect_ratio_info; |
669
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
658
diff
changeset
|
421 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) |
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
658
diff
changeset
|
422 { |
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
658
diff
changeset
|
423 avctx->aspected_width = s->aspected_width; |
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
658
diff
changeset
|
424 avctx->aspected_height = s->aspected_height; |
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
658
diff
changeset
|
425 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
426 |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
427 if (MPV_common_init(s) < 0) |
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
428 return -1; |
0 | 429 } |
758 | 430 |
431 if((s->codec_id==CODEC_ID_H263 || s->codec_id==CODEC_ID_H263P)) | |
432 s->gob_index = ff_h263_get_gob_height(s); | |
433 | |
655 | 434 if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_size); |
454 | 435 /* skip if the header was thrashed */ |
498 | 436 if (ret < 0){ |
437 fprintf(stderr, "header damaged\n"); | |
0 | 438 return -1; |
498 | 439 } |
341 | 440 /* skip b frames if we dont have reference frames */ |
655 | 441 if(s->num_available_buffers<2 && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size); |
345 | 442 /* skip b frames if we are in a hurry */ |
655 | 443 if(s->hurry_up && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size); |
454 | 444 |
445 if(s->next_p_frame_damaged){ | |
446 if(s->pict_type==B_TYPE) | |
655 | 447 return get_consumed_bytes(s, buf_size); |
454 | 448 else |
449 s->next_p_frame_damaged=0; | |
450 } | |
451 | |
553 | 452 MPV_frame_start(s, avctx); |
0 | 453 |
454 #ifdef DEBUG | |
455 printf("qscale=%d\n", s->qscale); | |
456 #endif | |
457 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
458 if(s->error_resilience) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
459 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
|
460 |
0 | 461 /* decode each macroblock */ |
266 | 462 s->block_wrap[0]= |
463 s->block_wrap[1]= | |
464 s->block_wrap[2]= | |
465 s->block_wrap[3]= s->mb_width*2 + 2; | |
466 s->block_wrap[4]= | |
467 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
|
468 s->mb_x=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
469 s->mb_y=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
470 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
471 decode_slice(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
472 s->error_status_table[0]|= VP_START; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
473 while(s->mb_y<s->mb_height && s->gb.size*8 - get_bits_count(&s->gb)>32){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
474 if(s->msmpeg4_version){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
475 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
|
476 break; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
477 }else{ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
478 if(ff_h263_resync(s)<0) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
479 break; |
454 | 480 } |
481 | |
756 | 482 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
|
483 ff_mpeg4_clean_buffers(s); |
454 | 484 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
485 decode_slice(s); |
756 | 486 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
487 s->error_status_table[s->resync_mb_x + s->resync_mb_y*s->mb_width]|= VP_START; |
0 | 488 } |
756 | 489 |
311 | 490 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==I_TYPE) |
208 | 491 if(msmpeg4_decode_ext_header(s, buf_size) < 0) return -1; |
333 | 492 |
493 /* divx 5.01+ bistream reorder stuff */ | |
655 | 494 if(s->codec_id==CODEC_ID_MPEG4 && s->bitstream_buffer_size==0 && s->divx_version>=500){ |
454 | 495 int current_pos= get_bits_count(&s->gb)>>3; |
496 | |
333 | 497 if( buf_size - current_pos > 5 |
498 && buf_size - current_pos < BITSTREAM_BUFFER_SIZE){ | |
454 | 499 int i; |
500 int startcode_found=0; | |
655 | 501 for(i=current_pos; i<buf_size-3; i++){ |
454 | 502 if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1 && buf[i+3]==0xB6){ |
503 startcode_found=1; | |
504 break; | |
505 } | |
506 } | |
507 if(startcode_found){ | |
508 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos); | |
509 s->bitstream_buffer_size= buf_size - current_pos; | |
510 } | |
511 } | |
512 } | |
513 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
514 if(s->error_resilience){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
515 int error=0, num_end_markers=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
516 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
|
517 int status= s->error_status_table[i]; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
518 #if 0 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
519 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
|
520 printf("%2X ", status); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
521 #endif |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
522 if(status==0) continue; |
454 | 523 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
524 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
|
525 error=1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
526 if(status&VP_START){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
527 if(num_end_markers) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
528 error=1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
529 num_end_markers=3; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
530 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
531 if(status&AC_END) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
532 num_end_markers--; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
533 if(status&DC_END) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
534 num_end_markers--; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
535 if(status&MV_END) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
536 num_end_markers--; |
454 | 537 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
538 if(num_end_markers || error){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
539 fprintf(stderr, "concealing errors\n"); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
540 //printf("type:%d\n", s->pict_type); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
541 ff_error_resilience(s); |
333 | 542 } |
353 | 543 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
544 |
0 | 545 MPV_frame_end(s); |
361 | 546 #if 0 //dirty show MVs, we should export the MV tables and write a filter to show them |
547 { | |
548 int mb_y; | |
549 s->has_b_frames=1; | |
550 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
551 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
|
552 int y= mb_y*16 + 8; |
361 | 553 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
|
554 int x= mb_x*16 + 8; |
361 | 555 uint8_t *ptr= s->last_picture[0]; |
556 int xy= 1 + mb_x*2 + (mb_y*2 + 1)*(s->mb_width*2 + 2); | |
557 int mx= (s->motion_val[xy][0]>>1) + x; | |
558 int my= (s->motion_val[xy][1]>>1) + y; | |
559 int i; | |
560 int max; | |
561 | |
562 if(mx<0) mx=0; | |
563 if(my<0) my=0; | |
564 if(mx>=s->width) mx= s->width -1; | |
565 if(my>=s->height) my= s->height-1; | |
566 max= ABS(mx-x); | |
567 if(ABS(my-y) > max) max= ABS(my-y); | |
568 /* the ugliest linedrawing routine ... */ | |
569 for(i=0; i<max; i++){ | |
570 int x1= x + (mx-x)*i/max; | |
571 int y1= y + (my-y)*i/max; | |
572 ptr[y1*s->linesize + x1]+=100; | |
573 } | |
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
574 ptr[y*s->linesize + x]+=100; |
361 | 575 s->mbskip_table[mb_x + mb_y*s->mb_width]=0; |
576 } | |
577 } | |
578 | |
579 } | |
580 #endif | |
273
34f40a0fc840
msmpeg4 bugfix (wrong frame displayed if some frames are skipped)
michaelni
parents:
266
diff
changeset
|
581 if(s->pict_type==B_TYPE || (!s->has_b_frames)){ |
262 | 582 pict->data[0] = s->current_picture[0]; |
583 pict->data[1] = s->current_picture[1]; | |
584 pict->data[2] = s->current_picture[2]; | |
585 } else { | |
586 pict->data[0] = s->last_picture[0]; | |
587 pict->data[1] = s->last_picture[1]; | |
588 pict->data[2] = s->last_picture[2]; | |
589 } | |
0 | 590 pict->linesize[0] = s->linesize; |
556 | 591 pict->linesize[1] = s->uvlinesize; |
592 pict->linesize[2] = s->uvlinesize; | |
0 | 593 |
594 avctx->quality = s->qscale; | |
231 | 595 |
596 /* Return the Picture timestamp as the frame number */ | |
597 /* we substract 1 because it is added on utils.c */ | |
598 avctx->frame_number = s->picture_number - 1; | |
599 | |
341 | 600 /* dont output the last pic after seeking |
601 note we allready added +1 for the current pix in MPV_frame_end(s) */ | |
602 if(s->num_available_buffers>=2 || (!s->has_b_frames)) | |
603 *data_size = sizeof(AVPicture); | |
384 | 604 #ifdef PRINT_FRAME_TIME |
605 printf("%Ld\n", rdtsc()-time); | |
606 #endif | |
655 | 607 return get_consumed_bytes(s, buf_size); |
0 | 608 } |
609 | |
67 | 610 AVCodec mpeg4_decoder = { |
611 "mpeg4", | |
0 | 612 CODEC_TYPE_VIDEO, |
67 | 613 CODEC_ID_MPEG4, |
0 | 614 sizeof(MpegEncContext), |
615 h263_decode_init, | |
616 NULL, | |
617 h263_decode_end, | |
618 h263_decode_frame, | |
553 | 619 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 620 }; |
621 | |
622 AVCodec h263_decoder = { | |
623 "h263", | |
624 CODEC_TYPE_VIDEO, | |
625 CODEC_ID_H263, | |
626 sizeof(MpegEncContext), | |
627 h263_decode_init, | |
628 NULL, | |
629 h263_decode_end, | |
630 h263_decode_frame, | |
553 | 631 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 632 }; |
633 | |
307 | 634 AVCodec msmpeg4v1_decoder = { |
635 "msmpeg4v1", | |
636 CODEC_TYPE_VIDEO, | |
637 CODEC_ID_MSMPEG4V1, | |
638 sizeof(MpegEncContext), | |
639 h263_decode_init, | |
640 NULL, | |
641 h263_decode_end, | |
642 h263_decode_frame, | |
553 | 643 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
307 | 644 }; |
645 | |
646 AVCodec msmpeg4v2_decoder = { | |
647 "msmpeg4v2", | |
648 CODEC_TYPE_VIDEO, | |
649 CODEC_ID_MSMPEG4V2, | |
650 sizeof(MpegEncContext), | |
651 h263_decode_init, | |
652 NULL, | |
653 h263_decode_end, | |
654 h263_decode_frame, | |
553 | 655 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
307 | 656 }; |
657 | |
658 AVCodec msmpeg4v3_decoder = { | |
0 | 659 "msmpeg4", |
660 CODEC_TYPE_VIDEO, | |
307 | 661 CODEC_ID_MSMPEG4V3, |
0 | 662 sizeof(MpegEncContext), |
663 h263_decode_init, | |
664 NULL, | |
665 h263_decode_end, | |
666 h263_decode_frame, | |
553 | 667 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 668 }; |
669 | |
311 | 670 AVCodec wmv1_decoder = { |
671 "wmv1", | |
672 CODEC_TYPE_VIDEO, | |
673 CODEC_ID_WMV1, | |
674 sizeof(MpegEncContext), | |
675 h263_decode_init, | |
676 NULL, | |
677 h263_decode_end, | |
678 h263_decode_frame, | |
553 | 679 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
311 | 680 }; |
681 | |
498 | 682 AVCodec wmv2_decoder = { |
683 "wmv2", | |
684 CODEC_TYPE_VIDEO, | |
685 CODEC_ID_WMV2, | |
686 sizeof(MpegEncContext), | |
687 h263_decode_init, | |
688 NULL, | |
689 h263_decode_end, | |
690 h263_decode_frame, | |
553 | 691 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
498 | 692 }; |
693 | |
0 | 694 AVCodec h263i_decoder = { |
695 "h263i", | |
696 CODEC_TYPE_VIDEO, | |
697 CODEC_ID_H263I, | |
698 sizeof(MpegEncContext), | |
699 h263_decode_init, | |
700 NULL, | |
701 h263_decode_end, | |
702 h263_decode_frame, | |
553 | 703 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 704 }; |
705 |