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