Mercurial > libavcodec.hg
annotate h263dec.c @ 3177:8d1b2cc2a75b libavcodec
(f)printf --> av_log conversion
taken from a patch by Steve L'Homme
| author | diego |
|---|---|
| date | Wed, 08 Mar 2006 11:43:10 +0000 |
| parents | 9aec091b342f |
| children | 333e016c2c8a |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 1106 | 2 * H.263 decoder |
| 429 | 3 * Copyright (c) 2001 Fabrice Bellard. |
|
1739
07a484280a82
copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
michael
parents:
1706
diff
changeset
|
4 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> |
| 0 | 5 * |
| 429 | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Lesser General Public | |
| 8 * License as published by the Free Software Foundation; either | |
| 9 * version 2 of the License, or (at your option) any later version. | |
| 0 | 10 * |
| 429 | 11 * This library is distributed in the hope that it will be useful, |
| 0 | 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 429 | 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 14 * Lesser General Public License for more details. | |
| 0 | 15 * |
| 429 | 16 * You should have received a copy of the GNU Lesser General Public |
| 17 * License along with this library; if not, write to the Free Software | |
|
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2977
diff
changeset
|
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 19 */ |
| 2967 | 20 |
| 1106 | 21 /** |
| 22 * @file h263dec.c | |
| 23 * H.263 decoder. | |
| 24 */ | |
| 2967 | 25 |
|
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
384
diff
changeset
|
26 #include "avcodec.h" |
| 0 | 27 #include "dsputil.h" |
| 28 #include "mpegvideo.h" | |
| 29 | |
| 30 //#define DEBUG | |
| 384 | 31 //#define PRINT_FRAME_TIME |
| 0 | 32 |
| 936 | 33 int ff_h263_decode_init(AVCodecContext *avctx) |
| 0 | 34 { |
| 35 MpegEncContext *s = avctx->priv_data; | |
| 60 | 36 |
| 67 | 37 s->avctx = avctx; |
| 0 | 38 s->out_format = FMT_H263; |
| 39 | |
| 2270 | 40 s->width = avctx->coded_width; |
| 41 s->height = avctx->coded_height; | |
|
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
42 s->workaround_bugs= avctx->workaround_bugs; |
| 0 | 43 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
44 // set defaults |
| 1892 | 45 MPV_decode_defaults(s); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
46 s->quant_precision=5; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
47 s->decode_mb= ff_h263_decode_mb; |
| 924 | 48 s->low_delay= 1; |
| 939 | 49 avctx->pix_fmt= PIX_FMT_YUV420P; |
|
1542
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1536
diff
changeset
|
50 s->unrestricted_mv= 1; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
51 |
| 0 | 52 /* select sub codec */ |
| 53 switch(avctx->codec->id) { | |
| 54 case CODEC_ID_H263: | |
| 1639 | 55 s->unrestricted_mv= 0; |
| 0 | 56 break; |
| 67 | 57 case CODEC_ID_MPEG4: |
|
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1644
diff
changeset
|
58 s->decode_mb= ff_mpeg4_decode_mb; |
| 0 | 59 s->time_increment_bits = 4; /* default value for broken headers */ |
| 60 s->h263_pred = 1; | |
| 924 | 61 s->low_delay = 0; //default, might be overriden in the vol header during header parsing |
| 0 | 62 break; |
| 307 | 63 case CODEC_ID_MSMPEG4V1: |
| 0 | 64 s->h263_msmpeg4 = 1; |
| 65 s->h263_pred = 1; | |
| 307 | 66 s->msmpeg4_version=1; |
| 67 break; | |
| 68 case CODEC_ID_MSMPEG4V2: | |
| 69 s->h263_msmpeg4 = 1; | |
| 70 s->h263_pred = 1; | |
| 71 s->msmpeg4_version=2; | |
| 72 break; | |
| 73 case CODEC_ID_MSMPEG4V3: | |
| 74 s->h263_msmpeg4 = 1; | |
| 75 s->h263_pred = 1; | |
| 76 s->msmpeg4_version=3; | |
| 0 | 77 break; |
| 311 | 78 case CODEC_ID_WMV1: |
| 79 s->h263_msmpeg4 = 1; | |
| 80 s->h263_pred = 1; | |
| 81 s->msmpeg4_version=4; | |
| 82 break; | |
| 498 | 83 case CODEC_ID_WMV2: |
| 84 s->h263_msmpeg4 = 1; | |
| 85 s->h263_pred = 1; | |
| 86 s->msmpeg4_version=5; | |
| 87 break; | |
| 2474 | 88 case CODEC_ID_WMV3: |
| 89 s->h263_msmpeg4 = 1; | |
| 90 s->h263_pred = 1; | |
| 91 s->msmpeg4_version=6; | |
| 92 break; | |
| 0 | 93 case CODEC_ID_H263I: |
| 94 break; | |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
95 case CODEC_ID_FLV1: |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
96 s->h263_flv = 1; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
97 break; |
| 0 | 98 default: |
| 99 return -1; | |
| 100 } | |
| 344 | 101 s->codec_id= avctx->codec->id; |
| 553 | 102 |
| 0 | 103 /* for h263, we allocate the images after having read the header */ |
|
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
104 if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4) |
| 144 | 105 if (MPV_common_init(s) < 0) |
| 106 return -1; | |
| 0 | 107 |
| 108 if (s->h263_msmpeg4) | |
| 498 | 109 ff_msmpeg4_decode_init(s); |
| 0 | 110 else |
| 111 h263_decode_init_vlc(s); | |
| 2967 | 112 |
| 0 | 113 return 0; |
| 114 } | |
| 115 | |
| 936 | 116 int ff_h263_decode_end(AVCodecContext *avctx) |
| 0 | 117 { |
| 118 MpegEncContext *s = avctx->priv_data; | |
| 119 | |
| 120 MPV_common_end(s); | |
| 121 return 0; | |
| 122 } | |
| 123 | |
| 655 | 124 /** |
| 2764 | 125 * returns the number of bytes consumed for building the current frame |
| 655 | 126 */ |
| 127 static int get_consumed_bytes(MpegEncContext *s, int buf_size){ | |
| 128 int pos= (get_bits_count(&s->gb)+7)>>3; | |
| 2967 | 129 |
|
1145
79e8ed620b17
better non conformant divx packed bitstream detection, so unpacked (no b frames) divx MPEG4-ES streams can be read
michaelni
parents:
1144
diff
changeset
|
130 if(s->divx_packed){ |
| 655 | 131 //we would have to scan through the whole buf to handle the weird reordering ... |
| 2967 | 132 return buf_size; |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
133 }else if(s->flags&CODEC_FLAG_TRUNCATED){ |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
134 pos -= s->parse_context.last_index; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
135 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
|
136 return pos; |
| 655 | 137 }else{ |
| 138 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...) | |
| 658 | 139 if(pos+10>buf_size) pos=buf_size; // oops ;) |
| 655 | 140 |
| 141 return pos; | |
| 142 } | |
| 143 } | |
| 144 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
145 static int decode_slice(MpegEncContext *s){ |
| 1144 | 146 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; |
| 2261 | 147 const int mb_size= 16>>s->avctx->lowres; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
148 s->last_resync_gb= s->gb; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
149 s->first_slice_line= 1; |
| 2967 | 150 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
151 s->resync_mb_x= s->mb_x; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
152 s->resync_mb_y= s->mb_y; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
153 |
| 1652 | 154 ff_set_qscale(s, s->qscale); |
| 2967 | 155 |
|
745
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) |
| 2967 | 161 return -1; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
162 } |
| 2967 | 163 |
| 1427 | 164 /* restore variables which were modified */ |
|
745
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; |
| 1652 | 168 ff_set_qscale(s, qscale); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
169 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
170 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
171 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
|
172 /* per-row end of slice checks */ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
173 if(s->msmpeg4_version){ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
174 if(s->resync_mb_y + s->slice_height == s->mb_y){ |
| 1144 | 175 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END); |
| 176 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
177 return 0; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
178 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
179 } |
| 2967 | 180 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
181 if(s->msmpeg4_version==1){ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
182 s->last_dc[0]= |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
183 s->last_dc[1]= |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
184 s->last_dc[2]= 128; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
185 } |
| 2967 | 186 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
187 ff_init_block_index(s); |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
188 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
|
189 int ret; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
190 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
191 ff_update_block_index(s); |
|
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 if(s->resync_mb_x == s->mb_x && s->resync_mb_y+1 == s->mb_y){ |
| 2967 | 194 s->first_slice_line=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 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
197 /* DCT & quantize */ |
| 2967 | 198 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
199 s->mv_dir = MV_DIR_FORWARD; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
200 s->mv_type = MV_TYPE_16X16; |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2552
diff
changeset
|
201 // s->mb_skipped = 0; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
202 //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
|
203 ret= s->decode_mb(s, s->block); |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
204 |
| 1389 | 205 if (s->pict_type!=B_TYPE) |
| 206 ff_h263_update_motion_val(s); | |
| 207 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
208 if(ret<0){ |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1175
diff
changeset
|
209 const int xy= s->mb_x + s->mb_y*s->mb_stride; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
210 if(ret==SLICE_END){ |
| 1338 | 211 MPV_decode_mb(s, s->block); |
| 1644 | 212 if(s->loop_filter) |
| 213 ff_h263_loop_filter(s); | |
| 1338 | 214 |
| 758 | 215 //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)); |
| 1144 | 216 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); |
| 750 | 217 |
| 218 s->padding_bug_score--; | |
| 2967 | 219 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
220 if(++s->mb_x >= s->mb_width){ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
221 s->mb_x=0; |
| 2261 | 222 ff_draw_horiz_band(s, s->mb_y*mb_size, mb_size); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
223 s->mb_y++; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
224 } |
| 2967 | 225 return 0; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
226 }else if(ret==SLICE_NOEND){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
227 av_log(s->avctx, AV_LOG_ERROR, "Slice mismatch at MB: %d\n", xy); |
| 1144 | 228 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x+1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); |
|
745
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 } |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
231 av_log(s->avctx, AV_LOG_ERROR, "Error at MB: %d\n", xy); |
| 1144 | 232 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask); |
| 2967 | 233 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
234 return -1; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
235 } |
| 1338 | 236 |
| 237 MPV_decode_mb(s, s->block); | |
| 1644 | 238 if(s->loop_filter) |
| 239 ff_h263_loop_filter(s); | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
240 } |
| 2967 | 241 |
| 2261 | 242 ff_draw_horiz_band(s, s->mb_y*mb_size, mb_size); |
| 2967 | 243 |
|
745
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 } |
| 2967 | 246 |
|
745
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 | |
| 2967 | 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){ |
| 2967 | 256 |
| 750 | 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; |
| 2967 | 259 |
| 1003 | 260 if(bits_left==0){ |
| 261 s->padding_bug_score+=16; | |
| 824 | 262 } else if(bits_left != 1){ |
| 750 | 263 int v= show_bits(&s->gb, 8); |
| 264 v|= 0x7F >> (7-(bits_count&7)); | |
| 824 | 265 |
| 2350 | 266 if(v==0x7F && bits_left<=8) |
| 750 | 267 s->padding_bug_score--; |
| 2350 | 268 else if(v==0x7F && ((get_bits_count(&s->gb)+8)&8) && bits_left<=16) |
| 269 s->padding_bug_score+= 4; | |
| 750 | 270 else |
| 2967 | 271 s->padding_bug_score++; |
| 272 } | |
| 750 | 273 } |
| 2967 | 274 |
| 2350 | 275 if(s->workaround_bugs&FF_BUG_AUTODETECT){ |
|
2411
0427eb3579b6
fix decoding of http://mplayerhq.hu/~diego/problem.mov
michael
parents:
2350
diff
changeset
|
276 if(s->padding_bug_score > -2 && !s->data_partitioning /*&& (s->divx_version || !s->resync_marker)*/) |
| 2350 | 277 s->workaround_bugs |= FF_BUG_NO_PADDING; |
| 278 else | |
| 279 s->workaround_bugs &= ~FF_BUG_NO_PADDING; | |
| 280 } | |
| 750 | 281 |
| 2764 | 282 // handle formats which don't have unique end markers |
| 1004 | 283 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
|
284 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
|
285 int max_extra=7; |
| 2967 | 286 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
287 /* no markers in M$ crap */ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
288 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
|
289 max_extra+= 17; |
| 2967 | 290 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
291 /* buggy padding but the frame should still end approximately at the bitstream end */ |
| 1004 | 292 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
|
293 max_extra+= 48; |
| 1004 | 294 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
|
295 max_extra+= 256*256*256*64; |
| 2967 | 296 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
297 if(left>max_extra){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
298 av_log(s->avctx, AV_LOG_ERROR, "discarding %d junk bits at end, next would be %X\n", left, show_bits(&s->gb, 24)); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
299 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
300 else if(left<0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
301 av_log(s->avctx, AV_LOG_ERROR, "overreading %d bits\n", -left); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
302 }else |
| 1144 | 303 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END); |
| 2967 | 304 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
305 return 0; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
306 } |
| 750 | 307 |
| 2967 | 308 av_log(s->avctx, AV_LOG_ERROR, "slice end not reached but screenspace end (%d left %06X, score= %d)\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
|
309 s->gb.size_in_bits - get_bits_count(&s->gb), |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
310 show_bits(&s->gb, 24), s->padding_bug_score); |
| 2967 | 311 |
| 1144 | 312 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); |
| 313 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
314 return -1; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
315 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
316 |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
317 /** |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
318 * finds the end of the current frame in the bitstream. |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
319 * @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
|
320 */ |
| 1988 | 321 int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){ |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
322 int vop_found, i; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
323 uint32_t state; |
| 2967 | 324 |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
325 vop_found= pc->frame_start_found; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
326 state= pc->state; |
| 2967 | 327 |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
328 i=0; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
329 if(!vop_found){ |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
330 for(i=0; i<buf_size; i++){ |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
331 state= (state<<8) | buf[i]; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
332 if(state == 0x1B6){ |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
333 i++; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
334 vop_found=1; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
335 break; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
336 } |
|
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 } |
| 1211 | 339 |
| 1988 | 340 if(vop_found){ |
| 341 /* EOF considered as end of frame */ | |
| 342 if (buf_size == 0) | |
| 343 return 0; | |
| 344 for(; i<buf_size; i++){ | |
| 345 state= (state<<8) | buf[i]; | |
| 346 if((state&0xFFFFFF00) == 0x100){ | |
| 347 pc->frame_start_found=0; | |
| 2967 | 348 pc->state=-1; |
| 1988 | 349 return i-3; |
| 350 } | |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
351 } |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
352 } |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
353 pc->frame_start_found= vop_found; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
354 pc->state= state; |
| 1219 | 355 return END_NOT_FOUND; |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
356 } |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
357 |
| 1988 | 358 static int h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){ |
|
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
359 int vop_found, i; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
360 uint32_t state; |
| 2967 | 361 |
|
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
362 vop_found= pc->frame_start_found; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
363 state= pc->state; |
| 2967 | 364 |
|
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
365 i=0; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
366 if(!vop_found){ |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
367 for(i=0; i<buf_size; i++){ |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
368 state= (state<<8) | buf[i]; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
369 if(state>>(32-22) == 0x20){ |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
370 i++; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
371 vop_found=1; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
372 break; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
373 } |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
374 } |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
375 } |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
376 |
| 2967 | 377 if(vop_found){ |
|
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
378 for(; i<buf_size; i++){ |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
379 state= (state<<8) | buf[i]; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
380 if(state>>(32-22) == 0x20){ |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
381 pc->frame_start_found=0; |
| 2967 | 382 pc->state=-1; |
|
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
383 return i-3; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
384 } |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
385 } |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
386 } |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
387 pc->frame_start_found= vop_found; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
388 pc->state= state; |
| 2967 | 389 |
|
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
390 return END_NOT_FOUND; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
391 } |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
392 |
| 1988 | 393 static int h263_parse(AVCodecParserContext *s, |
| 394 AVCodecContext *avctx, | |
| 2967 | 395 uint8_t **poutbuf, int *poutbuf_size, |
| 1988 | 396 const uint8_t *buf, int buf_size) |
| 397 { | |
| 398 ParseContext *pc = s->priv_data; | |
| 399 int next; | |
| 2967 | 400 |
| 1988 | 401 next= h263_find_frame_end(pc, buf, buf_size); |
| 402 | |
| 403 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { | |
| 404 *poutbuf = NULL; | |
| 405 *poutbuf_size = 0; | |
| 406 return buf_size; | |
| 407 } | |
| 408 | |
| 409 *poutbuf = (uint8_t *)buf; | |
| 410 *poutbuf_size = buf_size; | |
| 411 return next; | |
| 412 } | |
| 413 | |
| 2967 | 414 int ff_h263_decode_frame(AVCodecContext *avctx, |
| 0 | 415 void *data, int *data_size, |
| 1064 | 416 uint8_t *buf, int buf_size) |
| 0 | 417 { |
| 418 MpegEncContext *s = avctx->priv_data; | |
| 1453 | 419 int ret; |
| 2967 | 420 AVFrame *pict = data; |
| 421 | |
| 384 | 422 #ifdef PRINT_FRAME_TIME |
| 423 uint64_t time= rdtsc(); | |
| 424 #endif | |
| 0 | 425 #ifdef DEBUG |
| 426 printf("*****frame %d size=%d\n", avctx->frame_number, buf_size); | |
| 427 printf("bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]); | |
| 428 #endif | |
| 485 | 429 s->flags= avctx->flags; |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1747
diff
changeset
|
430 s->flags2= avctx->flags2; |
| 454 | 431 |
| 1372 | 432 /* no supplementary picture */ |
| 0 | 433 if (buf_size == 0) { |
| 1372 | 434 /* special case for last picture */ |
| 435 if (s->low_delay==0 && s->next_picture_ptr) { | |
| 436 *pict= *(AVFrame*)s->next_picture_ptr; | |
| 437 s->next_picture_ptr= NULL; | |
| 438 | |
| 439 *data_size = sizeof(AVFrame); | |
| 440 } | |
| 441 | |
| 0 | 442 return 0; |
| 443 } | |
| 1026 | 444 |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
445 if(s->flags&CODEC_FLAG_TRUNCATED){ |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
446 int next; |
| 2967 | 447 |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
448 if(s->codec_id==CODEC_ID_MPEG4){ |
| 1988 | 449 next= ff_mpeg4_find_frame_end(&s->parse_context, buf, buf_size); |
|
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
450 }else if(s->codec_id==CODEC_ID_H263){ |
| 1988 | 451 next= h263_find_frame_end(&s->parse_context, buf, buf_size); |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
452 }else{ |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2552
diff
changeset
|
453 av_log(s->avctx, AV_LOG_ERROR, "this codec does not support truncated bitstreams\n"); |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
454 return -1; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
455 } |
| 2967 | 456 |
| 1988 | 457 if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 ) |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
458 return buf_size; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
459 } |
| 0 | 460 |
| 2967 | 461 |
| 763 | 462 retry: |
| 2967 | 463 |
| 1747 | 464 if(s->bitstream_buffer_size && (s->divx_packed || buf_size<20)){ //divx 5.01+/xvid 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
|
465 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size*8); |
| 353 | 466 }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
|
467 init_get_bits(&s->gb, buf, buf_size*8); |
| 465 | 468 s->bitstream_buffer_size=0; |
| 0 | 469 |
| 718 | 470 if (!s->context_initialized) { |
|
752
97077dd24bfa
fixing alt_scan for the first frame (variable was reset)
michaelni
parents:
750
diff
changeset
|
471 if (MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix |
| 718 | 472 return -1; |
| 473 } | |
| 2967 | 474 |
| 1586 | 475 //we need to set current_picture_ptr before reading the header, otherwise we cant store anyting im there |
| 476 if(s->current_picture_ptr==NULL || s->current_picture_ptr->data[0]){ | |
| 477 int i= ff_find_unused_picture(s, 0); | |
| 478 s->current_picture_ptr= &s->picture[i]; | |
| 479 } | |
| 2967 | 480 |
| 0 | 481 /* let's go :-) */ |
| 936 | 482 if (s->msmpeg4_version==5) { |
| 483 ret= ff_wmv2_decode_picture_header(s); | |
| 484 } else if (s->msmpeg4_version) { | |
| 0 | 485 ret = msmpeg4_decode_picture_header(s); |
| 486 } 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
|
487 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
|
488 GetBitContext gb; |
| 2967 | 489 |
|
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
|
490 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
|
491 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
|
492 } |
|
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
493 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
|
494 |
| 831 | 495 if(s->flags& CODEC_FLAG_LOW_DELAY) |
| 496 s->low_delay=1; | |
| 1687 | 497 } else if (s->codec_id == CODEC_ID_H263I) { |
| 0 | 498 ret = intel_h263_decode_picture_header(s); |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
499 } else if (s->h263_flv) { |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
500 ret = flv_h263_decode_picture_header(s); |
| 0 | 501 } else { |
| 502 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
|
503 } |
| 2967 | 504 |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2552
diff
changeset
|
505 if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_size); |
| 1393 | 506 |
| 507 /* skip if the header was thrashed */ | |
| 508 if (ret < 0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
509 av_log(s->avctx, AV_LOG_ERROR, "header damaged\n"); |
| 1393 | 510 return -1; |
| 511 } | |
| 2967 | 512 |
| 924 | 513 avctx->has_b_frames= !s->low_delay; |
| 2967 | 514 |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
515 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ |
| 2967 | 516 if(s->avctx->stream_codec_tag == ff_get_fourcc("XVID") || |
| 3131 | 517 s->avctx->codec_tag == ff_get_fourcc("XVID") || s->avctx->codec_tag == ff_get_fourcc("XVIX") || |
| 518 s->avctx->codec_tag == ff_get_fourcc("RMP4")) | |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
519 s->xvid_build= -1; |
|
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
520 #if 0 |
| 1457 | 521 if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==1 |
| 2967 | 522 && s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc |
| 1457 | 523 s->xvid_build= -1; |
|
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
524 #endif |
|
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
525 } |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
526 |
|
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
527 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
528 if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==0) |
|
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
529 s->divx_version= 400; //divx 4 |
|
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
530 } |
| 2967 | 531 |
| 2299 | 532 if(s->xvid_build && s->divx_version){ |
| 533 s->divx_version= | |
| 534 s->divx_build= 0; | |
| 535 } | |
|
745
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 if(s->workaround_bugs&FF_BUG_AUTODETECT){ |
| 2967 | 538 if(s->avctx->codec_tag == ff_get_fourcc("XVIX")) |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
539 s->workaround_bugs|= FF_BUG_XVID_ILACE; |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
540 |
| 1116 | 541 if(s->avctx->codec_tag == ff_get_fourcc("UMP4")){ |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
542 s->workaround_bugs|= FF_BUG_UMP4; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
543 } |
| 760 | 544 |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
545 if(s->divx_version>=500){ |
| 760 | 546 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; |
| 547 } | |
| 761 | 548 |
| 1048 | 549 if(s->divx_version>502){ |
| 550 s->workaround_bugs|= FF_BUG_QPEL_CHROMA2; | |
| 551 } | |
| 552 | |
|
938
1e22655551b9
xvid build 3 still has the padding wrong in 1/8 of the cases :(((((
michaelni
parents:
936
diff
changeset
|
553 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
|
554 s->padding_bug_score= 256*256*256*64; |
| 2967 | 555 |
| 761 | 556 if(s->xvid_build && s->xvid_build<=1) |
| 557 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; | |
| 558 | |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
559 if(s->xvid_build && s->xvid_build<=12) |
|
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
560 s->workaround_bugs|= FF_BUG_EDGE; |
|
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
561 |
| 2004 | 562 if(s->xvid_build && s->xvid_build<=32) |
| 563 s->workaround_bugs|= FF_BUG_DC_CLIP; | |
| 564 | |
| 984 | 565 #define SET_QPEL_FUNC(postfix1, postfix2) \ |
| 566 s->dsp.put_ ## postfix1 = ff_put_ ## postfix2;\ | |
| 567 s->dsp.put_no_rnd_ ## postfix1 = ff_put_no_rnd_ ## postfix2;\ | |
| 568 s->dsp.avg_ ## postfix1 = ff_avg_ ## postfix2; | |
| 569 | |
| 570 if(s->lavc_build && s->lavc_build<4653) | |
| 571 s->workaround_bugs|= FF_BUG_STD_QPEL; | |
| 2967 | 572 |
|
1053
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
573 if(s->lavc_build && s->lavc_build<4655) |
|
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
574 s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE; |
|
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
575 |
| 1502 | 576 if(s->lavc_build && s->lavc_build<4670){ |
|
1366
80067f8d6770
fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
michaelni
parents:
1353
diff
changeset
|
577 s->workaround_bugs|= FF_BUG_EDGE; |
|
80067f8d6770
fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
michaelni
parents:
1353
diff
changeset
|
578 } |
| 2967 | 579 |
| 2004 | 580 if(s->lavc_build && s->lavc_build<=4712) |
| 581 s->workaround_bugs|= FF_BUG_DC_CLIP; | |
|
1366
80067f8d6770
fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
michaelni
parents:
1353
diff
changeset
|
582 |
|
1053
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
583 if(s->divx_version) |
|
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
584 s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE; |
| 750 | 585 //printf("padding_bug_score: %d\n", s->padding_bug_score); |
|
1088
bb27c685fc72
fixing padding bug autodetection for some rare files, closes bug #647941
michaelni
parents:
1064
diff
changeset
|
586 if(s->divx_version==501 && s->divx_build==20020416) |
|
bb27c685fc72
fixing padding bug autodetection for some rare files, closes bug #647941
michaelni
parents:
1064
diff
changeset
|
587 s->padding_bug_score= 256*256*256*64; |
| 1137 | 588 |
|
1366
80067f8d6770
fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
michaelni
parents:
1353
diff
changeset
|
589 if(s->divx_version && s->divx_version<500){ |
| 1137 | 590 s->workaround_bugs|= FF_BUG_EDGE; |
| 591 } | |
| 2967 | 592 |
| 1916 | 593 if(s->divx_version) |
| 594 s->workaround_bugs|= FF_BUG_HPEL_CHROMA; | |
| 750 | 595 #if 0 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
596 if(s->divx_version==500) |
|
1088
bb27c685fc72
fixing padding bug autodetection for some rare files, closes bug #647941
michaelni
parents:
1064
diff
changeset
|
597 s->padding_bug_score= 256*256*256*64; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
598 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
599 /* 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
|
600 * lets hope this at least works |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
601 */ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
602 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
|
603 && 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
|
604 s->workaround_bugs|= FF_BUG_NO_PADDING; |
| 2967 | 605 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
606 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
|
607 s->workaround_bugs|= FF_BUG_NO_PADDING; |
| 750 | 608 #endif |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
609 } |
| 2967 | 610 |
| 984 | 611 if(s->workaround_bugs& FF_BUG_STD_QPEL){ |
| 612 SET_QPEL_FUNC(qpel_pixels_tab[0][ 5], qpel16_mc11_old_c) | |
| 613 SET_QPEL_FUNC(qpel_pixels_tab[0][ 7], qpel16_mc31_old_c) | |
| 614 SET_QPEL_FUNC(qpel_pixels_tab[0][ 9], qpel16_mc12_old_c) | |
| 615 SET_QPEL_FUNC(qpel_pixels_tab[0][11], qpel16_mc32_old_c) | |
| 616 SET_QPEL_FUNC(qpel_pixels_tab[0][13], qpel16_mc13_old_c) | |
| 617 SET_QPEL_FUNC(qpel_pixels_tab[0][15], qpel16_mc33_old_c) | |
| 618 | |
| 619 SET_QPEL_FUNC(qpel_pixels_tab[1][ 5], qpel8_mc11_old_c) | |
| 620 SET_QPEL_FUNC(qpel_pixels_tab[1][ 7], qpel8_mc31_old_c) | |
| 621 SET_QPEL_FUNC(qpel_pixels_tab[1][ 9], qpel8_mc12_old_c) | |
| 622 SET_QPEL_FUNC(qpel_pixels_tab[1][11], qpel8_mc32_old_c) | |
| 623 SET_QPEL_FUNC(qpel_pixels_tab[1][13], qpel8_mc13_old_c) | |
| 624 SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_old_c) | |
| 625 } | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
626 |
| 1457 | 627 if(avctx->debug & FF_DEBUG_BUGS) |
| 2967 | 628 av_log(s->avctx, AV_LOG_DEBUG, "bugs: %X lavc_build:%d xvid_build:%d divx_version:%d divx_build:%d %s\n", |
| 1457 | 629 s->workaround_bugs, s->lavc_build, s->xvid_build, s->divx_version, s->divx_build, |
| 630 s->divx_packed ? "p" : ""); | |
| 2967 | 631 |
|
585
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
632 #if 0 // dump bits per frame / qp / complexity |
|
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
633 { |
|
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
634 static FILE *f=NULL; |
|
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
635 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
|
636 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
|
637 } |
|
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
638 #endif |
| 2096 | 639 |
| 2869 | 640 #if defined(HAVE_MMX) && defined(CONFIG_GPL) |
| 2977 | 641 if(s->codec_id == CODEC_ID_MPEG4 && s->xvid_build && avctx->idct_algo == FF_IDCT_AUTO && (mm_flags & MM_MMX)){ |
| 2869 | 642 avctx->idct_algo= FF_IDCT_XVIDMMX; |
| 2278 | 643 avctx->coded_width= 0; // force reinit |
|
2968
383eee00b898
fix custom matrix permutation if xvid idct is autoselected and you have bad luck
michael
parents:
2967
diff
changeset
|
644 // dsputil_init(&s->dsp, avctx); |
|
383eee00b898
fix custom matrix permutation if xvid idct is autoselected and you have bad luck
michael
parents:
2967
diff
changeset
|
645 s->picture_number=0; |
|
2094
9c29987380e4
use libmpeg2 idct to decode xvid videos unless the user forced some other idct
michael
parents:
2052
diff
changeset
|
646 } |
| 2096 | 647 #endif |
| 648 | |
|
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
649 /* After H263 & mpeg4 header decode we have the height, width,*/ |
| 160 | 650 /* and other parameters. So then we could init the picture */ |
| 651 /* FIXME: By the way H263 decoder is evolving it should have */ | |
| 652 /* an H263EncContext */ | |
| 2967 | 653 |
| 654 if ( s->width != avctx->coded_width | |
| 2270 | 655 || s->height != avctx->coded_height) { |
| 553 | 656 /* H.263 could change picture size any time */ |
| 1536 | 657 ParseContext pc= s->parse_context; //FIXME move these demuxng hack to avformat |
| 658 s->parse_context.buffer=0; | |
| 553 | 659 MPV_common_end(s); |
| 1536 | 660 s->parse_context= pc; |
| 553 | 661 } |
|
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
662 if (!s->context_initialized) { |
| 2270 | 663 avcodec_set_dimensions(avctx, s->width, s->height); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
664 |
| 763 | 665 goto retry; |
| 0 | 666 } |
| 758 | 667 |
| 668 if((s->codec_id==CODEC_ID_H263 || s->codec_id==CODEC_ID_H263P)) | |
| 669 s->gob_index = ff_h263_get_gob_height(s); | |
| 2967 | 670 |
| 903 | 671 // for hurry_up==5 |
| 672 s->current_picture.pict_type= s->pict_type; | |
| 673 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
|
674 |
| 2764 | 675 /* skip B-frames if we don't have reference frames */ |
| 2052 | 676 if(s->last_picture_ptr==NULL && (s->pict_type==B_TYPE || s->dropable)) return get_consumed_bytes(s, buf_size); |
| 345 | 677 /* 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
|
678 if(avctx->hurry_up && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size); |
| 2792 | 679 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==B_TYPE) |
| 680 || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=I_TYPE) | |
| 2967 | 681 || avctx->skip_frame >= AVDISCARD_ALL) |
| 2792 | 682 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
|
683 /* 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
|
684 if(avctx->hurry_up>=5) return get_consumed_bytes(s, buf_size); |
| 2967 | 685 |
| 454 | 686 if(s->next_p_frame_damaged){ |
| 687 if(s->pict_type==B_TYPE) | |
| 655 | 688 return get_consumed_bytes(s, buf_size); |
| 454 | 689 else |
| 690 s->next_p_frame_damaged=0; | |
| 691 } | |
| 692 | |
|
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
763
diff
changeset
|
693 if(MPV_frame_start(s, avctx) < 0) |
|
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
763
diff
changeset
|
694 return -1; |
| 0 | 695 |
| 696 #ifdef DEBUG | |
| 3177 | 697 av_log(avctx, AV_LOG_DEBUG, "qscale=%d\n", s->qscale); |
| 0 | 698 #endif |
| 699 | |
| 1144 | 700 ff_er_frame_start(s); |
| 2967 | 701 |
| 1183 | 702 //the second part of the wmv2 header contains the MB skip bits which are stored in current_picture->mb_type |
| 703 //which isnt available before MPV_frame_start() | |
| 704 if (s->msmpeg4_version==5){ | |
| 705 if(ff_wmv2_decode_secondary_picture_header(s) < 0) | |
| 706 return -1; | |
| 707 } | |
| 708 | |
| 0 | 709 /* decode each macroblock */ |
| 2967 | 710 s->mb_x=0; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
711 s->mb_y=0; |
| 2967 | 712 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
713 decode_slice(s); |
| 1183 | 714 while(s->mb_y<s->mb_height){ |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
715 if(s->msmpeg4_version){ |
| 1183 | 716 if(s->mb_x!=0 || (s->mb_y%s->slice_height)!=0 || get_bits_count(&s->gb) > s->gb.size_in_bits) |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
717 break; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
718 }else{ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
719 if(ff_h263_resync(s)<0) |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
720 break; |
| 454 | 721 } |
| 2967 | 722 |
| 983 | 723 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
|
724 ff_mpeg4_clean_buffers(s); |
| 454 | 725 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
726 decode_slice(s); |
| 0 | 727 } |
| 756 | 728 |
| 311 | 729 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==I_TYPE) |
| 903 | 730 if(msmpeg4_decode_ext_header(s, buf_size) < 0){ |
| 731 s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR; | |
| 732 } | |
| 2967 | 733 |
| 333 | 734 /* divx 5.01+ bistream reorder stuff */ |
|
1145
79e8ed620b17
better non conformant divx packed bitstream detection, so unpacked (no b frames) divx MPEG4-ES streams can be read
michaelni
parents:
1144
diff
changeset
|
735 if(s->codec_id==CODEC_ID_MPEG4 && s->bitstream_buffer_size==0 && s->divx_packed){ |
| 454 | 736 int current_pos= get_bits_count(&s->gb)>>3; |
| 1747 | 737 int startcode_found=0; |
| 2967 | 738 |
| 2422 | 739 if(buf_size - current_pos > 5){ |
| 454 | 740 int i; |
| 655 | 741 for(i=current_pos; i<buf_size-3; i++){ |
| 454 | 742 if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1 && buf[i+3]==0xB6){ |
| 743 startcode_found=1; | |
| 744 break; | |
| 745 } | |
| 746 } | |
| 1747 | 747 } |
| 748 if(s->gb.buffer == s->bitstream_buffer && buf_size>20){ //xvid style | |
| 749 startcode_found=1; | |
| 750 current_pos=0; | |
| 751 } | |
| 752 | |
| 753 if(startcode_found){ | |
| 2422 | 754 s->bitstream_buffer= av_fast_realloc( |
| 2967 | 755 s->bitstream_buffer, |
| 756 &s->allocated_bitstream_buffer_size, | |
| 2422 | 757 buf_size - current_pos + FF_INPUT_BUFFER_PADDING_SIZE); |
| 1747 | 758 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos); |
| 759 s->bitstream_buffer_size= buf_size - current_pos; | |
| 454 | 760 } |
| 761 } | |
| 762 | |
| 1144 | 763 ff_er_frame_end(s); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
764 |
| 0 | 765 MPV_frame_end(s); |
| 984 | 766 |
| 1285 | 767 assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type); |
| 768 assert(s->current_picture.pict_type == s->pict_type); | |
| 924 | 769 if(s->pict_type==B_TYPE || s->low_delay){ |
| 925 | 770 *pict= *(AVFrame*)&s->current_picture; |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1687
diff
changeset
|
771 ff_print_debug_info(s, pict); |
| 262 | 772 } else { |
| 925 | 773 *pict= *(AVFrame*)&s->last_picture; |
| 1939 | 774 if(pict) |
| 775 ff_print_debug_info(s, pict); | |
| 262 | 776 } |
| 931 | 777 |
| 231 | 778 /* Return the Picture timestamp as the frame number */ |
| 779 /* we substract 1 because it is added on utils.c */ | |
| 780 avctx->frame_number = s->picture_number - 1; | |
| 781 | |
| 2764 | 782 /* don't output the last pic after seeking */ |
| 1138 | 783 if(s->last_picture_ptr || s->low_delay) |
| 925 | 784 *data_size = sizeof(AVFrame); |
| 384 | 785 #ifdef PRINT_FRAME_TIME |
| 3177 | 786 av_log(avctx, AV_LOG_DEBUG, "%Ld\n", rdtsc()-time); |
| 384 | 787 #endif |
|
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
788 |
| 655 | 789 return get_consumed_bytes(s, buf_size); |
| 0 | 790 } |
| 791 | |
| 67 | 792 AVCodec mpeg4_decoder = { |
| 793 "mpeg4", | |
| 0 | 794 CODEC_TYPE_VIDEO, |
| 67 | 795 CODEC_ID_MPEG4, |
| 0 | 796 sizeof(MpegEncContext), |
| 936 | 797 ff_h263_decode_init, |
| 0 | 798 NULL, |
| 936 | 799 ff_h263_decode_end, |
| 800 ff_h263_decode_frame, | |
| 2453 | 801 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
| 1368 | 802 .flush= ff_mpeg_flush, |
| 0 | 803 }; |
| 804 | |
| 805 AVCodec h263_decoder = { | |
| 806 "h263", | |
| 807 CODEC_TYPE_VIDEO, | |
| 808 CODEC_ID_H263, | |
| 809 sizeof(MpegEncContext), | |
| 936 | 810 ff_h263_decode_init, |
| 0 | 811 NULL, |
| 936 | 812 ff_h263_decode_end, |
| 813 ff_h263_decode_frame, | |
| 2453 | 814 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
| 1368 | 815 .flush= ff_mpeg_flush, |
| 0 | 816 }; |
| 817 | |
| 307 | 818 AVCodec msmpeg4v1_decoder = { |
| 819 "msmpeg4v1", | |
| 820 CODEC_TYPE_VIDEO, | |
| 821 CODEC_ID_MSMPEG4V1, | |
| 822 sizeof(MpegEncContext), | |
| 936 | 823 ff_h263_decode_init, |
| 307 | 824 NULL, |
| 936 | 825 ff_h263_decode_end, |
| 826 ff_h263_decode_frame, | |
| 553 | 827 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
| 307 | 828 }; |
| 829 | |
| 830 AVCodec msmpeg4v2_decoder = { | |
| 831 "msmpeg4v2", | |
| 832 CODEC_TYPE_VIDEO, | |
| 833 CODEC_ID_MSMPEG4V2, | |
| 834 sizeof(MpegEncContext), | |
| 936 | 835 ff_h263_decode_init, |
| 307 | 836 NULL, |
| 936 | 837 ff_h263_decode_end, |
| 838 ff_h263_decode_frame, | |
| 553 | 839 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
| 307 | 840 }; |
| 841 | |
| 842 AVCodec msmpeg4v3_decoder = { | |
| 0 | 843 "msmpeg4", |
| 844 CODEC_TYPE_VIDEO, | |
| 307 | 845 CODEC_ID_MSMPEG4V3, |
| 0 | 846 sizeof(MpegEncContext), |
| 936 | 847 ff_h263_decode_init, |
| 0 | 848 NULL, |
| 936 | 849 ff_h263_decode_end, |
| 850 ff_h263_decode_frame, | |
| 553 | 851 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
| 0 | 852 }; |
| 853 | |
| 311 | 854 AVCodec wmv1_decoder = { |
| 855 "wmv1", | |
| 856 CODEC_TYPE_VIDEO, | |
| 857 CODEC_ID_WMV1, | |
| 858 sizeof(MpegEncContext), | |
| 936 | 859 ff_h263_decode_init, |
| 311 | 860 NULL, |
| 936 | 861 ff_h263_decode_end, |
| 862 ff_h263_decode_frame, | |
| 553 | 863 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
| 498 | 864 }; |
| 865 | |
| 0 | 866 AVCodec h263i_decoder = { |
| 867 "h263i", | |
| 868 CODEC_TYPE_VIDEO, | |
| 869 CODEC_ID_H263I, | |
| 870 sizeof(MpegEncContext), | |
| 936 | 871 ff_h263_decode_init, |
| 0 | 872 NULL, |
| 936 | 873 ff_h263_decode_end, |
| 874 ff_h263_decode_frame, | |
| 553 | 875 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
| 0 | 876 }; |
| 877 | |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
878 AVCodec flv_decoder = { |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
879 "flv", |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
880 CODEC_TYPE_VIDEO, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
881 CODEC_ID_FLV1, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
882 sizeof(MpegEncContext), |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
883 ff_h263_decode_init, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
884 NULL, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
885 ff_h263_decode_end, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
886 ff_h263_decode_frame, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
887 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
888 }; |
| 1988 | 889 |
| 890 AVCodecParser h263_parser = { | |
| 891 { CODEC_ID_H263 }, | |
| 892 sizeof(ParseContext), | |
| 893 NULL, | |
| 894 h263_parse, | |
| 895 ff_parse_close, | |
| 896 }; |
