Mercurial > libavcodec.hg
annotate h263dec.c @ 11352:6e0af2cfdcfe libavcodec
Do MC and IDCT in coding (hilbert) order
This increases the slice size to 64 pixels, due to having to decode an
entire chroma superblock row per slice.
This can be up to 6% slower depending on clip and CPU, but is necessary
for future optimizations that gain significantly more than was lost.
author | conrad |
---|---|
date | Wed, 03 Mar 2010 23:27:40 +0000 |
parents | c66e0bc700dd |
children | 8a4984c5cacc |
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" | |
10828 | 32 #include "h263.h" |
4938 | 33 #include "h263_parser.h" |
4957
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4938
diff
changeset
|
34 #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
|
35 #include "msmpeg4.h" |
10509
cdf5b1ed3500
Add VDPAU hardware accelerated decoding for MPEG-4 ASP which can be used
cehoyos
parents:
10443
diff
changeset
|
36 #include "vdpau_internal.h" |
10788 | 37 #include "flv.h" |
10803 | 38 #include "mpeg4video.h" |
0 | 39 |
40 //#define DEBUG | |
384 | 41 //#define PRINT_FRAME_TIME |
0 | 42 |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6481
diff
changeset
|
43 av_cold int ff_h263_decode_init(AVCodecContext *avctx) |
0 | 44 { |
45 MpegEncContext *s = avctx->priv_data; | |
60 | 46 |
67 | 47 s->avctx = avctx; |
0 | 48 s->out_format = FMT_H263; |
49 | |
2270 | 50 s->width = avctx->coded_width; |
51 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
|
52 s->workaround_bugs= avctx->workaround_bugs; |
0 | 53 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
54 // set defaults |
1892 | 55 MPV_decode_defaults(s); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
56 s->quant_precision=5; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
57 s->decode_mb= ff_h263_decode_mb; |
924 | 58 s->low_delay= 1; |
9028 | 59 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
|
60 s->unrestricted_mv= 1; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
61 |
0 | 62 /* select sub codec */ |
63 switch(avctx->codec->id) { | |
64 case CODEC_ID_H263: | |
1639 | 65 s->unrestricted_mv= 0; |
9626
bd3e11b60ccd
Add a chroma_sample_location field to define positioning of chroma samples
conrad
parents:
9415
diff
changeset
|
66 avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; |
0 | 67 break; |
67 | 68 case CODEC_ID_MPEG4: |
0 | 69 break; |
307 | 70 case CODEC_ID_MSMPEG4V1: |
0 | 71 s->h263_msmpeg4 = 1; |
72 s->h263_pred = 1; | |
307 | 73 s->msmpeg4_version=1; |
74 break; | |
75 case CODEC_ID_MSMPEG4V2: | |
76 s->h263_msmpeg4 = 1; | |
77 s->h263_pred = 1; | |
78 s->msmpeg4_version=2; | |
79 break; | |
80 case CODEC_ID_MSMPEG4V3: | |
81 s->h263_msmpeg4 = 1; | |
82 s->h263_pred = 1; | |
83 s->msmpeg4_version=3; | |
0 | 84 break; |
311 | 85 case CODEC_ID_WMV1: |
86 s->h263_msmpeg4 = 1; | |
87 s->h263_pred = 1; | |
88 s->msmpeg4_version=4; | |
89 break; | |
498 | 90 case CODEC_ID_WMV2: |
91 s->h263_msmpeg4 = 1; | |
92 s->h263_pred = 1; | |
93 s->msmpeg4_version=5; | |
94 break; | |
3368
19620d64a239
Fix initialization of vc1_decoder (the same as wmv3_decoder).
kostya
parents:
3185
diff
changeset
|
95 case CODEC_ID_VC1: |
2474 | 96 case CODEC_ID_WMV3: |
97 s->h263_msmpeg4 = 1; | |
98 s->h263_pred = 1; | |
99 s->msmpeg4_version=6; | |
9626
bd3e11b60ccd
Add a chroma_sample_location field to define positioning of chroma samples
conrad
parents:
9415
diff
changeset
|
100 avctx->chroma_sample_location = AVCHROMA_LOC_LEFT; |
2474 | 101 break; |
0 | 102 case CODEC_ID_H263I: |
103 break; | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
104 case CODEC_ID_FLV1: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
105 s->h263_flv = 1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1338
diff
changeset
|
106 break; |
0 | 107 default: |
108 return -1; | |
109 } | |
344 | 110 s->codec_id= avctx->codec->id; |
9033 | 111 avctx->hwaccel= ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt); |
553 | 112 |
0 | 113 /* 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
|
114 if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4) |
144 | 115 if (MPV_common_init(s) < 0) |
116 return -1; | |
0 | 117 |
118 h263_decode_init_vlc(s); | |
2967 | 119 |
0 | 120 return 0; |
121 } | |
122 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6481
diff
changeset
|
123 av_cold int ff_h263_decode_end(AVCodecContext *avctx) |
0 | 124 { |
125 MpegEncContext *s = avctx->priv_data; | |
126 | |
127 MPV_common_end(s); | |
128 return 0; | |
129 } | |
130 | |
655 | 131 /** |
2764 | 132 * returns the number of bytes consumed for building the current frame |
655 | 133 */ |
134 static int get_consumed_bytes(MpegEncContext *s, int buf_size){ | |
135 int pos= (get_bits_count(&s->gb)+7)>>3; | |
2967 | 136 |
9027
3c141db76660
Approved hunk from the AVHWaccel patch by Gwenole Beauchesne.
michael
parents:
9012
diff
changeset
|
137 if(s->divx_packed || s->avctx->hwaccel){ |
655 | 138 //we would have to scan through the whole buf to handle the weird reordering ... |
2967 | 139 return buf_size; |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
140 }else if(s->flags&CODEC_FLAG_TRUNCATED){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
141 pos -= s->parse_context.last_index; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
142 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
|
143 return pos; |
655 | 144 }else{ |
5127 | 145 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...) |
658 | 146 if(pos+10>buf_size) pos=buf_size; // oops ;) |
655 | 147 |
148 return pos; | |
149 } | |
150 } | |
151 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
152 static int decode_slice(MpegEncContext *s){ |
1144 | 153 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; |
2261 | 154 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
|
155 s->last_resync_gb= s->gb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
156 s->first_slice_line= 1; |
2967 | 157 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
158 s->resync_mb_x= s->mb_x; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
159 s->resync_mb_y= s->mb_y; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
160 |
1652 | 161 ff_set_qscale(s, s->qscale); |
2967 | 162 |
9064
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
163 if (s->avctx->hwaccel) { |
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
164 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
|
165 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
|
166 skip_bits_long(&s->gb, 8*(end - start)); |
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
167 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
|
168 } |
9012
15a3df8c01fd
More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents:
8800
diff
changeset
|
169 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
170 if(s->partitioned_frame){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
171 const int qscale= s->qscale; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
172 |
10804
c03a8c6c755b
Add a few CONFIG_MPEG4_DECODER that should be there.
michael
parents:
10803
diff
changeset
|
173 if(CONFIG_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4){ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
174 if(ff_mpeg4_decode_partitions(s) < 0) |
2967 | 175 return -1; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
176 } |
2967 | 177 |
1427 | 178 /* restore variables which were modified */ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
179 s->first_slice_line=1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
180 s->mb_x= s->resync_mb_x; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
181 s->mb_y= s->resync_mb_y; |
1652 | 182 ff_set_qscale(s, qscale); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
183 } |
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 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
|
186 /* per-row end of slice checks */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
187 if(s->msmpeg4_version){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
188 if(s->resync_mb_y + s->slice_height == s->mb_y){ |
1144 | 189 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); |
190 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
191 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
192 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
193 } |
2967 | 194 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
195 if(s->msmpeg4_version==1){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
196 s->last_dc[0]= |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
197 s->last_dc[1]= |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
198 s->last_dc[2]= 128; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
199 } |
2967 | 200 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
201 ff_init_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
202 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
|
203 int ret; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
204 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
205 ff_update_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
206 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
207 if(s->resync_mb_x == s->mb_x && s->resync_mb_y+1 == s->mb_y){ |
2967 | 208 s->first_slice_line=0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
209 } |
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 /* DCT & quantize */ |
2967 | 212 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
213 s->mv_dir = MV_DIR_FORWARD; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
214 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
|
215 // s->mb_skipped = 0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
216 //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
|
217 ret= s->decode_mb(s, s->block); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
218 |
6481 | 219 if (s->pict_type!=FF_B_TYPE) |
1389 | 220 ff_h263_update_motion_val(s); |
221 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
222 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
|
223 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
|
224 if(ret==SLICE_END){ |
1338 | 225 MPV_decode_mb(s, s->block); |
1644 | 226 if(s->loop_filter) |
227 ff_h263_loop_filter(s); | |
1338 | 228 |
758 | 229 //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 | 230 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 | 231 |
232 s->padding_bug_score--; | |
2967 | 233 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
234 if(++s->mb_x >= s->mb_width){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
235 s->mb_x=0; |
2261 | 236 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
|
237 s->mb_y++; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
238 } |
2967 | 239 return 0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
240 }else if(ret==SLICE_NOEND){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
241 av_log(s->avctx, AV_LOG_ERROR, "Slice mismatch at MB: %d\n", xy); |
1144 | 242 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
|
243 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
244 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
245 av_log(s->avctx, AV_LOG_ERROR, "Error at MB: %d\n", xy); |
1144 | 246 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 | 247 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
248 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
249 } |
1338 | 250 |
251 MPV_decode_mb(s, s->block); | |
1644 | 252 if(s->loop_filter) |
253 ff_h263_loop_filter(s); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
254 } |
2967 | 255 |
2261 | 256 ff_draw_horiz_band(s, s->mb_y*mb_size, mb_size); |
2967 | 257 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
258 s->mb_x= 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
259 } |
2967 | 260 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
261 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
|
262 |
750 | 263 /* try to detect the padding bug */ |
264 if( s->codec_id==CODEC_ID_MPEG4 | |
2967 | 265 && (s->workaround_bugs&FF_BUG_AUTODETECT) |
10535
95f3daa991a2
Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents:
10509
diff
changeset
|
266 && get_bits_left(&s->gb) >=0 |
95f3daa991a2
Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents:
10509
diff
changeset
|
267 && get_bits_left(&s->gb) < 48 |
928
5627a7b7ce83
fixing playback of DaveMatthews_Crash_PocketPC.avi
michaelni
parents:
925
diff
changeset
|
268 // && !s->resync_marker |
750 | 269 && !s->data_partitioning){ |
2967 | 270 |
750 | 271 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
|
272 const int bits_left = s->gb.size_in_bits - bits_count; |
2967 | 273 |
1003 | 274 if(bits_left==0){ |
275 s->padding_bug_score+=16; | |
824 | 276 } else if(bits_left != 1){ |
750 | 277 int v= show_bits(&s->gb, 8); |
278 v|= 0x7F >> (7-(bits_count&7)); | |
824 | 279 |
2350 | 280 if(v==0x7F && bits_left<=8) |
750 | 281 s->padding_bug_score--; |
2350 | 282 else if(v==0x7F && ((get_bits_count(&s->gb)+8)&8) && bits_left<=16) |
283 s->padding_bug_score+= 4; | |
750 | 284 else |
2967 | 285 s->padding_bug_score++; |
286 } | |
750 | 287 } |
2967 | 288 |
2350 | 289 if(s->workaround_bugs&FF_BUG_AUTODETECT){ |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
290 if(s->padding_bug_score > -2 && !s->data_partitioning /*&& (s->divx_version>=0 || !s->resync_marker)*/) |
2350 | 291 s->workaround_bugs |= FF_BUG_NO_PADDING; |
292 else | |
293 s->workaround_bugs &= ~FF_BUG_NO_PADDING; | |
294 } | |
750 | 295 |
2764 | 296 // handle formats which don't have unique end markers |
1004 | 297 if(s->msmpeg4_version || (s->workaround_bugs&FF_BUG_NO_PADDING)){ //FIXME perhaps solve this more cleanly |
10535
95f3daa991a2
Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents:
10509
diff
changeset
|
298 int left= get_bits_left(&s->gb); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
299 int max_extra=7; |
2967 | 300 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
301 /* no markers in M$ crap */ |
6481 | 302 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
|
303 max_extra+= 17; |
2967 | 304 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
305 /* buggy padding but the frame should still end approximately at the bitstream end */ |
7831 | 306 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
|
307 max_extra+= 48; |
1004 | 308 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
|
309 max_extra+= 256*256*256*64; |
2967 | 310 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
311 if(left>max_extra){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
312 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
|
313 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
314 else if(left<0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
315 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
|
316 }else |
1144 | 317 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 | 318 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
319 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
320 } |
750 | 321 |
2967 | 322 av_log(s->avctx, AV_LOG_ERROR, "slice end not reached but screenspace end (%d left %06X, score= %d)\n", |
10535
95f3daa991a2
Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents:
10509
diff
changeset
|
323 get_bits_left(&s->gb), |
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
324 show_bits(&s->gb, 24), s->padding_bug_score); |
2967 | 325 |
1144 | 326 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); |
327 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
328 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
329 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
330 |
2967 | 331 int ff_h263_decode_frame(AVCodecContext *avctx, |
0 | 332 void *data, int *data_size, |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9083
diff
changeset
|
333 AVPacket *avpkt) |
0 | 334 { |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9083
diff
changeset
|
335 const uint8_t *buf = avpkt->data; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9083
diff
changeset
|
336 int buf_size = avpkt->size; |
0 | 337 MpegEncContext *s = avctx->priv_data; |
1453 | 338 int ret; |
2967 | 339 AVFrame *pict = data; |
340 | |
384 | 341 #ifdef PRINT_FRAME_TIME |
342 uint64_t time= rdtsc(); | |
343 #endif | |
485 | 344 s->flags= avctx->flags; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1747
diff
changeset
|
345 s->flags2= avctx->flags2; |
454 | 346 |
1372 | 347 /* no supplementary picture */ |
0 | 348 if (buf_size == 0) { |
1372 | 349 /* special case for last picture */ |
350 if (s->low_delay==0 && s->next_picture_ptr) { | |
351 *pict= *(AVFrame*)s->next_picture_ptr; | |
352 s->next_picture_ptr= NULL; | |
353 | |
354 *data_size = sizeof(AVFrame); | |
355 } | |
356 | |
0 | 357 return 0; |
358 } | |
1026 | 359 |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
360 if(s->flags&CODEC_FLAG_TRUNCATED){ |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
361 int next; |
2967 | 362 |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
363 if(CONFIG_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4){ |
1988 | 364 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
|
365 }else if(CONFIG_H263_DECODER && s->codec_id==CODEC_ID_H263){ |
4938 | 366 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
|
367 }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
|
368 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
|
369 return -1; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
370 } |
2967 | 371 |
4931
0d1cc37d9430
make some parser parameters const to avoid casting const to non-const
aurel
parents:
4636
diff
changeset
|
372 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
|
373 return buf_size; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
831
diff
changeset
|
374 } |
0 | 375 |
2967 | 376 |
763 | 377 retry: |
2967 | 378 |
1747 | 379 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
|
380 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size*8); |
353 | 381 }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
|
382 init_get_bits(&s->gb, buf, buf_size*8); |
465 | 383 s->bitstream_buffer_size=0; |
0 | 384 |
718 | 385 if (!s->context_initialized) { |
752
97077dd24bfa
fixing alt_scan for the first frame (variable was reset)
michaelni
parents:
750
diff
changeset
|
386 if (MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix |
718 | 387 return -1; |
388 } | |
2967 | 389 |
5127 | 390 /* We need to set current_picture_ptr before reading the header, |
391 * otherwise we cannot store anyting in there */ | |
1586 | 392 if(s->current_picture_ptr==NULL || s->current_picture_ptr->data[0]){ |
393 int i= ff_find_unused_picture(s, 0); | |
394 s->current_picture_ptr= &s->picture[i]; | |
395 } | |
2967 | 396 |
0 | 397 /* let's go :-) */ |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
398 if (CONFIG_WMV2_DECODER && s->msmpeg4_version==5) { |
936 | 399 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
|
400 } else if (CONFIG_MSMPEG4_DECODER && s->msmpeg4_version) { |
0 | 401 ret = msmpeg4_decode_picture_header(s); |
10792 | 402 } else if (CONFIG_MPEG4_DECODER && s->h263_pred) { |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
403 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
|
404 GetBitContext gb; |
2967 | 405 |
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
|
406 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
|
407 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
|
408 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
409 ret = ff_mpeg4_decode_picture_header(s, &s->gb); |
10792 | 410 } else if (CONFIG_H263I_DECODER && s->codec_id == CODEC_ID_H263I) { |
10791 | 411 ret = ff_intel_h263_decode_picture_header(s); |
10788 | 412 } else if (CONFIG_FLV_DECODER && s->h263_flv) { |
413 ret = ff_flv_decode_picture_header(s); | |
0 | 414 } else { |
415 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
|
416 } |
2967 | 417 |
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
|
418 if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_size); |
1393 | 419 |
420 /* skip if the header was thrashed */ | |
421 if (ret < 0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
422 av_log(s->avctx, AV_LOG_ERROR, "header damaged\n"); |
1393 | 423 return -1; |
424 } | |
2967 | 425 |
924 | 426 avctx->has_b_frames= !s->low_delay; |
2967 | 427 |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
428 if(s->xvid_build==-1 && s->divx_version==-1 && s->lavc_build==-1){ |
8612 | 429 if(s->stream_codec_tag == AV_RL32("XVID") || |
430 s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") || | |
431 s->codec_tag == AV_RL32("RMP4")) | |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
432 s->xvid_build= 0; |
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
433 #if 0 |
8612 | 434 if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==1 |
2967 | 435 && s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
436 s->xvid_build= 0; |
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
437 #endif |
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1457
diff
changeset
|
438 } |
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
439 |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
440 if(s->xvid_build==-1 && s->divx_version==-1 && s->lavc_build==-1){ |
8612 | 441 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
|
442 s->divx_version= 400; //divx 4 |
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
443 } |
2967 | 444 |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
445 if(s->xvid_build>=0 && s->divx_version>=0){ |
2299 | 446 s->divx_version= |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
447 s->divx_build= -1; |
2299 | 448 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
449 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
450 if(s->workaround_bugs&FF_BUG_AUTODETECT){ |
8612 | 451 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
|
452 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
|
453 |
8612 | 454 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
|
455 s->workaround_bugs|= FF_BUG_UMP4; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
456 } |
760 | 457 |
5136 | 458 if(s->divx_version>=500 && s->divx_build<1814){ |
760 | 459 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; |
460 } | |
761 | 461 |
5136 | 462 if(s->divx_version>502 && s->divx_build<1814){ |
1048 | 463 s->workaround_bugs|= FF_BUG_QPEL_CHROMA2; |
464 } | |
465 | |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
466 if(s->xvid_build<=3U) |
938
1e22655551b9
xvid build 3 still has the padding wrong in 1/8 of the cases :(((((
michaelni
parents:
936
diff
changeset
|
467 s->padding_bug_score= 256*256*256*64; |
2967 | 468 |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
469 if(s->xvid_build<=1U) |
761 | 470 s->workaround_bugs|= FF_BUG_QPEL_CHROMA; |
471 | |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
472 if(s->xvid_build<=12U) |
1420
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
473 s->workaround_bugs|= FF_BUG_EDGE; |
ff0220970711
xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents:
1393
diff
changeset
|
474 |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
475 if(s->xvid_build<=32U) |
2004 | 476 s->workaround_bugs|= FF_BUG_DC_CLIP; |
477 | |
984 | 478 #define SET_QPEL_FUNC(postfix1, postfix2) \ |
479 s->dsp.put_ ## postfix1 = ff_put_ ## postfix2;\ | |
480 s->dsp.put_no_rnd_ ## postfix1 = ff_put_no_rnd_ ## postfix2;\ | |
481 s->dsp.avg_ ## postfix1 = ff_avg_ ## postfix2; | |
482 | |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
483 if(s->lavc_build<4653U) |
984 | 484 s->workaround_bugs|= FF_BUG_STD_QPEL; |
2967 | 485 |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
486 if(s->lavc_build<4655U) |
1053
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
487 s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE; |
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
488 |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
489 if(s->lavc_build<4670U){ |
1366
80067f8d6770
fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
michaelni
parents:
1353
diff
changeset
|
490 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
|
491 } |
2967 | 492 |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
493 if(s->lavc_build<=4712U) |
2004 | 494 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
|
495 |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
496 if(s->divx_version>=0) |
1053
f07fd48c23d4
direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents:
1048
diff
changeset
|
497 s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE; |
750 | 498 //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
|
499 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
|
500 s->padding_bug_score= 256*256*256*64; |
1137 | 501 |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
502 if(s->divx_version<500U){ |
1137 | 503 s->workaround_bugs|= FF_BUG_EDGE; |
504 } | |
2967 | 505 |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
506 if(s->divx_version>=0) |
1916 | 507 s->workaround_bugs|= FF_BUG_HPEL_CHROMA; |
750 | 508 #if 0 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
509 if(s->divx_version==500) |
1088
bb27c685fc72
fixing padding bug autodetection for some rare files, closes bug #647941
michaelni
parents:
1064
diff
changeset
|
510 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
|
511 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
512 /* 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
|
513 * 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
|
514 */ |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
515 if( s->resync_marker==0 && s->data_partitioning==0 && s->divx_version==-1 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
516 && 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
|
517 s->workaround_bugs|= FF_BUG_NO_PADDING; |
2967 | 518 |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
519 if(s->lavc_build<4609U) //FIXME not sure about the version num but a 4609 file seems ok |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
520 s->workaround_bugs|= FF_BUG_NO_PADDING; |
750 | 521 #endif |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
522 } |
2967 | 523 |
984 | 524 if(s->workaround_bugs& FF_BUG_STD_QPEL){ |
525 SET_QPEL_FUNC(qpel_pixels_tab[0][ 5], qpel16_mc11_old_c) | |
526 SET_QPEL_FUNC(qpel_pixels_tab[0][ 7], qpel16_mc31_old_c) | |
527 SET_QPEL_FUNC(qpel_pixels_tab[0][ 9], qpel16_mc12_old_c) | |
528 SET_QPEL_FUNC(qpel_pixels_tab[0][11], qpel16_mc32_old_c) | |
529 SET_QPEL_FUNC(qpel_pixels_tab[0][13], qpel16_mc13_old_c) | |
530 SET_QPEL_FUNC(qpel_pixels_tab[0][15], qpel16_mc33_old_c) | |
531 | |
532 SET_QPEL_FUNC(qpel_pixels_tab[1][ 5], qpel8_mc11_old_c) | |
533 SET_QPEL_FUNC(qpel_pixels_tab[1][ 7], qpel8_mc31_old_c) | |
534 SET_QPEL_FUNC(qpel_pixels_tab[1][ 9], qpel8_mc12_old_c) | |
535 SET_QPEL_FUNC(qpel_pixels_tab[1][11], qpel8_mc32_old_c) | |
536 SET_QPEL_FUNC(qpel_pixels_tab[1][13], qpel8_mc13_old_c) | |
537 SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_old_c) | |
538 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
539 |
1457 | 540 if(avctx->debug & FF_DEBUG_BUGS) |
2967 | 541 av_log(s->avctx, AV_LOG_DEBUG, "bugs: %X lavc_build:%d xvid_build:%d divx_version:%d divx_build:%d %s\n", |
1457 | 542 s->workaround_bugs, s->lavc_build, s->xvid_build, s->divx_version, s->divx_build, |
543 s->divx_packed ? "p" : ""); | |
2967 | 544 |
585
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
545 #if 0 // dump bits per frame / qp / complexity |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
546 { |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
547 static FILE *f=NULL; |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
548 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
|
549 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
|
550 } |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
551 #endif |
2096 | 552 |
8590 | 553 #if HAVE_MMX |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
554 if(s->codec_id == CODEC_ID_MPEG4 && s->xvid_build>=0 && avctx->idct_algo == FF_IDCT_AUTO && (mm_flags & FF_MM_MMX)){ |
2869 | 555 avctx->idct_algo= FF_IDCT_XVIDMMX; |
2278 | 556 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
|
557 // 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
|
558 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
|
559 } |
2096 | 560 #endif |
561 | |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
562 /* After H263 & mpeg4 header decode we have the height, width,*/ |
160 | 563 /* and other parameters. So then we could init the picture */ |
564 /* FIXME: By the way H263 decoder is evolving it should have */ | |
565 /* an H263EncContext */ | |
2967 | 566 |
567 if ( s->width != avctx->coded_width | |
2270 | 568 || s->height != avctx->coded_height) { |
553 | 569 /* H.263 could change picture size any time */ |
1536 | 570 ParseContext pc= s->parse_context; //FIXME move these demuxng hack to avformat |
571 s->parse_context.buffer=0; | |
553 | 572 MPV_common_end(s); |
1536 | 573 s->parse_context= pc; |
553 | 574 } |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
575 if (!s->context_initialized) { |
2270 | 576 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
|
577 |
763 | 578 goto retry; |
0 | 579 } |
758 | 580 |
8800
8ec0175bbcb5
Initialize s->gob_index for Intel variant of H.263 too
kostya
parents:
8718
diff
changeset
|
581 if((s->codec_id==CODEC_ID_H263 || s->codec_id==CODEC_ID_H263P || s->codec_id == CODEC_ID_H263I)) |
758 | 582 s->gob_index = ff_h263_get_gob_height(s); |
2967 | 583 |
903 | 584 // for hurry_up==5 |
585 s->current_picture.pict_type= s->pict_type; | |
6481 | 586 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
|
587 |
2764 | 588 /* skip B-frames if we don't have reference frames */ |
6481 | 589 if(s->last_picture_ptr==NULL && (s->pict_type==FF_B_TYPE || s->dropable)) return get_consumed_bytes(s, buf_size); |
345 | 590 /* skip b frames if we are in a hurry */ |
6481 | 591 if(avctx->hurry_up && s->pict_type==FF_B_TYPE) return get_consumed_bytes(s, buf_size); |
592 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE) | |
593 || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE) | |
2967 | 594 || avctx->skip_frame >= AVDISCARD_ALL) |
2792 | 595 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
|
596 /* 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
|
597 if(avctx->hurry_up>=5) return get_consumed_bytes(s, buf_size); |
2967 | 598 |
454 | 599 if(s->next_p_frame_damaged){ |
6481 | 600 if(s->pict_type==FF_B_TYPE) |
655 | 601 return get_consumed_bytes(s, buf_size); |
454 | 602 else |
603 s->next_p_frame_damaged=0; | |
604 } | |
605 | |
6481 | 606 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
|
607 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
|
608 s->me.qpel_avg= s->dsp.avg_2tap_qpel_pixels_tab; |
6481 | 609 }else if((!s->no_rounding) || s->pict_type==FF_B_TYPE){ |
3926 | 610 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
|
611 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
|
612 }else{ |
3926 | 613 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
|
614 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
|
615 } |
6a40092eb9e6
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents:
3551
diff
changeset
|
616 |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
763
diff
changeset
|
617 if(MPV_frame_start(s, avctx) < 0) |
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
763
diff
changeset
|
618 return -1; |
0 | 619 |
10509
cdf5b1ed3500
Add VDPAU hardware accelerated decoding for MPEG-4 ASP which can be used
cehoyos
parents:
10443
diff
changeset
|
620 if (CONFIG_MPEG4_VDPAU_DECODER && (s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)) { |
11332
c66e0bc700dd
Pass correct buffer-pointer and buffer-size to hardware accelerated
cehoyos
parents:
11327
diff
changeset
|
621 ff_vdpau_mpeg4_decode_picture(s, s->gb.buffer, s->gb.buffer_end - s->gb.buffer); |
10509
cdf5b1ed3500
Add VDPAU hardware accelerated decoding for MPEG-4 ASP which can be used
cehoyos
parents:
10443
diff
changeset
|
622 goto frame_end; |
cdf5b1ed3500
Add VDPAU hardware accelerated decoding for MPEG-4 ASP which can be used
cehoyos
parents:
10443
diff
changeset
|
623 } |
cdf5b1ed3500
Add VDPAU hardware accelerated decoding for MPEG-4 ASP which can be used
cehoyos
parents:
10443
diff
changeset
|
624 |
9064
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
625 if (avctx->hwaccel) { |
11332
c66e0bc700dd
Pass correct buffer-pointer and buffer-size to hardware accelerated
cehoyos
parents:
11327
diff
changeset
|
626 if (avctx->hwaccel->start_frame(avctx, s->gb.buffer, s->gb.buffer_end - s->gb.buffer) < 0) |
9064
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
627 return -1; |
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
628 } |
ca19176df986
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents:
9033
diff
changeset
|
629 |
1144 | 630 ff_er_frame_start(s); |
2967 | 631 |
1183 | 632 //the second part of the wmv2 header contains the MB skip bits which are stored in current_picture->mb_type |
5127 | 633 //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
|
634 if (CONFIG_WMV2_DECODER && s->msmpeg4_version==5){ |
5887 | 635 ret = ff_wmv2_decode_secondary_picture_header(s); |
636 if(ret<0) return ret; | |
637 if(ret==1) goto intrax8_decoded; | |
1183 | 638 } |
639 | |
0 | 640 /* decode each macroblock */ |
2967 | 641 s->mb_x=0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
642 s->mb_y=0; |
2967 | 643 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
644 decode_slice(s); |
1183 | 645 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
|
646 if(s->msmpeg4_version){ |
4386 | 647 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
|
648 break; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
649 }else{ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
650 if(ff_h263_resync(s)<0) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
651 break; |
454 | 652 } |
2967 | 653 |
983 | 654 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
|
655 ff_mpeg4_clean_buffers(s); |
454 | 656 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
657 decode_slice(s); |
0 | 658 } |
756 | 659 |
6481 | 660 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
|
661 if(!CONFIG_MSMPEG4_DECODER || msmpeg4_decode_ext_header(s, buf_size) < 0){ |
903 | 662 s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR; |
663 } | |
2967 | 664 |
10760
c199eb2ad4ec
It appears s->bitstream_buffer_size has to be 0 at the end so rather use assert.
michael
parents:
10535
diff
changeset
|
665 assert(s->bitstream_buffer_size==0); |
11327 | 666 frame_end: |
333 | 667 /* divx 5.01+ bistream reorder stuff */ |
10760
c199eb2ad4ec
It appears s->bitstream_buffer_size has to be 0 at the end so rather use assert.
michael
parents:
10535
diff
changeset
|
668 if(s->codec_id==CODEC_ID_MPEG4 && s->divx_packed){ |
454 | 669 int current_pos= get_bits_count(&s->gb)>>3; |
1747 | 670 int startcode_found=0; |
2967 | 671 |
2422 | 672 if(buf_size - current_pos > 5){ |
454 | 673 int i; |
655 | 674 for(i=current_pos; i<buf_size-3; i++){ |
454 | 675 if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1 && buf[i+3]==0xB6){ |
676 startcode_found=1; | |
677 break; | |
678 } | |
679 } | |
1747 | 680 } |
11098
77b3f322dba8
Change xvid/divx/lavc build variables to be consistent to x264_build.
michael
parents:
10828
diff
changeset
|
681 if(s->gb.buffer == s->bitstream_buffer && buf_size>7 && s->xvid_build>=0){ //xvid style |
1747 | 682 startcode_found=1; |
683 current_pos=0; | |
684 } | |
685 | |
686 if(startcode_found){ | |
9415
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9355
diff
changeset
|
687 av_fast_malloc( |
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9355
diff
changeset
|
688 &s->bitstream_buffer, |
2967 | 689 &s->allocated_bitstream_buffer_size, |
2422 | 690 buf_size - current_pos + FF_INPUT_BUFFER_PADDING_SIZE); |
9415
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9355
diff
changeset
|
691 if (!s->bitstream_buffer) |
141badec76fc
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents:
9355
diff
changeset
|
692 return AVERROR(ENOMEM); |
1747 | 693 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos); |
694 s->bitstream_buffer_size= buf_size - current_pos; | |
454 | 695 } |
696 } | |
697 | |
5887 | 698 intrax8_decoded: |
1144 | 699 ff_er_frame_end(s); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
700 |
9029 | 701 if (avctx->hwaccel) { |
702 if (avctx->hwaccel->end_frame(avctx) < 0) | |
703 return -1; | |
704 } | |
705 | |
0 | 706 MPV_frame_end(s); |
984 | 707 |
1285 | 708 assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type); |
709 assert(s->current_picture.pict_type == s->pict_type); | |
6481 | 710 if (s->pict_type == FF_B_TYPE || s->low_delay) { |
3185 | 711 *pict= *(AVFrame*)s->current_picture_ptr; |
712 } else if (s->last_picture_ptr != NULL) { | |
713 *pict= *(AVFrame*)s->last_picture_ptr; | |
714 } | |
715 | |
716 if(s->last_picture_ptr || s->low_delay){ | |
717 *data_size = sizeof(AVFrame); | |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1687
diff
changeset
|
718 ff_print_debug_info(s, pict); |
262 | 719 } |
931 | 720 |
384 | 721 #ifdef PRINT_FRAME_TIME |
4122
daae66c03857
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
3947
diff
changeset
|
722 av_log(avctx, AV_LOG_DEBUG, "%"PRId64"\n", rdtsc()-time); |
384 | 723 #endif |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1219
diff
changeset
|
724 |
655 | 725 return get_consumed_bytes(s, buf_size); |
0 | 726 } |
727 | |
728 AVCodec h263_decoder = { | |
729 "h263", | |
730 CODEC_TYPE_VIDEO, | |
731 CODEC_ID_H263, | |
732 sizeof(MpegEncContext), | |
936 | 733 ff_h263_decode_init, |
0 | 734 NULL, |
936 | 735 ff_h263_decode_end, |
736 ff_h263_decode_frame, | |
2453 | 737 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
1368 | 738 .flush= ff_mpeg_flush, |
9083
bf274494b66e
Change a bunch of codec long_names to be more consistent and descriptive.
diego
parents:
9067
diff
changeset
|
739 .long_name= NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), |
9067 | 740 .pix_fmts= ff_hwaccel_pixfmt_list_420, |
0 | 741 }; |