Mercurial > libavcodec.hg
annotate h263dec.c @ 1747:8cfd36bfe504 libavcodec
xvid "packed" stuff support
| author | michael |
|---|---|
| date | Thu, 15 Jan 2004 01:29:26 +0000 |
| parents | 07a484280a82 |
| children | bdf3927bf8c5 |
| 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 | |
| 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 0 | 19 */ |
| 1106 | 20 |
| 21 /** | |
| 22 * @file h263dec.c | |
| 23 * H.263 decoder. | |
| 24 */ | |
| 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 | |
| 40 s->width = avctx->width; | |
| 41 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
|
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 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
45 s->quant_precision=5; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
46 s->progressive_sequence=1; |
|
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; | |
| 0 | 88 case CODEC_ID_H263I: |
| 89 break; | |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
90 case CODEC_ID_FLV1: |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
91 s->h263_flv = 1; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
92 break; |
| 0 | 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 |
|
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
|
125 if(s->divx_packed){ |
| 655 | 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){ |
| 1144 | 141 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
142 s->last_resync_gb= s->gb; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
143 s->first_slice_line= 1; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
144 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
145 s->resync_mb_x= s->mb_x; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
146 s->resync_mb_y= s->mb_y; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
147 |
| 1652 | 148 ff_set_qscale(s, s->qscale); |
|
745
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 |
| 1427 | 158 /* restore variables which were modified */ |
|
745
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; |
| 1652 | 162 ff_set_qscale(s, qscale); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
163 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
164 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
165 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
|
166 /* per-row end of slice checks */ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
167 if(s->msmpeg4_version){ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
168 if(s->resync_mb_y + s->slice_height == s->mb_y){ |
| 1144 | 169 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); |
| 170 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
171 return 0; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
172 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
173 } |
|
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 if(s->msmpeg4_version==1){ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
176 s->last_dc[0]= |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
177 s->last_dc[1]= |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
178 s->last_dc[2]= 128; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
179 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
180 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
181 ff_init_block_index(s); |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
182 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
|
183 int ret; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
184 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
185 ff_update_block_index(s); |
|
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 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
|
188 s->first_slice_line=0; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
189 } |
|
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 /* DCT & quantize */ |
|
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
845
diff
changeset
|
192 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
|
193 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
194 s->mv_dir = MV_DIR_FORWARD; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
195 s->mv_type = MV_TYPE_16X16; |
| 903 | 196 // s->mb_skiped = 0; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
197 //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
|
198 ret= s->decode_mb(s, s->block); |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
199 |
| 1389 | 200 if (s->pict_type!=B_TYPE) |
| 201 ff_h263_update_motion_val(s); | |
| 202 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
203 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
|
204 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
|
205 if(ret==SLICE_END){ |
| 1338 | 206 MPV_decode_mb(s, s->block); |
| 1644 | 207 if(s->loop_filter) |
| 208 ff_h263_loop_filter(s); | |
| 1338 | 209 |
| 758 | 210 //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 | 211 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 | 212 |
| 213 s->padding_bug_score--; | |
| 214 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
215 if(++s->mb_x >= s->mb_width){ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
216 s->mb_x=0; |
|
1098
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1088
diff
changeset
|
217 ff_draw_horiz_band(s, s->mb_y*16, 16); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
218 s->mb_y++; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
219 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
220 return 0; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
221 }else if(ret==SLICE_NOEND){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
222 av_log(s->avctx, AV_LOG_ERROR, "Slice mismatch at MB: %d\n", xy); |
| 1144 | 223 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
|
224 return -1; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
225 } |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
226 av_log(s->avctx, AV_LOG_ERROR, "Error at MB: %d\n", xy); |
| 1144 | 227 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); |
|
745
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 } |
| 1338 | 231 |
| 232 MPV_decode_mb(s, s->block); | |
| 1644 | 233 if(s->loop_filter) |
| 234 ff_h263_loop_filter(s); | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
235 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
236 |
|
1098
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1088
diff
changeset
|
237 ff_draw_horiz_band(s, s->mb_y*16, 16); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
238 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
239 s->mb_x= 0; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
240 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
241 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
242 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
|
243 |
| 750 | 244 /* try to detect the padding bug */ |
| 245 if( s->codec_id==CODEC_ID_MPEG4 | |
| 246 && (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
|
247 && 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
|
248 && 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
|
249 // && !s->resync_marker |
| 750 | 250 && !s->data_partitioning){ |
| 251 | |
| 252 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
|
253 const int bits_left = s->gb.size_in_bits - bits_count; |
| 750 | 254 |
| 1003 | 255 if(bits_left==0){ |
| 256 s->padding_bug_score+=16; | |
| 257 }else if(bits_left>8){ | |
| 750 | 258 s->padding_bug_score++; |
| 824 | 259 } else if(bits_left != 1){ |
| 750 | 260 int v= show_bits(&s->gb, 8); |
| 261 v|= 0x7F >> (7-(bits_count&7)); | |
| 824 | 262 |
| 750 | 263 if(v==0x7F) |
| 264 s->padding_bug_score--; | |
| 265 else | |
| 266 s->padding_bug_score++; | |
| 1003 | 267 } |
| 750 | 268 } |
| 269 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
270 // handle formats which dont have unique end markers |
| 1004 | 271 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
|
272 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
|
273 int max_extra=7; |
|
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 /* no markers in M$ crap */ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
276 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
|
277 max_extra+= 17; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
278 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
279 /* buggy padding but the frame should still end approximately at the bitstream end */ |
| 1004 | 280 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
|
281 max_extra+= 48; |
| 1004 | 282 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
|
283 max_extra+= 256*256*256*64; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
284 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
285 if(left>max_extra){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
286 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
|
287 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
288 else if(left<0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
289 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
|
290 }else |
| 1144 | 291 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); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
292 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
293 return 0; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
294 } |
| 750 | 295 |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
296 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
|
297 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
|
298 show_bits(&s->gb, 24), s->padding_bug_score); |
| 1144 | 299 |
| 300 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); | |
| 301 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
302 return -1; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
303 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
304 |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
305 /** |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
306 * finds the end of the current frame in the bitstream. |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
307 * @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
|
308 */ |
| 1064 | 309 static int mpeg4_find_frame_end(MpegEncContext *s, uint8_t *buf, int buf_size){ |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
310 ParseContext *pc= &s->parse_context; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
311 int vop_found, i; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
312 uint32_t state; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
313 |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
314 vop_found= pc->frame_start_found; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
315 state= pc->state; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
316 |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
317 i=0; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
318 if(!vop_found){ |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
319 for(i=0; i<buf_size; i++){ |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
320 state= (state<<8) | buf[i]; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
321 if(state == 0x1B6){ |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
322 i++; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
323 vop_found=1; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
324 break; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
325 } |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
326 } |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
327 } |
| 1211 | 328 |
| 329 if(vop_found){ | |
| 330 for(; i<buf_size; i++){ | |
|
842
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&0xFFFFFF00) == 0x100){ |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
333 pc->frame_start_found=0; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
334 pc->state=-1; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
335 return i-3; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
336 } |
| 1211 | 337 } |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
338 } |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
339 pc->frame_start_found= vop_found; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
340 pc->state= state; |
| 1219 | 341 return END_NOT_FOUND; |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
342 } |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
343 |
|
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
344 static int h263_find_frame_end(MpegEncContext *s, uint8_t *buf, int buf_size){ |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
345 ParseContext *pc= &s->parse_context; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
346 int vop_found, i; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
347 uint32_t state; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
348 |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
349 vop_found= pc->frame_start_found; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
350 state= pc->state; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
351 |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
352 i=0; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
353 if(!vop_found){ |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
354 for(i=0; i<buf_size; i++){ |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
355 state= (state<<8) | buf[i]; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
356 if(state>>(32-22) == 0x20){ |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
357 i++; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
358 vop_found=1; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
359 break; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
360 } |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
361 } |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
362 } |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
363 |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
364 if(vop_found){ |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
365 for(; i<buf_size; i++){ |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
366 state= (state<<8) | buf[i]; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
367 if(state>>(32-22) == 0x20){ |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
368 pc->frame_start_found=0; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
369 pc->state=-1; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
370 return i-3; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
371 } |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
372 } |
|
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 pc->frame_start_found= vop_found; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
375 pc->state= state; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
376 |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
377 return END_NOT_FOUND; |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
378 } |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
379 |
| 936 | 380 int ff_h263_decode_frame(AVCodecContext *avctx, |
| 0 | 381 void *data, int *data_size, |
| 1064 | 382 uint8_t *buf, int buf_size) |
| 0 | 383 { |
| 384 MpegEncContext *s = avctx->priv_data; | |
| 1453 | 385 int ret; |
| 925 | 386 AVFrame *pict = data; |
| 880 | 387 |
| 384 | 388 #ifdef PRINT_FRAME_TIME |
| 389 uint64_t time= rdtsc(); | |
| 390 #endif | |
| 0 | 391 #ifdef DEBUG |
| 392 printf("*****frame %d size=%d\n", avctx->frame_number, buf_size); | |
| 393 printf("bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]); | |
| 394 #endif | |
| 485 | 395 s->flags= avctx->flags; |
| 454 | 396 |
| 657 | 397 *data_size = 0; |
| 1372 | 398 |
| 399 /* no supplementary picture */ | |
| 0 | 400 if (buf_size == 0) { |
| 1372 | 401 /* special case for last picture */ |
| 402 if (s->low_delay==0 && s->next_picture_ptr) { | |
| 403 *pict= *(AVFrame*)s->next_picture_ptr; | |
| 404 s->next_picture_ptr= NULL; | |
| 405 | |
| 406 *data_size = sizeof(AVFrame); | |
| 407 } | |
| 408 | |
| 0 | 409 return 0; |
| 410 } | |
| 1026 | 411 |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
412 if(s->flags&CODEC_FLAG_TRUNCATED){ |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
413 int next; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
414 |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
415 if(s->codec_id==CODEC_ID_MPEG4){ |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
416 next= mpeg4_find_frame_end(s, buf, buf_size); |
|
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
417 }else if(s->codec_id==CODEC_ID_H263){ |
|
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
418 next= h263_find_frame_end(s, buf, buf_size); |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
419 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
420 av_log(s->avctx, AV_LOG_ERROR, "this codec doesnt support truncated bitstreams\n"); |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
421 return -1; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
422 } |
| 1026 | 423 |
| 424 if( ff_combine_frame(s, next, &buf, &buf_size) < 0 ) | |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
425 return buf_size; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
426 } |
| 0 | 427 |
| 1747 | 428 |
| 763 | 429 retry: |
| 430 | |
| 1747 | 431 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
|
432 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size*8); |
| 353 | 433 }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
|
434 init_get_bits(&s->gb, buf, buf_size*8); |
| 465 | 435 s->bitstream_buffer_size=0; |
| 0 | 436 |
| 718 | 437 if (!s->context_initialized) { |
|
752
97077dd24bfa
fixing alt_scan for the first frame (variable was reset)
michaelni
parents:
750
diff
changeset
|
438 if (MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix |
| 718 | 439 return -1; |
| 440 } | |
| 1586 | 441 |
| 442 //we need to set current_picture_ptr before reading the header, otherwise we cant store anyting im there | |
| 443 if(s->current_picture_ptr==NULL || s->current_picture_ptr->data[0]){ | |
| 444 int i= ff_find_unused_picture(s, 0); | |
| 445 s->current_picture_ptr= &s->picture[i]; | |
| 446 } | |
| 936 | 447 |
| 0 | 448 /* let's go :-) */ |
| 936 | 449 if (s->msmpeg4_version==5) { |
| 450 ret= ff_wmv2_decode_picture_header(s); | |
| 451 } else if (s->msmpeg4_version) { | |
| 0 | 452 ret = msmpeg4_decode_picture_header(s); |
| 453 } 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
|
454 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
|
455 GetBitContext gb; |
|
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
456 |
|
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
|
457 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
|
458 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
|
459 } |
|
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
460 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
|
461 |
| 831 | 462 if(s->flags& CODEC_FLAG_LOW_DELAY) |
| 463 s->low_delay=1; | |
| 1687 | 464 } else if (s->codec_id == CODEC_ID_H263I) { |
| 0 | 465 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
|
466 } else if (s->h263_flv) { |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
467 ret = flv_h263_decode_picture_header(s); |
| 0 | 468 } else { |
| 469 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
|
470 } |
| 1393 | 471 |
| 472 if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_size); | |
| 473 | |
| 474 /* skip if the header was thrashed */ | |
| 475 if (ret < 0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
476 av_log(s->avctx, AV_LOG_ERROR, "header damaged\n"); |
| 1393 | 477 return -1; |
| 478 } | |
| 479 | |
| 924 | 480 avctx->has_b_frames= !s->low_delay; |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
481 |
|
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
482 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ |
|
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
483 if(s->avctx->stream_codec_tag == ff_get_fourcc("XVID") || |
|
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
484 s->avctx->codec_tag == ff_get_fourcc("XVID") || s->avctx->codec_tag == ff_get_fourcc("XVIX")) |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
485 s->xvid_build= -1; |
|
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
486 #if 0 |
| 1457 | 487 if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->vo_type==0 && s->vol_control_parameters==1 |
| 488 && s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc | |
| 489 s->xvid_build= -1; | |
|
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
490 #endif |
|
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
491 } |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
492 |
|
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
493 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
|
494 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
|
495 s->divx_version= 400; //divx 4 |
|
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
496 } |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
497 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
498 if(s->workaround_bugs&FF_BUG_AUTODETECT){ |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
499 s->workaround_bugs &= ~FF_BUG_NO_PADDING; |
|
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
500 |
|
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
501 if(s->padding_bug_score > -2 && !s->data_partitioning && (s->divx_version || !s->resync_marker)) |
| 1004 | 502 s->workaround_bugs |= FF_BUG_NO_PADDING; |
| 503 | |
| 1116 | 504 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
|
505 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
|
506 |
| 1116 | 507 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
|
508 s->workaround_bugs|= FF_BUG_UMP4; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
509 } |
| 760 | 510 |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
511 if(s->divx_version>=500){ |
| 760 | 512 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; |
| 513 } | |
| 761 | 514 |
| 1048 | 515 if(s->divx_version>502){ |
| 516 s->workaround_bugs|= FF_BUG_QPEL_CHROMA2; | |
| 517 } | |
| 518 | |
|
938
1e22655551b9
xvid build 3 still has the padding wrong in 1/8 of the cases :(((((
michaelni
parents:
936
diff
changeset
|
519 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
|
520 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
|
521 |
| 761 | 522 if(s->xvid_build && s->xvid_build<=1) |
| 523 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; | |
| 524 | |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
525 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
|
526 s->workaround_bugs|= FF_BUG_EDGE; |
|
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
527 |
| 984 | 528 #define SET_QPEL_FUNC(postfix1, postfix2) \ |
| 529 s->dsp.put_ ## postfix1 = ff_put_ ## postfix2;\ | |
| 530 s->dsp.put_no_rnd_ ## postfix1 = ff_put_no_rnd_ ## postfix2;\ | |
| 531 s->dsp.avg_ ## postfix1 = ff_avg_ ## postfix2; | |
| 532 | |
| 533 if(s->lavc_build && s->lavc_build<4653) | |
| 534 s->workaround_bugs|= FF_BUG_STD_QPEL; | |
| 535 | |
|
1053
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
536 if(s->lavc_build && s->lavc_build<4655) |
|
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
537 s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE; |
|
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
538 |
| 1502 | 539 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
|
540 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
|
541 } |
|
80067f8d6770
fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
michaelni
parents:
1353
diff
changeset
|
542 |
|
1053
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
543 if(s->divx_version) |
|
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
544 s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE; |
| 750 | 545 //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
|
546 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
|
547 s->padding_bug_score= 256*256*256*64; |
| 1137 | 548 |
|
1366
80067f8d6770
fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
michaelni
parents:
1353
diff
changeset
|
549 if(s->divx_version && s->divx_version<500){ |
| 1137 | 550 s->workaround_bugs|= FF_BUG_EDGE; |
| 551 } | |
| 1389 | 552 |
| 750 | 553 #if 0 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
554 if(s->divx_version==500) |
|
1088
bb27c685fc72
fixing padding bug autodetection for some rare files, closes bug #647941
michaelni
parents:
1064
diff
changeset
|
555 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
|
556 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
557 /* 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
|
558 * lets hope this at least works |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
559 */ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
560 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
|
561 && 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
|
562 s->workaround_bugs|= FF_BUG_NO_PADDING; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
563 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
564 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
|
565 s->workaround_bugs|= FF_BUG_NO_PADDING; |
| 750 | 566 #endif |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
567 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
568 |
| 984 | 569 if(s->workaround_bugs& FF_BUG_STD_QPEL){ |
| 570 SET_QPEL_FUNC(qpel_pixels_tab[0][ 5], qpel16_mc11_old_c) | |
| 571 SET_QPEL_FUNC(qpel_pixels_tab[0][ 7], qpel16_mc31_old_c) | |
| 572 SET_QPEL_FUNC(qpel_pixels_tab[0][ 9], qpel16_mc12_old_c) | |
| 573 SET_QPEL_FUNC(qpel_pixels_tab[0][11], qpel16_mc32_old_c) | |
| 574 SET_QPEL_FUNC(qpel_pixels_tab[0][13], qpel16_mc13_old_c) | |
| 575 SET_QPEL_FUNC(qpel_pixels_tab[0][15], qpel16_mc33_old_c) | |
| 576 | |
| 577 SET_QPEL_FUNC(qpel_pixels_tab[1][ 5], qpel8_mc11_old_c) | |
| 578 SET_QPEL_FUNC(qpel_pixels_tab[1][ 7], qpel8_mc31_old_c) | |
| 579 SET_QPEL_FUNC(qpel_pixels_tab[1][ 9], qpel8_mc12_old_c) | |
| 580 SET_QPEL_FUNC(qpel_pixels_tab[1][11], qpel8_mc32_old_c) | |
| 581 SET_QPEL_FUNC(qpel_pixels_tab[1][13], qpel8_mc13_old_c) | |
| 582 SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_old_c) | |
| 583 } | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
584 |
| 1457 | 585 if(avctx->debug & FF_DEBUG_BUGS) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
586 av_log(s->avctx, AV_LOG_DEBUG, "bugs: %X lavc_build:%d xvid_build:%d divx_version:%d divx_build:%d %s\n", |
| 1457 | 587 s->workaround_bugs, s->lavc_build, s->xvid_build, s->divx_version, s->divx_build, |
| 588 s->divx_packed ? "p" : ""); | |
| 589 | |
|
585
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
590 #if 0 // dump bits per frame / qp / complexity |
|
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
591 { |
|
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
592 static FILE *f=NULL; |
|
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
593 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
|
594 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
|
595 } |
|
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
596 #endif |
| 553 | 597 |
|
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
598 /* After H263 & mpeg4 header decode we have the height, width,*/ |
| 160 | 599 /* and other parameters. So then we could init the picture */ |
| 600 /* FIXME: By the way H263 decoder is evolving it should have */ | |
| 601 /* an H263EncContext */ | |
| 887 | 602 |
| 1548 | 603 if ( s->width != avctx->width || s->height != avctx->height) { |
| 553 | 604 /* H.263 could change picture size any time */ |
| 1536 | 605 ParseContext pc= s->parse_context; //FIXME move these demuxng hack to avformat |
| 606 s->parse_context.buffer=0; | |
| 553 | 607 MPV_common_end(s); |
| 1536 | 608 s->parse_context= pc; |
| 553 | 609 } |
|
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
610 if (!s->context_initialized) { |
| 888 | 611 avctx->width = s->width; |
| 612 avctx->height = s->height; | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
613 |
| 763 | 614 goto retry; |
| 0 | 615 } |
| 758 | 616 |
| 617 if((s->codec_id==CODEC_ID_H263 || s->codec_id==CODEC_ID_H263P)) | |
| 618 s->gob_index = ff_h263_get_gob_height(s); | |
|
845
32de034be20e
hurry_up>=5 -> skip everything except header & set pict_type&key_frame
michaelni
parents:
842
diff
changeset
|
619 |
| 903 | 620 // for hurry_up==5 |
| 621 s->current_picture.pict_type= s->pict_type; | |
| 622 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
|
623 |
| 341 | 624 /* skip b frames if we dont have reference frames */ |
| 1138 | 625 if(s->last_picture_ptr==NULL && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size); |
| 345 | 626 /* 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
|
627 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
|
628 /* 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
|
629 if(avctx->hurry_up>=5) return get_consumed_bytes(s, buf_size); |
| 454 | 630 |
| 631 if(s->next_p_frame_damaged){ | |
| 632 if(s->pict_type==B_TYPE) | |
| 655 | 633 return get_consumed_bytes(s, buf_size); |
| 454 | 634 else |
| 635 s->next_p_frame_damaged=0; | |
| 636 } | |
| 637 | |
|
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
763
diff
changeset
|
638 if(MPV_frame_start(s, avctx) < 0) |
|
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
763
diff
changeset
|
639 return -1; |
| 0 | 640 |
| 641 #ifdef DEBUG | |
| 642 printf("qscale=%d\n", s->qscale); | |
| 643 #endif | |
| 644 | |
| 1144 | 645 ff_er_frame_start(s); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
646 |
| 1183 | 647 //the second part of the wmv2 header contains the MB skip bits which are stored in current_picture->mb_type |
| 648 //which isnt available before MPV_frame_start() | |
| 649 if (s->msmpeg4_version==5){ | |
| 650 if(ff_wmv2_decode_secondary_picture_header(s) < 0) | |
| 651 return -1; | |
| 652 } | |
| 653 | |
| 0 | 654 /* decode each macroblock */ |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
655 s->mb_x=0; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
656 s->mb_y=0; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
657 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
658 decode_slice(s); |
| 1183 | 659 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
|
660 if(s->msmpeg4_version){ |
| 1183 | 661 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
|
662 break; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
663 }else{ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
664 if(ff_h263_resync(s)<0) |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
665 break; |
| 454 | 666 } |
| 667 | |
| 983 | 668 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
|
669 ff_mpeg4_clean_buffers(s); |
| 454 | 670 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
671 decode_slice(s); |
| 0 | 672 } |
| 756 | 673 |
| 311 | 674 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==I_TYPE) |
| 903 | 675 if(msmpeg4_decode_ext_header(s, buf_size) < 0){ |
| 676 s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR; | |
| 677 } | |
| 333 | 678 |
| 679 /* 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
|
680 if(s->codec_id==CODEC_ID_MPEG4 && s->bitstream_buffer_size==0 && s->divx_packed){ |
| 454 | 681 int current_pos= get_bits_count(&s->gb)>>3; |
| 1747 | 682 int startcode_found=0; |
| 454 | 683 |
| 333 | 684 if( buf_size - current_pos > 5 |
| 685 && buf_size - current_pos < BITSTREAM_BUFFER_SIZE){ | |
| 454 | 686 int i; |
| 655 | 687 for(i=current_pos; i<buf_size-3; i++){ |
| 454 | 688 if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1 && buf[i+3]==0xB6){ |
| 689 startcode_found=1; | |
| 690 break; | |
| 691 } | |
| 692 } | |
| 1747 | 693 } |
| 694 if(s->gb.buffer == s->bitstream_buffer && buf_size>20){ //xvid style | |
| 695 startcode_found=1; | |
| 696 current_pos=0; | |
| 697 } | |
| 698 | |
| 699 if(startcode_found){ | |
| 700 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos); | |
| 701 s->bitstream_buffer_size= buf_size - current_pos; | |
| 454 | 702 } |
| 703 } | |
| 704 | |
| 1144 | 705 ff_er_frame_end(s); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
706 |
| 0 | 707 MPV_frame_end(s); |
| 984 | 708 |
| 1285 | 709 assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type); |
| 710 assert(s->current_picture.pict_type == s->pict_type); | |
| 924 | 711 if(s->pict_type==B_TYPE || s->low_delay){ |
| 925 | 712 *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
|
713 ff_print_debug_info(s, pict); |
| 262 | 714 } else { |
| 925 | 715 *pict= *(AVFrame*)&s->last_picture; |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1687
diff
changeset
|
716 ff_print_debug_info(s, pict); |
| 262 | 717 } |
| 931 | 718 |
| 231 | 719 /* Return the Picture timestamp as the frame number */ |
| 720 /* we substract 1 because it is added on utils.c */ | |
| 721 avctx->frame_number = s->picture_number - 1; | |
| 722 | |
| 924 | 723 /* dont output the last pic after seeking */ |
| 1138 | 724 if(s->last_picture_ptr || s->low_delay) |
| 925 | 725 *data_size = sizeof(AVFrame); |
| 384 | 726 #ifdef PRINT_FRAME_TIME |
| 727 printf("%Ld\n", rdtsc()-time); | |
| 728 #endif | |
|
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
729 |
| 655 | 730 return get_consumed_bytes(s, buf_size); |
| 0 | 731 } |
| 732 | |
|
1124
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
733 static const AVOption mpeg4_decoptions[] = |
|
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
734 { |
|
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
735 AVOPTION_SUB(avoptions_workaround_bug), |
|
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
736 AVOPTION_END() |
|
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
737 }; |
|
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
738 |
| 67 | 739 AVCodec mpeg4_decoder = { |
| 740 "mpeg4", | |
| 0 | 741 CODEC_TYPE_VIDEO, |
| 67 | 742 CODEC_ID_MPEG4, |
| 0 | 743 sizeof(MpegEncContext), |
| 936 | 744 ff_h263_decode_init, |
| 0 | 745 NULL, |
| 936 | 746 ff_h263_decode_end, |
| 747 ff_h263_decode_frame, | |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
748 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED, |
|
1124
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
749 .options = mpeg4_decoptions, |
| 1368 | 750 .flush= ff_mpeg_flush, |
| 0 | 751 }; |
| 752 | |
| 753 AVCodec h263_decoder = { | |
| 754 "h263", | |
| 755 CODEC_TYPE_VIDEO, | |
| 756 CODEC_ID_H263, | |
| 757 sizeof(MpegEncContext), | |
| 936 | 758 ff_h263_decode_init, |
| 0 | 759 NULL, |
| 936 | 760 ff_h263_decode_end, |
| 761 ff_h263_decode_frame, | |
|
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
762 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED, |
| 1368 | 763 .flush= ff_mpeg_flush, |
| 0 | 764 }; |
| 765 | |
| 307 | 766 AVCodec msmpeg4v1_decoder = { |
| 767 "msmpeg4v1", | |
| 768 CODEC_TYPE_VIDEO, | |
| 769 CODEC_ID_MSMPEG4V1, | |
| 770 sizeof(MpegEncContext), | |
| 936 | 771 ff_h263_decode_init, |
| 307 | 772 NULL, |
| 936 | 773 ff_h263_decode_end, |
| 774 ff_h263_decode_frame, | |
| 553 | 775 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
|
1124
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
776 mpeg4_decoptions, |
| 307 | 777 }; |
| 778 | |
| 779 AVCodec msmpeg4v2_decoder = { | |
| 780 "msmpeg4v2", | |
| 781 CODEC_TYPE_VIDEO, | |
| 782 CODEC_ID_MSMPEG4V2, | |
| 783 sizeof(MpegEncContext), | |
| 936 | 784 ff_h263_decode_init, |
| 307 | 785 NULL, |
| 936 | 786 ff_h263_decode_end, |
| 787 ff_h263_decode_frame, | |
| 553 | 788 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
|
1124
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
789 mpeg4_decoptions, |
| 307 | 790 }; |
| 791 | |
| 792 AVCodec msmpeg4v3_decoder = { | |
| 0 | 793 "msmpeg4", |
| 794 CODEC_TYPE_VIDEO, | |
| 307 | 795 CODEC_ID_MSMPEG4V3, |
| 0 | 796 sizeof(MpegEncContext), |
| 936 | 797 ff_h263_decode_init, |
| 0 | 798 NULL, |
| 936 | 799 ff_h263_decode_end, |
| 800 ff_h263_decode_frame, | |
| 553 | 801 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
|
1124
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
802 .options = mpeg4_decoptions, |
| 0 | 803 }; |
| 804 | |
| 311 | 805 AVCodec wmv1_decoder = { |
| 806 "wmv1", | |
| 807 CODEC_TYPE_VIDEO, | |
| 808 CODEC_ID_WMV1, | |
| 809 sizeof(MpegEncContext), | |
| 936 | 810 ff_h263_decode_init, |
| 311 | 811 NULL, |
| 936 | 812 ff_h263_decode_end, |
| 813 ff_h263_decode_frame, | |
| 553 | 814 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
|
1124
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
815 mpeg4_decoptions, |
| 498 | 816 }; |
| 817 | |
| 0 | 818 AVCodec h263i_decoder = { |
| 819 "h263i", | |
| 820 CODEC_TYPE_VIDEO, | |
| 821 CODEC_ID_H263I, | |
| 822 sizeof(MpegEncContext), | |
| 936 | 823 ff_h263_decode_init, |
| 0 | 824 NULL, |
| 936 | 825 ff_h263_decode_end, |
| 826 ff_h263_decode_frame, | |
| 553 | 827 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
|
1124
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
828 mpeg4_decoptions, |
| 0 | 829 }; |
| 830 | |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
831 AVCodec flv_decoder = { |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
832 "flv", |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
833 CODEC_TYPE_VIDEO, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
834 CODEC_ID_FLV1, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
835 sizeof(MpegEncContext), |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
836 ff_h263_decode_init, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
837 NULL, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
838 ff_h263_decode_end, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
839 ff_h263_decode_frame, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
840 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
|
841 }; |
