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