Mercurial > libavcodec.hg
annotate h263dec.c @ 747:3d4377531f6c libavcodec
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
author | michaelni |
---|---|
date | Mon, 14 Oct 2002 12:21:54 +0000 |
parents | 25d7fb7c89be |
children | 4adadf210b3b |
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){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
207 //printf("%d %d %06X\n", s->mb_x, s->gb.size*8 - 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
|
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; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
211 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
212 if(++s->mb_x >= s->mb_width){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
213 s->mb_x=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
214 ff_draw_horiz_band(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
215 s->mb_y++; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
216 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
217 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
218 }else if(ret==SLICE_NOEND){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
219 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
|
220 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
221 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
222 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
|
223 s->error_status_table[xy]|= AC_ERROR; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
224 if(!s->partitioned_frame) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
225 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
|
226 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
227 return -1; |
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 } |
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 ff_draw_horiz_band(s); |
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 PRINT_QP("%s", "\n"); |
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 s->mb_x= 0; |
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 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
238 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
|
239 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
240 // 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
|
241 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
|
242 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
|
243 int max_extra=7; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
244 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
245 /* no markers in M$ crap */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
246 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
|
247 max_extra+= 17; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
248 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
249 /* 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
|
250 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
|
251 max_extra+= 48; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
252 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
|
253 max_extra+= 256*256*256*64; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
254 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
255 if(left>max_extra){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
256 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
|
257 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
258 else if(left<0){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
259 fprintf(stderr, "overreading %d bits\n", -left); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
260 }else |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
261 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
|
262 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
263 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
264 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
265 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
266 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
|
267 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
|
268 show_bits(&s->gb, 24)); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
269 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
270 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
271 |
0 | 272 static int h263_decode_frame(AVCodecContext *avctx, |
273 void *data, int *data_size, | |
274 UINT8 *buf, int buf_size) | |
275 { | |
276 MpegEncContext *s = avctx->priv_data; | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
277 int ret,i; |
0 | 278 AVPicture *pict = data; |
384 | 279 #ifdef PRINT_FRAME_TIME |
280 uint64_t time= rdtsc(); | |
281 #endif | |
0 | 282 #ifdef DEBUG |
283 printf("*****frame %d size=%d\n", avctx->frame_number, buf_size); | |
284 printf("bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]); | |
285 #endif | |
345 | 286 |
287 s->hurry_up= avctx->hurry_up; | |
454 | 288 s->error_resilience= avctx->error_resilience; |
701 | 289 |
485 | 290 s->flags= avctx->flags; |
454 | 291 |
657 | 292 *data_size = 0; |
293 | |
294 /* no supplementary picture */ | |
0 | 295 if (buf_size == 0) { |
296 return 0; | |
297 } | |
298 | |
465 | 299 if(s->bitstream_buffer_size && buf_size<20){ //divx 5.01+ frame reorder |
333 | 300 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size); |
353 | 301 }else |
333 | 302 init_get_bits(&s->gb, buf, buf_size); |
465 | 303 s->bitstream_buffer_size=0; |
0 | 304 |
718 | 305 if (!s->context_initialized) { |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
306 if (DCT_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix |
718 | 307 return -1; |
308 } | |
309 | |
0 | 310 /* let's go :-) */ |
311 if (s->h263_msmpeg4) { | |
312 ret = msmpeg4_decode_picture_header(s); | |
313 } 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
|
314 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
|
315 GetBitContext gb; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
316 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
317 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
|
318 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
|
319 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
320 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
|
321 |
336 | 322 s->has_b_frames= !s->low_delay; |
0 | 323 } else if (s->h263_intel) { |
324 ret = intel_h263_decode_picture_header(s); | |
325 } else { | |
326 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
|
327 } |
556 | 328 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
|
329 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
330 if(s->workaround_bugs&FF_BUG_AUTODETECT){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
331 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
|
332 s->workaround_bugs|= FF_BUG_XVID_ILACE; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
333 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
334 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
|
335 s->workaround_bugs|= FF_BUG_AC_VLC; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
336 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
337 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
|
338 s->workaround_bugs|= FF_BUG_AC_VLC; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
339 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
340 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
|
341 s->workaround_bugs|= FF_BUG_UMP4; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
342 s->workaround_bugs|= FF_BUG_AC_VLC; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
343 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
344 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
345 if(s->divx_version==500) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
346 s->workaround_bugs|= FF_BUG_NO_PADDING; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
347 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
348 /* 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
|
349 * lets hope this at least works |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
350 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
351 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
|
352 && 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
|
353 s->workaround_bugs|= FF_BUG_NO_PADDING; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
354 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
355 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
|
356 s->workaround_bugs|= FF_BUG_NO_PADDING; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
357 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
358 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
359 |
585
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
360 #if 0 // dump bits per frame / qp / complexity |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
361 { |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
362 static FILE *f=NULL; |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
363 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
|
364 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
|
365 } |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
366 #endif |
553 | 367 |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
368 /* After H263 & mpeg4 header decode we have the height, width,*/ |
160 | 369 /* and other parameters. So then we could init the picture */ |
370 /* FIXME: By the way H263 decoder is evolving it should have */ | |
371 /* an H263EncContext */ | |
718 | 372 if ( s->width != avctx->width || s->height != avctx->height |
373 || avctx->aspect_ratio_info != s->aspect_ratio_info | |
374 || avctx->aspected_width != s->aspected_width | |
375 || avctx->aspected_height != s->aspected_height) { | |
553 | 376 /* H.263 could change picture size any time */ |
377 MPV_common_end(s); | |
378 s->context_initialized=0; | |
379 } | |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
380 if (!s->context_initialized) { |
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
381 avctx->width = s->width; |
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
382 avctx->height = s->height; |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
274
diff
changeset
|
383 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
|
384 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
|
385 { |
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
658
diff
changeset
|
386 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
|
387 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
|
388 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
389 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
390 if (s->codec_id==CODEC_ID_H263 && s->codec_id==CODEC_ID_H263) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
391 s->gob_index = ff_h263_get_gob_height(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
392 |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
393 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
|
394 return -1; |
0 | 395 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
396 |
655 | 397 if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_size); |
454 | 398 /* skip if the header was thrashed */ |
498 | 399 if (ret < 0){ |
400 fprintf(stderr, "header damaged\n"); | |
0 | 401 return -1; |
498 | 402 } |
341 | 403 /* skip b frames if we dont have reference frames */ |
655 | 404 if(s->num_available_buffers<2 && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size); |
345 | 405 /* skip b frames if we are in a hurry */ |
655 | 406 if(s->hurry_up && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size); |
454 | 407 |
408 if(s->next_p_frame_damaged){ | |
409 if(s->pict_type==B_TYPE) | |
655 | 410 return get_consumed_bytes(s, buf_size); |
454 | 411 else |
412 s->next_p_frame_damaged=0; | |
413 } | |
414 | |
553 | 415 MPV_frame_start(s, avctx); |
0 | 416 |
417 #ifdef DEBUG | |
418 printf("qscale=%d\n", s->qscale); | |
419 #endif | |
420 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
421 if(s->error_resilience) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
422 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
|
423 |
0 | 424 /* decode each macroblock */ |
266 | 425 s->block_wrap[0]= |
426 s->block_wrap[1]= | |
427 s->block_wrap[2]= | |
428 s->block_wrap[3]= s->mb_width*2 + 2; | |
429 s->block_wrap[4]= | |
430 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
|
431 s->mb_x=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
432 s->mb_y=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
433 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
434 decode_slice(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
435 s->error_status_table[0]|= VP_START; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
436 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
|
437 if(s->msmpeg4_version){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
438 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
|
439 break; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
440 }else{ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
441 if(ff_h263_resync(s)<0) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
442 break; |
454 | 443 } |
444 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
445 if(s->msmpeg4_version!=4) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
446 ff_mpeg4_clean_buffers(s); |
454 | 447 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
448 decode_slice(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
449 s->error_status_table[s->resync_mb_x + s->resync_mb_y*s->mb_width]|= VP_START; |
0 | 450 } |
208 | 451 |
311 | 452 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==I_TYPE) |
208 | 453 if(msmpeg4_decode_ext_header(s, buf_size) < 0) return -1; |
333 | 454 |
455 /* divx 5.01+ bistream reorder stuff */ | |
655 | 456 if(s->codec_id==CODEC_ID_MPEG4 && s->bitstream_buffer_size==0 && s->divx_version>=500){ |
454 | 457 int current_pos= get_bits_count(&s->gb)>>3; |
458 | |
333 | 459 if( buf_size - current_pos > 5 |
460 && buf_size - current_pos < BITSTREAM_BUFFER_SIZE){ | |
454 | 461 int i; |
462 int startcode_found=0; | |
655 | 463 for(i=current_pos; i<buf_size-3; i++){ |
454 | 464 if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1 && buf[i+3]==0xB6){ |
465 startcode_found=1; | |
466 break; | |
467 } | |
468 } | |
469 if(startcode_found){ | |
470 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos); | |
471 s->bitstream_buffer_size= buf_size - current_pos; | |
472 } | |
473 } | |
474 } | |
475 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
476 if(s->error_resilience){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
477 int error=0, num_end_markers=0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
478 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
|
479 int status= s->error_status_table[i]; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
480 #if 0 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
481 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
|
482 printf("%2X ", status); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
483 #endif |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
484 if(status==0) continue; |
454 | 485 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
486 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
|
487 error=1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
488 if(status&VP_START){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
489 if(num_end_markers) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
490 error=1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
491 num_end_markers=3; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
492 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
493 if(status&AC_END) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
494 num_end_markers--; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
495 if(status&DC_END) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
496 num_end_markers--; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
497 if(status&MV_END) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
498 num_end_markers--; |
454 | 499 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
500 if(num_end_markers || error){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
501 fprintf(stderr, "concealing errors\n"); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
502 //printf("type:%d\n", s->pict_type); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
503 ff_error_resilience(s); |
333 | 504 } |
353 | 505 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
506 |
0 | 507 MPV_frame_end(s); |
361 | 508 #if 0 //dirty show MVs, we should export the MV tables and write a filter to show them |
509 { | |
510 int mb_y; | |
511 s->has_b_frames=1; | |
512 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
513 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
|
514 int y= mb_y*16 + 8; |
361 | 515 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
|
516 int x= mb_x*16 + 8; |
361 | 517 uint8_t *ptr= s->last_picture[0]; |
518 int xy= 1 + mb_x*2 + (mb_y*2 + 1)*(s->mb_width*2 + 2); | |
519 int mx= (s->motion_val[xy][0]>>1) + x; | |
520 int my= (s->motion_val[xy][1]>>1) + y; | |
521 int i; | |
522 int max; | |
523 | |
524 if(mx<0) mx=0; | |
525 if(my<0) my=0; | |
526 if(mx>=s->width) mx= s->width -1; | |
527 if(my>=s->height) my= s->height-1; | |
528 max= ABS(mx-x); | |
529 if(ABS(my-y) > max) max= ABS(my-y); | |
530 /* the ugliest linedrawing routine ... */ | |
531 for(i=0; i<max; i++){ | |
532 int x1= x + (mx-x)*i/max; | |
533 int y1= y + (my-y)*i/max; | |
534 ptr[y1*s->linesize + x1]+=100; | |
535 } | |
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
536 ptr[y*s->linesize + x]+=100; |
361 | 537 s->mbskip_table[mb_x + mb_y*s->mb_width]=0; |
538 } | |
539 } | |
540 | |
541 } | |
542 #endif | |
273
34f40a0fc840
msmpeg4 bugfix (wrong frame displayed if some frames are skipped)
michaelni
parents:
266
diff
changeset
|
543 if(s->pict_type==B_TYPE || (!s->has_b_frames)){ |
262 | 544 pict->data[0] = s->current_picture[0]; |
545 pict->data[1] = s->current_picture[1]; | |
546 pict->data[2] = s->current_picture[2]; | |
547 } else { | |
548 pict->data[0] = s->last_picture[0]; | |
549 pict->data[1] = s->last_picture[1]; | |
550 pict->data[2] = s->last_picture[2]; | |
551 } | |
0 | 552 pict->linesize[0] = s->linesize; |
556 | 553 pict->linesize[1] = s->uvlinesize; |
554 pict->linesize[2] = s->uvlinesize; | |
0 | 555 |
556 avctx->quality = s->qscale; | |
231 | 557 |
558 /* Return the Picture timestamp as the frame number */ | |
559 /* we substract 1 because it is added on utils.c */ | |
560 avctx->frame_number = s->picture_number - 1; | |
561 | |
341 | 562 /* dont output the last pic after seeking |
563 note we allready added +1 for the current pix in MPV_frame_end(s) */ | |
564 if(s->num_available_buffers>=2 || (!s->has_b_frames)) | |
565 *data_size = sizeof(AVPicture); | |
384 | 566 #ifdef PRINT_FRAME_TIME |
567 printf("%Ld\n", rdtsc()-time); | |
568 #endif | |
655 | 569 return get_consumed_bytes(s, buf_size); |
0 | 570 } |
571 | |
67 | 572 AVCodec mpeg4_decoder = { |
573 "mpeg4", | |
0 | 574 CODEC_TYPE_VIDEO, |
67 | 575 CODEC_ID_MPEG4, |
0 | 576 sizeof(MpegEncContext), |
577 h263_decode_init, | |
578 NULL, | |
579 h263_decode_end, | |
580 h263_decode_frame, | |
553 | 581 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 582 }; |
583 | |
584 AVCodec h263_decoder = { | |
585 "h263", | |
586 CODEC_TYPE_VIDEO, | |
587 CODEC_ID_H263, | |
588 sizeof(MpegEncContext), | |
589 h263_decode_init, | |
590 NULL, | |
591 h263_decode_end, | |
592 h263_decode_frame, | |
553 | 593 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 594 }; |
595 | |
307 | 596 AVCodec msmpeg4v1_decoder = { |
597 "msmpeg4v1", | |
598 CODEC_TYPE_VIDEO, | |
599 CODEC_ID_MSMPEG4V1, | |
600 sizeof(MpegEncContext), | |
601 h263_decode_init, | |
602 NULL, | |
603 h263_decode_end, | |
604 h263_decode_frame, | |
553 | 605 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
307 | 606 }; |
607 | |
608 AVCodec msmpeg4v2_decoder = { | |
609 "msmpeg4v2", | |
610 CODEC_TYPE_VIDEO, | |
611 CODEC_ID_MSMPEG4V2, | |
612 sizeof(MpegEncContext), | |
613 h263_decode_init, | |
614 NULL, | |
615 h263_decode_end, | |
616 h263_decode_frame, | |
553 | 617 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
307 | 618 }; |
619 | |
620 AVCodec msmpeg4v3_decoder = { | |
0 | 621 "msmpeg4", |
622 CODEC_TYPE_VIDEO, | |
307 | 623 CODEC_ID_MSMPEG4V3, |
0 | 624 sizeof(MpegEncContext), |
625 h263_decode_init, | |
626 NULL, | |
627 h263_decode_end, | |
628 h263_decode_frame, | |
553 | 629 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 630 }; |
631 | |
311 | 632 AVCodec wmv1_decoder = { |
633 "wmv1", | |
634 CODEC_TYPE_VIDEO, | |
635 CODEC_ID_WMV1, | |
636 sizeof(MpegEncContext), | |
637 h263_decode_init, | |
638 NULL, | |
639 h263_decode_end, | |
640 h263_decode_frame, | |
553 | 641 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
311 | 642 }; |
643 | |
498 | 644 AVCodec wmv2_decoder = { |
645 "wmv2", | |
646 CODEC_TYPE_VIDEO, | |
647 CODEC_ID_WMV2, | |
648 sizeof(MpegEncContext), | |
649 h263_decode_init, | |
650 NULL, | |
651 h263_decode_end, | |
652 h263_decode_frame, | |
553 | 653 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
498 | 654 }; |
655 | |
0 | 656 AVCodec h263i_decoder = { |
657 "h263i", | |
658 CODEC_TYPE_VIDEO, | |
659 CODEC_ID_H263I, | |
660 sizeof(MpegEncContext), | |
661 h263_decode_init, | |
662 NULL, | |
663 h263_decode_end, | |
664 h263_decode_frame, | |
553 | 665 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 666 }; |
667 |