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