Mercurial > libavcodec.hg
annotate h263dec.c @ 9120:dfd80d6fabfe libavcodec
cosmetics: indentation after last commit
| author | jbr |
|---|---|
| date | Wed, 04 Mar 2009 00:53:04 +0000 |
| parents | bf274494b66e |
| children | 54bc8a2727b0 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 1106 | 2 * H.263 decoder |
|
8629
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
8612
diff
changeset
|
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 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3926
diff
changeset
|
6 * This file is part of FFmpeg. |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3926
diff
changeset
|
7 * |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3926
diff
changeset
|
8 * FFmpeg is free software; you can redistribute it and/or |
| 429 | 9 * modify it under the terms of the GNU Lesser General Public |
| 10 * License as published by the Free Software Foundation; either | |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3926
diff
changeset
|
11 * version 2.1 of the License, or (at your option) any later version. |
| 0 | 12 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3926
diff
changeset
|
13 * FFmpeg is distributed in the hope that it will be useful, |
| 0 | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 429 | 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 16 * Lesser General Public License for more details. | |
| 0 | 17 * |
| 429 | 18 * You should have received a copy of the GNU Lesser General Public |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3926
diff
changeset
|
19 * License along with FFmpeg; if not, write to the Free Software |
|
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2977
diff
changeset
|
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 21 */ |
| 2967 | 22 |
| 1106 | 23 /** |
|
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
8672
diff
changeset
|
24 * @file libavcodec/h263dec.c |
| 1106 | 25 * H.263 decoder. |
| 26 */ | |
| 2967 | 27 |
|
9012
15a3df8c01fd
More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents:
8800
diff
changeset
|
28 #include "internal.h" |
|
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
384
diff
changeset
|
29 #include "avcodec.h" |
| 0 | 30 #include "dsputil.h" |
| 31 #include "mpegvideo.h" | |
| 4938 | 32 #include "h263_parser.h" |
|
4957
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4938
diff
changeset
|
33 #include "mpeg4video_parser.h" |
|
4967
6d45158e0249
disable reference to msmpeg4 and wmv2 code when those codecs are not compiled in
aurel
parents:
4957
diff
changeset
|
34 #include "msmpeg4.h" |
| 0 | 35 |
| 36 //#define DEBUG | |
| 384 | 37 //#define PRINT_FRAME_TIME |
| 0 | 38 |
|
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6481
diff
changeset
|
39 av_cold int ff_h263_decode_init(AVCodecContext *avctx) |
| 0 | 40 { |
| 41 MpegEncContext *s = avctx->priv_data; | |
| 60 | 42 |
| 67 | 43 s->avctx = avctx; |
| 0 | 44 s->out_format = FMT_H263; |
| 45 | |
| 2270 | 46 s->width = avctx->coded_width; |
| 47 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
|
48 s->workaround_bugs= avctx->workaround_bugs; |
| 0 | 49 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
50 // set defaults |
| 1892 | 51 MPV_decode_defaults(s); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
52 s->quant_precision=5; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
53 s->decode_mb= ff_h263_decode_mb; |
| 924 | 54 s->low_delay= 1; |
| 9028 | 55 avctx->pix_fmt= avctx->get_format(avctx, avctx->codec->pix_fmts); |
|
1542
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1536
diff
changeset
|
56 s->unrestricted_mv= 1; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
57 |
| 0 | 58 /* select sub codec */ |
| 59 switch(avctx->codec->id) { | |
| 60 case CODEC_ID_H263: | |
| 1639 | 61 s->unrestricted_mv= 0; |
| 0 | 62 break; |
| 67 | 63 case CODEC_ID_MPEG4: |
|
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1644
diff
changeset
|
64 s->decode_mb= ff_mpeg4_decode_mb; |
| 0 | 65 s->time_increment_bits = 4; /* default value for broken headers */ |
| 66 s->h263_pred = 1; | |
| 924 | 67 s->low_delay = 0; //default, might be overriden in the vol header during header parsing |
| 0 | 68 break; |
| 307 | 69 case CODEC_ID_MSMPEG4V1: |
| 0 | 70 s->h263_msmpeg4 = 1; |
| 71 s->h263_pred = 1; | |
| 307 | 72 s->msmpeg4_version=1; |
| 73 break; | |
| 74 case CODEC_ID_MSMPEG4V2: | |
| 75 s->h263_msmpeg4 = 1; | |
| 76 s->h263_pred = 1; | |
| 77 s->msmpeg4_version=2; | |
| 78 break; | |
| 79 case CODEC_ID_MSMPEG4V3: | |
| 80 s->h263_msmpeg4 = 1; | |
| 81 s->h263_pred = 1; | |
| 82 s->msmpeg4_version=3; | |
| 0 | 83 break; |
| 311 | 84 case CODEC_ID_WMV1: |
| 85 s->h263_msmpeg4 = 1; | |
| 86 s->h263_pred = 1; | |
| 87 s->msmpeg4_version=4; | |
| 88 break; | |
| 498 | 89 case CODEC_ID_WMV2: |
| 90 s->h263_msmpeg4 = 1; | |
| 91 s->h263_pred = 1; | |
| 92 s->msmpeg4_version=5; | |
| 93 break; | |
|
3368
19620d64a239
Fix initialization of vc1_decoder (the same as wmv3_decoder).
kostya
parents:
3185
diff
changeset
|
94 case CODEC_ID_VC1: |
| 2474 | 95 case CODEC_ID_WMV3: |
| 96 s->h263_msmpeg4 = 1; | |
| 97 s->h263_pred = 1; | |
| 98 s->msmpeg4_version=6; | |
| 99 break; | |
| 0 | 100 case CODEC_ID_H263I: |
| 101 break; | |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
102 case CODEC_ID_FLV1: |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
103 s->h263_flv = 1; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
104 break; |
| 0 | 105 default: |
| 106 return -1; | |
| 107 } | |
| 344 | 108 s->codec_id= avctx->codec->id; |
| 9033 | 109 avctx->hwaccel= ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt); |
| 553 | 110 |
| 0 | 111 /* 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
|
112 if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4) |
| 144 | 113 if (MPV_common_init(s) < 0) |
| 114 return -1; | |
| 0 | 115 |
|
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
116 if (CONFIG_MSMPEG4_DECODER && s->h263_msmpeg4) |
| 498 | 117 ff_msmpeg4_decode_init(s); |
| 0 | 118 else |
| 119 h263_decode_init_vlc(s); | |
| 2967 | 120 |
| 0 | 121 return 0; |
| 122 } | |
| 123 | |
|
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6481
diff
changeset
|
124 av_cold int ff_h263_decode_end(AVCodecContext *avctx) |
| 0 | 125 { |
| 126 MpegEncContext *s = avctx->priv_data; | |
| 127 | |
| 128 MPV_common_end(s); | |
| 129 return 0; | |
| 130 } | |
| 131 | |
| 655 | 132 /** |
| 2764 | 133 * returns the number of bytes consumed for building the current frame |
| 655 | 134 */ |
| 135 static int get_consumed_bytes(MpegEncContext *s, int buf_size){ | |
| 136 int pos= (get_bits_count(&s->gb)+7)>>3; | |
| 2967 | 137 |
|
9027
3c141db76660
Approved hunk from the AVHWaccel patch by Gwenole Beauchesne.
michael
parents:
9012
diff
changeset
|
138 if(s->divx_packed || s->avctx->hwaccel){ |
| 655 | 139 //we would have to scan through the whole buf to handle the weird reordering ... |
| 2967 | 140 return buf_size; |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
141 }else if(s->flags&CODEC_FLAG_TRUNCATED){ |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
142 pos -= s->parse_context.last_index; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
143 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
|
144 return pos; |
| 655 | 145 }else{ |
| 5127 | 146 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...) |
| 658 | 147 if(pos+10>buf_size) pos=buf_size; // oops ;) |
| 655 | 148 |
| 149 return pos; | |
| 150 } | |
| 151 } | |
| 152 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
153 static int decode_slice(MpegEncContext *s){ |
| 1144 | 154 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; |
| 2261 | 155 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
|
156 s->last_resync_gb= s->gb; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
157 s->first_slice_line= 1; |
| 2967 | 158 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
159 s->resync_mb_x= s->mb_x; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
160 s->resync_mb_y= s->mb_y; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
161 |
| 1652 | 162 ff_set_qscale(s, s->qscale); |
| 2967 | 163 |
|
9064
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
164 if (s->avctx->hwaccel) { |
|
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
165 const uint8_t *start= s->gb.buffer + get_bits_count(&s->gb)/8; |
|
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
166 const uint8_t *end = ff_h263_find_resync_marker(start + 1, s->gb.buffer_end); |
|
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
167 skip_bits_long(&s->gb, 8*(end - start)); |
|
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
168 return s->avctx->hwaccel->decode_slice(s->avctx, start, end - start); |
|
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
169 } |
|
9012
15a3df8c01fd
More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents:
8800
diff
changeset
|
170 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
171 if(s->partitioned_frame){ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
172 const int qscale= s->qscale; |
|
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 if(s->codec_id==CODEC_ID_MPEG4){ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
175 if(ff_mpeg4_decode_partitions(s) < 0) |
| 2967 | 176 return -1; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
177 } |
| 2967 | 178 |
| 1427 | 179 /* restore variables which were modified */ |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
180 s->first_slice_line=1; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
181 s->mb_x= s->resync_mb_x; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
182 s->mb_y= s->resync_mb_y; |
| 1652 | 183 ff_set_qscale(s, qscale); |
|
745
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 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
186 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
|
187 /* per-row end of slice checks */ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
188 if(s->msmpeg4_version){ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
189 if(s->resync_mb_y + s->slice_height == s->mb_y){ |
| 1144 | 190 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); |
| 191 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
192 return 0; |
|
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 } |
| 2967 | 195 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
196 if(s->msmpeg4_version==1){ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
197 s->last_dc[0]= |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
198 s->last_dc[1]= |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
199 s->last_dc[2]= 128; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
200 } |
| 2967 | 201 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
202 ff_init_block_index(s); |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
203 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
|
204 int ret; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
205 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
206 ff_update_block_index(s); |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
207 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
208 if(s->resync_mb_x == s->mb_x && s->resync_mb_y+1 == s->mb_y){ |
| 2967 | 209 s->first_slice_line=0; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
210 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
211 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
212 /* DCT & quantize */ |
| 2967 | 213 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
214 s->mv_dir = MV_DIR_FORWARD; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
215 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
|
216 // s->mb_skipped = 0; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
217 //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
|
218 ret= s->decode_mb(s, s->block); |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
219 |
| 6481 | 220 if (s->pict_type!=FF_B_TYPE) |
| 1389 | 221 ff_h263_update_motion_val(s); |
| 222 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
223 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
|
224 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
|
225 if(ret==SLICE_END){ |
| 1338 | 226 MPV_decode_mb(s, s->block); |
| 1644 | 227 if(s->loop_filter) |
| 228 ff_h263_loop_filter(s); | |
| 1338 | 229 |
| 758 | 230 //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 | 231 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 | 232 |
| 233 s->padding_bug_score--; | |
| 2967 | 234 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
235 if(++s->mb_x >= s->mb_width){ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
236 s->mb_x=0; |
| 2261 | 237 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
|
238 s->mb_y++; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
239 } |
| 2967 | 240 return 0; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
241 }else if(ret==SLICE_NOEND){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
242 av_log(s->avctx, AV_LOG_ERROR, "Slice mismatch at MB: %d\n", xy); |
| 1144 | 243 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
|
244 return -1; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
245 } |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
246 av_log(s->avctx, AV_LOG_ERROR, "Error at MB: %d\n", xy); |
| 1144 | 247 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 | 248 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
249 return -1; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
250 } |
| 1338 | 251 |
| 252 MPV_decode_mb(s, s->block); | |
| 1644 | 253 if(s->loop_filter) |
| 254 ff_h263_loop_filter(s); | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
255 } |
| 2967 | 256 |
| 2261 | 257 ff_draw_horiz_band(s, s->mb_y*mb_size, mb_size); |
| 2967 | 258 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
259 s->mb_x= 0; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
260 } |
| 2967 | 261 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
262 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
|
263 |
| 750 | 264 /* try to detect the padding bug */ |
| 265 if( s->codec_id==CODEC_ID_MPEG4 | |
| 2967 | 266 && (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
|
267 && 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
|
268 && 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
|
269 // && !s->resync_marker |
| 750 | 270 && !s->data_partitioning){ |
| 2967 | 271 |
| 750 | 272 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
|
273 const int bits_left = s->gb.size_in_bits - bits_count; |
| 2967 | 274 |
| 1003 | 275 if(bits_left==0){ |
| 276 s->padding_bug_score+=16; | |
| 824 | 277 } else if(bits_left != 1){ |
| 750 | 278 int v= show_bits(&s->gb, 8); |
| 279 v|= 0x7F >> (7-(bits_count&7)); | |
| 824 | 280 |
| 2350 | 281 if(v==0x7F && bits_left<=8) |
| 750 | 282 s->padding_bug_score--; |
| 2350 | 283 else if(v==0x7F && ((get_bits_count(&s->gb)+8)&8) && bits_left<=16) |
| 284 s->padding_bug_score+= 4; | |
| 750 | 285 else |
| 2967 | 286 s->padding_bug_score++; |
| 287 } | |
| 750 | 288 } |
| 2967 | 289 |
| 2350 | 290 if(s->workaround_bugs&FF_BUG_AUTODETECT){ |
|
2411
0427eb3579b6
fix decoding of http://mplayerhq.hu/~diego/problem.mov
michael
parents:
2350
diff
changeset
|
291 if(s->padding_bug_score > -2 && !s->data_partitioning /*&& (s->divx_version || !s->resync_marker)*/) |
| 2350 | 292 s->workaround_bugs |= FF_BUG_NO_PADDING; |
| 293 else | |
| 294 s->workaround_bugs &= ~FF_BUG_NO_PADDING; | |
| 295 } | |
| 750 | 296 |
| 2764 | 297 // handle formats which don't have unique end markers |
| 1004 | 298 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
|
299 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
|
300 int max_extra=7; |
| 2967 | 301 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
302 /* no markers in M$ crap */ |
| 6481 | 303 if(s->msmpeg4_version && s->pict_type==FF_I_TYPE) |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
304 max_extra+= 17; |
| 2967 | 305 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
306 /* buggy padding but the frame should still end approximately at the bitstream end */ |
| 7831 | 307 if((s->workaround_bugs&FF_BUG_NO_PADDING) && s->error_recognition>=3) |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
308 max_extra+= 48; |
| 1004 | 309 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
|
310 max_extra+= 256*256*256*64; |
| 2967 | 311 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
312 if(left>max_extra){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
313 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
|
314 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
315 else if(left<0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
316 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
|
317 }else |
| 1144 | 318 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 | 319 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
320 return 0; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
321 } |
| 750 | 322 |
| 2967 | 323 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
|
324 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
|
325 show_bits(&s->gb, 24), s->padding_bug_score); |
| 2967 | 326 |
| 1144 | 327 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); |
| 328 | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
329 return -1; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
330 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
331 |
| 2967 | 332 int ff_h263_decode_frame(AVCodecContext *avctx, |
| 0 | 333 void *data, int *data_size, |
| 6269 | 334 const uint8_t *buf, int buf_size) |
| 0 | 335 { |
| 336 MpegEncContext *s = avctx->priv_data; | |
| 1453 | 337 int ret; |
| 2967 | 338 AVFrame *pict = data; |
| 339 | |
| 384 | 340 #ifdef PRINT_FRAME_TIME |
| 341 uint64_t time= rdtsc(); | |
| 342 #endif | |
| 0 | 343 #ifdef DEBUG |
| 3551 | 344 av_log(avctx, AV_LOG_DEBUG, "*****frame %d size=%d\n", avctx->frame_number, buf_size); |
| 4636 | 345 if(buf_size>0) |
| 346 av_log(avctx, AV_LOG_DEBUG, "bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]); | |
| 0 | 347 #endif |
| 485 | 348 s->flags= avctx->flags; |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1747
diff
changeset
|
349 s->flags2= avctx->flags2; |
| 454 | 350 |
| 1372 | 351 /* no supplementary picture */ |
| 0 | 352 if (buf_size == 0) { |
| 1372 | 353 /* special case for last picture */ |
| 354 if (s->low_delay==0 && s->next_picture_ptr) { | |
| 355 *pict= *(AVFrame*)s->next_picture_ptr; | |
| 356 s->next_picture_ptr= NULL; | |
| 357 | |
| 358 *data_size = sizeof(AVFrame); | |
| 359 } | |
| 360 | |
| 0 | 361 return 0; |
| 362 } | |
| 1026 | 363 |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
364 if(s->flags&CODEC_FLAG_TRUNCATED){ |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
365 int next; |
| 2967 | 366 |
|
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
367 if(CONFIG_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4){ |
| 1988 | 368 next= ff_mpeg4_find_frame_end(&s->parse_context, buf, buf_size); |
|
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
369 }else if(CONFIG_H263_DECODER && s->codec_id==CODEC_ID_H263){ |
| 4938 | 370 next= ff_h263_find_frame_end(&s->parse_context, buf, buf_size); |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
371 }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
|
372 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
|
373 return -1; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
374 } |
| 2967 | 375 |
|
4931
0d1cc37d9430
make some parser parameters const to avoid casting const to non-const
aurel
parents:
4636
diff
changeset
|
376 if( ff_combine_frame(&s->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0 ) |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
377 return buf_size; |
|
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
378 } |
| 0 | 379 |
| 2967 | 380 |
| 763 | 381 retry: |
| 2967 | 382 |
| 1747 | 383 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
|
384 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size*8); |
| 353 | 385 }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
|
386 init_get_bits(&s->gb, buf, buf_size*8); |
| 465 | 387 s->bitstream_buffer_size=0; |
| 0 | 388 |
| 718 | 389 if (!s->context_initialized) { |
|
752
97077dd24bfa
fixing alt_scan for the first frame (variable was reset)
michaelni
parents:
750
diff
changeset
|
390 if (MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix |
| 718 | 391 return -1; |
| 392 } | |
| 2967 | 393 |
| 5127 | 394 /* We need to set current_picture_ptr before reading the header, |
| 395 * otherwise we cannot store anyting in there */ | |
| 1586 | 396 if(s->current_picture_ptr==NULL || s->current_picture_ptr->data[0]){ |
| 397 int i= ff_find_unused_picture(s, 0); | |
| 398 s->current_picture_ptr= &s->picture[i]; | |
| 399 } | |
| 2967 | 400 |
| 0 | 401 /* let's go :-) */ |
|
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
402 if (CONFIG_WMV2_DECODER && s->msmpeg4_version==5) { |
| 936 | 403 ret= ff_wmv2_decode_picture_header(s); |
|
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
404 } else if (CONFIG_MSMPEG4_DECODER && s->msmpeg4_version) { |
| 0 | 405 ret = msmpeg4_decode_picture_header(s); |
| 406 } 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
|
407 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
|
408 GetBitContext gb; |
| 2967 | 409 |
|
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
|
410 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
|
411 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
|
412 } |
|
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
413 ret = ff_mpeg4_decode_picture_header(s, &s->gb); |
| 1687 | 414 } else if (s->codec_id == CODEC_ID_H263I) { |
| 0 | 415 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
|
416 } else if (s->h263_flv) { |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
417 ret = flv_h263_decode_picture_header(s); |
| 0 | 418 } else { |
| 419 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
|
420 } |
| 2967 | 421 |
|
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
|
422 if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_size); |
| 1393 | 423 |
| 424 /* skip if the header was thrashed */ | |
| 425 if (ret < 0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
426 av_log(s->avctx, AV_LOG_ERROR, "header damaged\n"); |
| 1393 | 427 return -1; |
| 428 } | |
| 2967 | 429 |
| 924 | 430 avctx->has_b_frames= !s->low_delay; |
| 2967 | 431 |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
432 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ |
| 8612 | 433 if(s->stream_codec_tag == AV_RL32("XVID") || |
| 434 s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") || | |
| 435 s->codec_tag == AV_RL32("RMP4")) | |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
436 s->xvid_build= -1; |
|
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
437 #if 0 |
| 8612 | 438 if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==1 |
| 2967 | 439 && s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc |
| 1457 | 440 s->xvid_build= -1; |
|
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
441 #endif |
|
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
442 } |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
443 |
|
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
444 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){ |
| 8612 | 445 if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==0) |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
446 s->divx_version= 400; //divx 4 |
|
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
447 } |
| 2967 | 448 |
| 2299 | 449 if(s->xvid_build && s->divx_version){ |
| 450 s->divx_version= | |
| 451 s->divx_build= 0; | |
| 452 } | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
453 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
454 if(s->workaround_bugs&FF_BUG_AUTODETECT){ |
| 8612 | 455 if(s->codec_tag == AV_RL32("XVIX")) |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
456 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
|
457 |
| 8612 | 458 if(s->codec_tag == AV_RL32("UMP4")){ |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
459 s->workaround_bugs|= FF_BUG_UMP4; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
460 } |
| 760 | 461 |
| 5136 | 462 if(s->divx_version>=500 && s->divx_build<1814){ |
| 760 | 463 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; |
| 464 } | |
| 761 | 465 |
| 5136 | 466 if(s->divx_version>502 && s->divx_build<1814){ |
| 1048 | 467 s->workaround_bugs|= FF_BUG_QPEL_CHROMA2; |
| 468 } | |
| 469 | |
|
938
1e22655551b9
xvid build 3 still has the padding wrong in 1/8 of the cases :(((((
michaelni
parents:
936
diff
changeset
|
470 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
|
471 s->padding_bug_score= 256*256*256*64; |
| 2967 | 472 |
| 761 | 473 if(s->xvid_build && s->xvid_build<=1) |
| 474 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; | |
| 475 | |
|
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
476 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
|
477 s->workaround_bugs|= FF_BUG_EDGE; |
|
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
478 |
| 2004 | 479 if(s->xvid_build && s->xvid_build<=32) |
| 480 s->workaround_bugs|= FF_BUG_DC_CLIP; | |
| 481 | |
| 984 | 482 #define SET_QPEL_FUNC(postfix1, postfix2) \ |
| 483 s->dsp.put_ ## postfix1 = ff_put_ ## postfix2;\ | |
| 484 s->dsp.put_no_rnd_ ## postfix1 = ff_put_no_rnd_ ## postfix2;\ | |
| 485 s->dsp.avg_ ## postfix1 = ff_avg_ ## postfix2; | |
| 486 | |
| 487 if(s->lavc_build && s->lavc_build<4653) | |
| 488 s->workaround_bugs|= FF_BUG_STD_QPEL; | |
| 2967 | 489 |
|
1053
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
490 if(s->lavc_build && s->lavc_build<4655) |
|
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
491 s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE; |
|
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
492 |
| 1502 | 493 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
|
494 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
|
495 } |
| 2967 | 496 |
| 2004 | 497 if(s->lavc_build && s->lavc_build<=4712) |
| 498 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
|
499 |
|
1053
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
500 if(s->divx_version) |
|
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
501 s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE; |
| 750 | 502 //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
|
503 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
|
504 s->padding_bug_score= 256*256*256*64; |
| 1137 | 505 |
|
1366
80067f8d6770
fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
michaelni
parents:
1353
diff
changeset
|
506 if(s->divx_version && s->divx_version<500){ |
| 1137 | 507 s->workaround_bugs|= FF_BUG_EDGE; |
| 508 } | |
| 2967 | 509 |
| 1916 | 510 if(s->divx_version) |
| 511 s->workaround_bugs|= FF_BUG_HPEL_CHROMA; | |
| 750 | 512 #if 0 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
513 if(s->divx_version==500) |
|
1088
bb27c685fc72
fixing padding bug autodetection for some rare files, closes bug #647941
michaelni
parents:
1064
diff
changeset
|
514 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
|
515 |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
516 /* very ugly XVID padding bug detection FIXME/XXX solve this differently |
|
7377
3f819263176e
cosmetics: Fix two common typos: wont --> will not, lets --> let us.
diego
parents:
7040
diff
changeset
|
517 * Let us hope this at least works. |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
518 */ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
519 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
|
520 && 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
|
521 s->workaround_bugs|= FF_BUG_NO_PADDING; |
| 2967 | 522 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
523 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
|
524 s->workaround_bugs|= FF_BUG_NO_PADDING; |
| 750 | 525 #endif |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
526 } |
| 2967 | 527 |
| 984 | 528 if(s->workaround_bugs& FF_BUG_STD_QPEL){ |
| 529 SET_QPEL_FUNC(qpel_pixels_tab[0][ 5], qpel16_mc11_old_c) | |
| 530 SET_QPEL_FUNC(qpel_pixels_tab[0][ 7], qpel16_mc31_old_c) | |
| 531 SET_QPEL_FUNC(qpel_pixels_tab[0][ 9], qpel16_mc12_old_c) | |
| 532 SET_QPEL_FUNC(qpel_pixels_tab[0][11], qpel16_mc32_old_c) | |
| 533 SET_QPEL_FUNC(qpel_pixels_tab[0][13], qpel16_mc13_old_c) | |
| 534 SET_QPEL_FUNC(qpel_pixels_tab[0][15], qpel16_mc33_old_c) | |
| 535 | |
| 536 SET_QPEL_FUNC(qpel_pixels_tab[1][ 5], qpel8_mc11_old_c) | |
| 537 SET_QPEL_FUNC(qpel_pixels_tab[1][ 7], qpel8_mc31_old_c) | |
| 538 SET_QPEL_FUNC(qpel_pixels_tab[1][ 9], qpel8_mc12_old_c) | |
| 539 SET_QPEL_FUNC(qpel_pixels_tab[1][11], qpel8_mc32_old_c) | |
| 540 SET_QPEL_FUNC(qpel_pixels_tab[1][13], qpel8_mc13_old_c) | |
| 541 SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_old_c) | |
| 542 } | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
543 |
| 1457 | 544 if(avctx->debug & FF_DEBUG_BUGS) |
| 2967 | 545 av_log(s->avctx, AV_LOG_DEBUG, "bugs: %X lavc_build:%d xvid_build:%d divx_version:%d divx_build:%d %s\n", |
| 1457 | 546 s->workaround_bugs, s->lavc_build, s->xvid_build, s->divx_version, s->divx_build, |
| 547 s->divx_packed ? "p" : ""); | |
| 2967 | 548 |
|
585
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
549 #if 0 // dump bits per frame / qp / complexity |
|
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
550 { |
|
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
551 static FILE *f=NULL; |
|
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
552 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
|
553 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
|
554 } |
|
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
555 #endif |
| 2096 | 556 |
| 8590 | 557 #if HAVE_MMX |
|
8104
0d108ec85620
Remove duplicated MM_* macros for CPU capabilities from dsputil.h.
rathann
parents:
7831
diff
changeset
|
558 if(s->codec_id == CODEC_ID_MPEG4 && s->xvid_build && avctx->idct_algo == FF_IDCT_AUTO && (mm_flags & FF_MM_MMX)){ |
| 2869 | 559 avctx->idct_algo= FF_IDCT_XVIDMMX; |
| 2278 | 560 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
|
561 // 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
|
562 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
|
563 } |
| 2096 | 564 #endif |
| 565 | |
|
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
566 /* After H263 & mpeg4 header decode we have the height, width,*/ |
| 160 | 567 /* and other parameters. So then we could init the picture */ |
| 568 /* FIXME: By the way H263 decoder is evolving it should have */ | |
| 569 /* an H263EncContext */ | |
| 2967 | 570 |
| 571 if ( s->width != avctx->coded_width | |
| 2270 | 572 || s->height != avctx->coded_height) { |
| 553 | 573 /* H.263 could change picture size any time */ |
| 1536 | 574 ParseContext pc= s->parse_context; //FIXME move these demuxng hack to avformat |
| 575 s->parse_context.buffer=0; | |
| 553 | 576 MPV_common_end(s); |
| 1536 | 577 s->parse_context= pc; |
| 553 | 578 } |
|
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
579 if (!s->context_initialized) { |
| 2270 | 580 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
|
581 |
| 763 | 582 goto retry; |
| 0 | 583 } |
| 758 | 584 |
|
8800
8ec0175bbcb5
Initialize s->gob_index for Intel variant of H.263 too
kostya
parents:
8718
diff
changeset
|
585 if((s->codec_id==CODEC_ID_H263 || s->codec_id==CODEC_ID_H263P || s->codec_id == CODEC_ID_H263I)) |
| 758 | 586 s->gob_index = ff_h263_get_gob_height(s); |
| 2967 | 587 |
| 903 | 588 // for hurry_up==5 |
| 589 s->current_picture.pict_type= s->pict_type; | |
| 6481 | 590 s->current_picture.key_frame= s->pict_type == FF_I_TYPE; |
|
845
32de034be20e
hurry_up>=5 -> skip everything except header & set pict_type&key_frame
michaelni
parents:
842
diff
changeset
|
591 |
| 2764 | 592 /* skip B-frames if we don't have reference frames */ |
| 6481 | 593 if(s->last_picture_ptr==NULL && (s->pict_type==FF_B_TYPE || s->dropable)) return get_consumed_bytes(s, buf_size); |
| 345 | 594 /* skip b frames if we are in a hurry */ |
| 6481 | 595 if(avctx->hurry_up && s->pict_type==FF_B_TYPE) return get_consumed_bytes(s, buf_size); |
| 596 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE) | |
| 597 || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE) | |
| 2967 | 598 || avctx->skip_frame >= AVDISCARD_ALL) |
| 2792 | 599 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
|
600 /* 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
|
601 if(avctx->hurry_up>=5) return get_consumed_bytes(s, buf_size); |
| 2967 | 602 |
| 454 | 603 if(s->next_p_frame_damaged){ |
| 6481 | 604 if(s->pict_type==FF_B_TYPE) |
| 655 | 605 return get_consumed_bytes(s, buf_size); |
| 454 | 606 else |
| 607 s->next_p_frame_damaged=0; | |
| 608 } | |
| 609 | |
| 6481 | 610 if((s->avctx->flags2 & CODEC_FLAG2_FAST) && s->pict_type==FF_B_TYPE){ |
|
3807
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3551
diff
changeset
|
611 s->me.qpel_put= s->dsp.put_2tap_qpel_pixels_tab; |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3551
diff
changeset
|
612 s->me.qpel_avg= s->dsp.avg_2tap_qpel_pixels_tab; |
| 6481 | 613 }else if((!s->no_rounding) || s->pict_type==FF_B_TYPE){ |
| 3926 | 614 s->me.qpel_put= s->dsp.put_qpel_pixels_tab; |
|
3807
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3551
diff
changeset
|
615 s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab; |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3551
diff
changeset
|
616 }else{ |
| 3926 | 617 s->me.qpel_put= s->dsp.put_no_rnd_qpel_pixels_tab; |
|
3807
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3551
diff
changeset
|
618 s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab; |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3551
diff
changeset
|
619 } |
|
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3551
diff
changeset
|
620 |
|
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
763
diff
changeset
|
621 if(MPV_frame_start(s, avctx) < 0) |
|
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
763
diff
changeset
|
622 return -1; |
| 0 | 623 |
|
9064
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
624 if (avctx->hwaccel) { |
|
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
625 if (avctx->hwaccel->start_frame(avctx, buf, buf_size) < 0) |
|
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
626 return -1; |
|
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
627 } |
|
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
628 |
| 0 | 629 #ifdef DEBUG |
| 3177 | 630 av_log(avctx, AV_LOG_DEBUG, "qscale=%d\n", s->qscale); |
| 0 | 631 #endif |
| 632 | |
| 1144 | 633 ff_er_frame_start(s); |
| 2967 | 634 |
| 1183 | 635 //the second part of the wmv2 header contains the MB skip bits which are stored in current_picture->mb_type |
| 5127 | 636 //which is not available before MPV_frame_start() |
|
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
637 if (CONFIG_WMV2_DECODER && s->msmpeg4_version==5){ |
| 5887 | 638 ret = ff_wmv2_decode_secondary_picture_header(s); |
| 639 if(ret<0) return ret; | |
| 640 if(ret==1) goto intrax8_decoded; | |
| 1183 | 641 } |
| 642 | |
| 0 | 643 /* decode each macroblock */ |
| 2967 | 644 s->mb_x=0; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
645 s->mb_y=0; |
| 2967 | 646 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
647 decode_slice(s); |
| 1183 | 648 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
|
649 if(s->msmpeg4_version){ |
| 4386 | 650 if(s->slice_height==0 || 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
|
651 break; |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
652 }else{ |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
653 if(ff_h263_resync(s)<0) |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
654 break; |
| 454 | 655 } |
| 2967 | 656 |
| 983 | 657 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
|
658 ff_mpeg4_clean_buffers(s); |
| 454 | 659 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
660 decode_slice(s); |
| 0 | 661 } |
| 756 | 662 |
| 6481 | 663 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==FF_I_TYPE) |
|
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
664 if(!CONFIG_MSMPEG4_DECODER || msmpeg4_decode_ext_header(s, buf_size) < 0){ |
| 903 | 665 s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR; |
| 666 } | |
| 2967 | 667 |
| 333 | 668 /* 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
|
669 if(s->codec_id==CODEC_ID_MPEG4 && s->bitstream_buffer_size==0 && s->divx_packed){ |
| 454 | 670 int current_pos= get_bits_count(&s->gb)>>3; |
| 1747 | 671 int startcode_found=0; |
| 2967 | 672 |
| 2422 | 673 if(buf_size - current_pos > 5){ |
| 454 | 674 int i; |
| 655 | 675 for(i=current_pos; i<buf_size-3; i++){ |
| 454 | 676 if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1 && buf[i+3]==0xB6){ |
| 677 startcode_found=1; | |
| 678 break; | |
| 679 } | |
| 680 } | |
| 1747 | 681 } |
| 682 if(s->gb.buffer == s->bitstream_buffer && buf_size>20){ //xvid style | |
| 683 startcode_found=1; | |
| 684 current_pos=0; | |
| 685 } | |
| 686 | |
| 687 if(startcode_found){ | |
| 2422 | 688 s->bitstream_buffer= av_fast_realloc( |
| 2967 | 689 s->bitstream_buffer, |
| 690 &s->allocated_bitstream_buffer_size, | |
| 2422 | 691 buf_size - current_pos + FF_INPUT_BUFFER_PADDING_SIZE); |
| 1747 | 692 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos); |
| 693 s->bitstream_buffer_size= buf_size - current_pos; | |
| 454 | 694 } |
| 695 } | |
| 696 | |
| 5887 | 697 intrax8_decoded: |
| 1144 | 698 ff_er_frame_end(s); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
699 |
| 9029 | 700 if (avctx->hwaccel) { |
| 701 if (avctx->hwaccel->end_frame(avctx) < 0) | |
| 702 return -1; | |
| 703 } | |
| 704 | |
| 0 | 705 MPV_frame_end(s); |
| 984 | 706 |
| 1285 | 707 assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type); |
| 708 assert(s->current_picture.pict_type == s->pict_type); | |
| 6481 | 709 if (s->pict_type == FF_B_TYPE || s->low_delay) { |
| 3185 | 710 *pict= *(AVFrame*)s->current_picture_ptr; |
| 711 } else if (s->last_picture_ptr != NULL) { | |
| 712 *pict= *(AVFrame*)s->last_picture_ptr; | |
| 713 } | |
| 714 | |
| 715 if(s->last_picture_ptr || s->low_delay){ | |
| 716 *data_size = sizeof(AVFrame); | |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1687
diff
changeset
|
717 ff_print_debug_info(s, pict); |
| 262 | 718 } |
| 931 | 719 |
| 231 | 720 /* Return the Picture timestamp as the frame number */ |
| 5963 | 721 /* we subtract 1 because it is added on utils.c */ |
| 231 | 722 avctx->frame_number = s->picture_number - 1; |
| 723 | |
| 384 | 724 #ifdef PRINT_FRAME_TIME |
|
4122
daae66c03857
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
3947
diff
changeset
|
725 av_log(avctx, AV_LOG_DEBUG, "%"PRId64"\n", rdtsc()-time); |
| 384 | 726 #endif |
|
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
727 |
| 655 | 728 return get_consumed_bytes(s, buf_size); |
| 0 | 729 } |
| 730 | |
| 67 | 731 AVCodec mpeg4_decoder = { |
| 732 "mpeg4", | |
| 0 | 733 CODEC_TYPE_VIDEO, |
| 67 | 734 CODEC_ID_MPEG4, |
| 0 | 735 sizeof(MpegEncContext), |
| 936 | 736 ff_h263_decode_init, |
| 0 | 737 NULL, |
| 936 | 738 ff_h263_decode_end, |
| 739 ff_h263_decode_frame, | |
| 2453 | 740 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
| 1368 | 741 .flush= ff_mpeg_flush, |
|
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6718
diff
changeset
|
742 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), |
| 9067 | 743 .pix_fmts= ff_hwaccel_pixfmt_list_420, |
| 0 | 744 }; |
| 745 | |
| 746 AVCodec h263_decoder = { | |
| 747 "h263", | |
| 748 CODEC_TYPE_VIDEO, | |
| 749 CODEC_ID_H263, | |
| 750 sizeof(MpegEncContext), | |
| 936 | 751 ff_h263_decode_init, |
| 0 | 752 NULL, |
| 936 | 753 ff_h263_decode_end, |
| 754 ff_h263_decode_frame, | |
| 2453 | 755 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
| 1368 | 756 .flush= ff_mpeg_flush, |
|
9083
bf274494b66e
Change a bunch of codec long_names to be more consistent and descriptive.
diego
parents:
9067
diff
changeset
|
757 .long_name= NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), |
| 9067 | 758 .pix_fmts= ff_hwaccel_pixfmt_list_420, |
| 0 | 759 }; |
| 760 | |
| 307 | 761 AVCodec msmpeg4v1_decoder = { |
| 762 "msmpeg4v1", | |
| 763 CODEC_TYPE_VIDEO, | |
| 764 CODEC_ID_MSMPEG4V1, | |
| 765 sizeof(MpegEncContext), | |
| 936 | 766 ff_h263_decode_init, |
| 307 | 767 NULL, |
| 936 | 768 ff_h263_decode_end, |
| 769 ff_h263_decode_frame, | |
| 553 | 770 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
|
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6718
diff
changeset
|
771 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"), |
| 9028 | 772 .pix_fmts= ff_pixfmt_list_420, |
| 307 | 773 }; |
| 774 | |
| 775 AVCodec msmpeg4v2_decoder = { | |
| 776 "msmpeg4v2", | |
| 777 CODEC_TYPE_VIDEO, | |
| 778 CODEC_ID_MSMPEG4V2, | |
| 779 sizeof(MpegEncContext), | |
| 936 | 780 ff_h263_decode_init, |
| 307 | 781 NULL, |
| 936 | 782 ff_h263_decode_end, |
| 783 ff_h263_decode_frame, | |
| 553 | 784 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
|
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6718
diff
changeset
|
785 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), |
| 9028 | 786 .pix_fmts= ff_pixfmt_list_420, |
| 307 | 787 }; |
| 788 | |
| 789 AVCodec msmpeg4v3_decoder = { | |
| 0 | 790 "msmpeg4", |
| 791 CODEC_TYPE_VIDEO, | |
| 307 | 792 CODEC_ID_MSMPEG4V3, |
| 0 | 793 sizeof(MpegEncContext), |
| 936 | 794 ff_h263_decode_init, |
| 0 | 795 NULL, |
| 936 | 796 ff_h263_decode_end, |
| 797 ff_h263_decode_frame, | |
| 553 | 798 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
|
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6718
diff
changeset
|
799 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), |
| 9028 | 800 .pix_fmts= ff_pixfmt_list_420, |
| 0 | 801 }; |
| 802 | |
| 311 | 803 AVCodec wmv1_decoder = { |
| 804 "wmv1", | |
| 805 CODEC_TYPE_VIDEO, | |
| 806 CODEC_ID_WMV1, | |
| 807 sizeof(MpegEncContext), | |
| 936 | 808 ff_h263_decode_init, |
| 311 | 809 NULL, |
| 936 | 810 ff_h263_decode_end, |
| 811 ff_h263_decode_frame, | |
| 553 | 812 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
|
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6718
diff
changeset
|
813 .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"), |
| 9028 | 814 .pix_fmts= ff_pixfmt_list_420, |
| 498 | 815 }; |
| 816 | |
| 0 | 817 AVCodec h263i_decoder = { |
| 818 "h263i", | |
| 819 CODEC_TYPE_VIDEO, | |
| 820 CODEC_ID_H263I, | |
| 821 sizeof(MpegEncContext), | |
| 936 | 822 ff_h263_decode_init, |
| 0 | 823 NULL, |
| 936 | 824 ff_h263_decode_end, |
| 825 ff_h263_decode_frame, | |
| 553 | 826 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
| 8672 | 827 .long_name = NULL_IF_CONFIG_SMALL("Intel H.263"), |
| 9028 | 828 .pix_fmts= ff_pixfmt_list_420, |
| 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, |
| 6713 | 840 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
|
9083
bf274494b66e
Change a bunch of codec long_names to be more consistent and descriptive.
diego
parents:
9067
diff
changeset
|
841 .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV)"), |
| 9028 | 842 .pix_fmts= ff_pixfmt_list_420, |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
843 }; |
