annotate h263dec.c @ 9896:bbefbca72722 libavcodec

Drop code that attempts to decode frames that are prefixed by junk. Too often it ends up decoding random data into noise without detecting it (for example after seeking of some MP3 data with oddly often occurring startcode emulation). Fixes issue1154.
author michael
date Tue, 30 Jun 2009 03:57:27 +0000
parents 67f917b48068
children 6b229807a182
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1098
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
16 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
17 *
429
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
21 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
22
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1098
diff changeset
23 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8672
diff changeset
24 * @file libavcodec/h263dec.c
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1098
diff changeset
25 * H.263 decoder.
1e39f273ecd6 per file doxy
michaelni
parents: 1098
diff changeset
26 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
30 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
31 #include "mpegvideo.h"
4938
ee6c1ce06470 Move H.263 parser to its own file.
diego
parents: 4931
diff changeset
32 #include "h263_parser.h"
4957
3fcb2f0d9ef1 move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents: 4938
diff changeset
33 #include "mpeg4video_parser.h"
4967
6d45158e0249 disable reference to msmpeg4 and wmv2 code when those codecs are not compiled in
aurel
parents: 4957
diff changeset
34 #include "msmpeg4.h"
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
35
986e461dc072 Initial revision
glantau
parents:
diff changeset
36 //#define DEBUG
384
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
37 //#define PRINT_FRAME_TIME
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
38
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
39 av_cold int ff_h263_decode_init(AVCodecContext *avctx)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
40 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
41 MpegEncContext *s = avctx->priv_data;
60
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
42
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
43 s->avctx = avctx;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
44 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
45
2270
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2266
diff changeset
46 s->width = avctx->coded_width;
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2266
diff changeset
47 s->height = avctx->coded_height;
411
5c8b3a717929 workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents: 396
diff changeset
48 s->workaround_bugs= avctx->workaround_bugs;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
49
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
50 // set defaults
1892
5ac49e7a1b8f init cleanup
michael
parents: 1754
diff changeset
51 MPV_decode_defaults(s);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
52 s->quant_precision=5;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
53 s->decode_mb= ff_h263_decode_mb;
924
3814e9115672 cleanup / messup?
michaelni
parents: 921
diff changeset
54 s->low_delay= 1;
9028
0f95e4f0a3f5 Add and use ff_pixfmt_list_420.
michael
parents: 9027
diff changeset
55 avctx->pix_fmt= avctx->get_format(avctx, avctx->codec->pix_fmts);
1542
576861d6343a emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents: 1536
diff changeset
56 s->unrestricted_mv= 1;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
57
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
58 /* select sub codec */
986e461dc072 Initial revision
glantau
parents:
diff changeset
59 switch(avctx->codec->id) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
60 case CODEC_ID_H263:
1639
3e2b774edce4 rv20 decoder
michael
parents: 1598
diff changeset
61 s->unrestricted_mv= 0;
9626
bd3e11b60ccd Add a chroma_sample_location field to define positioning of chroma samples
conrad
parents: 9415
diff changeset
62 avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
63 break;
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
64 case CODEC_ID_MPEG4:
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1644
diff changeset
65 s->decode_mb= ff_mpeg4_decode_mb;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
66 s->time_increment_bits = 4; /* default value for broken headers */
986e461dc072 Initial revision
glantau
parents:
diff changeset
67 s->h263_pred = 1;
924
3814e9115672 cleanup / messup?
michaelni
parents: 921
diff changeset
68 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
69 avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
70 break;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
71 case CODEC_ID_MSMPEG4V1:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
72 s->h263_msmpeg4 = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
73 s->h263_pred = 1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
74 s->msmpeg4_version=1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
75 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
76 case CODEC_ID_MSMPEG4V2:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
77 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
78 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
79 s->msmpeg4_version=2;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
80 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
81 case CODEC_ID_MSMPEG4V3:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
82 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
83 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
84 s->msmpeg4_version=3;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
85 break;
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
86 case CODEC_ID_WMV1:
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
87 s->h263_msmpeg4 = 1;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
88 s->h263_pred = 1;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
89 s->msmpeg4_version=4;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
90 break;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
91 case CODEC_ID_WMV2:
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
92 s->h263_msmpeg4 = 1;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
93 s->h263_pred = 1;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
94 s->msmpeg4_version=5;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
95 break;
3368
19620d64a239 Fix initialization of vc1_decoder (the same as wmv3_decoder).
kostya
parents: 3185
diff changeset
96 case CODEC_ID_VC1:
2474
81a9f883a17a In that patch:
michael
parents: 2453
diff changeset
97 case CODEC_ID_WMV3:
81a9f883a17a In that patch:
michael
parents: 2453
diff changeset
98 s->h263_msmpeg4 = 1;
81a9f883a17a In that patch:
michael
parents: 2453
diff changeset
99 s->h263_pred = 1;
81a9f883a17a In that patch:
michael
parents: 2453
diff changeset
100 s->msmpeg4_version=6;
9626
bd3e11b60ccd Add a chroma_sample_location field to define positioning of chroma samples
conrad
parents: 9415
diff changeset
101 avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
2474
81a9f883a17a In that patch:
michael
parents: 2453
diff changeset
102 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
103 case CODEC_ID_H263I:
986e461dc072 Initial revision
glantau
parents:
diff changeset
104 break;
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1338
diff changeset
105 case CODEC_ID_FLV1:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1338
diff changeset
106 s->h263_flv = 1;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1338
diff changeset
107 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
108 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
109 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
110 }
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
111 s->codec_id= avctx->codec->id;
9033
bcf716c58be4 add ff_find_hwaccel() by Gwenole Beauchesne
michael
parents: 9029
diff changeset
112 avctx->hwaccel= ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
113
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
114 /* 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
115 if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4)
144
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 67
diff changeset
116 if (MPV_common_init(s) < 0)
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 67
diff changeset
117 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
118
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
119 if (CONFIG_MSMPEG4_DECODER && s->h263_msmpeg4)
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
120 ff_msmpeg4_decode_init(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
121 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
122 h263_decode_init_vlc(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
123
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
124 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
125 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
126
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
127 av_cold int ff_h263_decode_end(AVCodecContext *avctx)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
128 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
129 MpegEncContext *s = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
130
986e461dc072 Initial revision
glantau
parents:
diff changeset
131 MPV_common_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
132 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
133 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
134
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
135 /**
2764
2b37bcabe608 spelling fixes
diego
parents: 2632
diff changeset
136 * returns the number of bytes consumed for building the current frame
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
137 */
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
138 static int get_consumed_bytes(MpegEncContext *s, int buf_size){
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
139 int pos= (get_bits_count(&s->gb)+7)>>3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
140
9027
3c141db76660 Approved hunk from the AVHWaccel patch by Gwenole Beauchesne.
michael
parents: 9012
diff changeset
141 if(s->divx_packed || s->avctx->hwaccel){
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
142 //we would have to scan through the whole buf to handle the weird reordering ...
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
143 return buf_size;
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
144 }else if(s->flags&CODEC_FLAG_TRUNCATED){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
145 pos -= s->parse_context.last_index;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
146 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
147 return pos;
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
148 }else{
5127
4dbe6578f811 misc spelling fixes
diego
parents: 4967
diff changeset
149 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...)
658
dc8df8792a24 avoid nonsense frame-skip messages
michaelni
parents: 657
diff changeset
150 if(pos+10>buf_size) pos=buf_size; // oops ;)
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
151
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
152 return pos;
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
153 }
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
154 }
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
155
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
156 static int decode_slice(MpegEncContext *s){
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1138
diff changeset
157 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
2261
bd09f4d1976f lowres slice fix
michael
parents: 2096
diff changeset
158 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
159 s->last_resync_gb= s->gb;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
160 s->first_slice_line= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
161
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
162 s->resync_mb_x= s->mb_x;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
163 s->resync_mb_y= s->mb_y;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
164
1652
834922115010 cleanup
michael
parents: 1651
diff changeset
165 ff_set_qscale(s, s->qscale);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
166
9064
ca19176df986 Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents: 9033
diff changeset
167 if (s->avctx->hwaccel) {
ca19176df986 Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents: 9033
diff changeset
168 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
169 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
170 skip_bits_long(&s->gb, 8*(end - start));
ca19176df986 Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents: 9033
diff changeset
171 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
172 }
9012
15a3df8c01fd More approved hunks for VAAPI & our new and cleaner hwaccel API.
michael
parents: 8800
diff changeset
173
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
174 if(s->partitioned_frame){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
175 const int qscale= s->qscale;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
176
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
177 if(s->codec_id==CODEC_ID_MPEG4){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
178 if(ff_mpeg4_decode_partitions(s) < 0)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
179 return -1;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
180 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
181
1427
3a6d613c88d8 spelling fix
bellard
parents: 1420
diff changeset
182 /* restore variables which were modified */
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
183 s->first_slice_line=1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
184 s->mb_x= s->resync_mb_x;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
185 s->mb_y= s->resync_mb_y;
1652
834922115010 cleanup
michael
parents: 1651
diff changeset
186 ff_set_qscale(s, qscale);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
187 }
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 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
190 /* per-row end of slice checks */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
191 if(s->msmpeg4_version){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
192 if(s->resync_mb_y + s->slice_height == s->mb_y){
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1138
diff changeset
193 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);
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1138
diff changeset
194
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
195 return 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
196 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
197 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
198
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
199 if(s->msmpeg4_version==1){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
200 s->last_dc[0]=
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
201 s->last_dc[1]=
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
202 s->last_dc[2]= 128;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
203 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
204
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
205 ff_init_block_index(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
206 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
207 int ret;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
208
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
209 ff_update_block_index(s);
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 if(s->resync_mb_x == s->mb_x && s->resync_mb_y+1 == s->mb_y){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
212 s->first_slice_line=0;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
213 }
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 /* DCT & quantize */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
216
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
217 s->mv_dir = MV_DIR_FORWARD;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
218 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
219 // s->mb_skipped = 0;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
220 //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
221 ret= s->decode_mb(s, s->block);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
222
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6453
diff changeset
223 if (s->pict_type!=FF_B_TYPE)
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1372
diff changeset
224 ff_h263_update_motion_val(s);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1372
diff changeset
225
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
226 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
227 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
228 if(ret==SLICE_END){
1338
e0e5483c32c5 fix last_block_index<=0 bug
michaelni
parents: 1285
diff changeset
229 MPV_decode_mb(s, s->block);
1644
835cf346975e h263 loop filter
michael
parents: 1639
diff changeset
230 if(s->loop_filter)
835cf346975e h263 loop filter
michael
parents: 1639
diff changeset
231 ff_h263_loop_filter(s);
1338
e0e5483c32c5 fix last_block_index<=0 bug
michaelni
parents: 1285
diff changeset
232
758
cca620e89cf0 fixing h263 slice decoding (again)
michaelni
parents: 756
diff changeset
233 //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
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1138
diff changeset
234 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
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
235
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
236 s->padding_bug_score--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
237
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
238 if(++s->mb_x >= s->mb_width){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
239 s->mb_x=0;
2261
bd09f4d1976f lowres slice fix
michael
parents: 2096
diff changeset
240 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
241 s->mb_y++;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
242 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
243 return 0;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
244 }else if(ret==SLICE_NOEND){
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, "Slice mismatch at MB: %d\n", xy);
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1138
diff changeset
246 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
247 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
248 }
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
249 av_log(s->avctx, AV_LOG_ERROR, "Error at MB: %d\n", xy);
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1138
diff changeset
250 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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
251
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
252 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
253 }
1338
e0e5483c32c5 fix last_block_index<=0 bug
michaelni
parents: 1285
diff changeset
254
e0e5483c32c5 fix last_block_index<=0 bug
michaelni
parents: 1285
diff changeset
255 MPV_decode_mb(s, s->block);
1644
835cf346975e h263 loop filter
michael
parents: 1639
diff changeset
256 if(s->loop_filter)
835cf346975e h263 loop filter
michael
parents: 1639
diff changeset
257 ff_h263_loop_filter(s);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
258 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
259
2261
bd09f4d1976f lowres slice fix
michael
parents: 2096
diff changeset
260 ff_draw_horiz_band(s, s->mb_y*mb_size, mb_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
261
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
262 s->mb_x= 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
263 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
264
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
265 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
266
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
267 /* try to detect the padding bug */
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
268 if( s->codec_id==CODEC_ID_MPEG4
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
269 && (s->workaround_bugs&FF_BUG_AUTODETECT)
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1004
diff changeset
270 && s->gb.size_in_bits - get_bits_count(&s->gb) >=0
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1004
diff changeset
271 && s->gb.size_in_bits - get_bits_count(&s->gb) < 48
928
5627a7b7ce83 fixing playback of DaveMatthews_Crash_PocketPC.avi
michaelni
parents: 925
diff changeset
272 // && !s->resync_marker
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
273 && !s->data_partitioning){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
274
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
275 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
276 const int bits_left = s->gb.size_in_bits - bits_count;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
277
1003
c2c116876fd7 better padding/stuffing bug autodetection
michaelni
parents: 984
diff changeset
278 if(bits_left==0){
c2c116876fd7 better padding/stuffing bug autodetection
michaelni
parents: 984
diff changeset
279 s->padding_bug_score+=16;
824
371ef113d984 better padding bug detection
michaelni
parents: 822
diff changeset
280 } else if(bits_left != 1){
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
281 int v= show_bits(&s->gb, 8);
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
282 v|= 0x7F >> (7-(bits_count&7));
824
371ef113d984 better padding bug detection
michaelni
parents: 822
diff changeset
283
2350
b25bf309cbc4 automatic workaround for another padding bug
michael
parents: 2299
diff changeset
284 if(v==0x7F && bits_left<=8)
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
285 s->padding_bug_score--;
2350
b25bf309cbc4 automatic workaround for another padding bug
michael
parents: 2299
diff changeset
286 else if(v==0x7F && ((get_bits_count(&s->gb)+8)&8) && bits_left<=16)
b25bf309cbc4 automatic workaround for another padding bug
michael
parents: 2299
diff changeset
287 s->padding_bug_score+= 4;
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
288 else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
289 s->padding_bug_score++;
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
290 }
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
291 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
292
2350
b25bf309cbc4 automatic workaround for another padding bug
michael
parents: 2299
diff changeset
293 if(s->workaround_bugs&FF_BUG_AUTODETECT){
2411
0427eb3579b6 fix decoding of http://mplayerhq.hu/~diego/problem.mov
michael
parents: 2350
diff changeset
294 if(s->padding_bug_score > -2 && !s->data_partitioning /*&& (s->divx_version || !s->resync_marker)*/)
2350
b25bf309cbc4 automatic workaround for another padding bug
michael
parents: 2299
diff changeset
295 s->workaround_bugs |= FF_BUG_NO_PADDING;
b25bf309cbc4 automatic workaround for another padding bug
michael
parents: 2299
diff changeset
296 else
b25bf309cbc4 automatic workaround for another padding bug
michael
parents: 2299
diff changeset
297 s->workaround_bugs &= ~FF_BUG_NO_PADDING;
b25bf309cbc4 automatic workaround for another padding bug
michael
parents: 2299
diff changeset
298 }
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
299
2764
2b37bcabe608 spelling fixes
diego
parents: 2632
diff changeset
300 // handle formats which don't have unique end markers
1004
3b9c2ac59ec4 padding bug autodetection improvement 2nd try
michaelni
parents: 1003
diff changeset
301 if(s->msmpeg4_version || (s->workaround_bugs&FF_BUG_NO_PADDING)){ //FIXME perhaps solve this more cleanly
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1004
diff changeset
302 int left= s->gb.size_in_bits - get_bits_count(&s->gb);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
303 int max_extra=7;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
304
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
305 /* no markers in M$ crap */
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6453
diff changeset
306 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
307 max_extra+= 17;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
308
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
309 /* buggy padding but the frame should still end approximately at the bitstream end */
7831
8195c970d077 Rename error_resilience to error_recognition.
michael
parents: 7377
diff changeset
310 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
311 max_extra+= 48;
1004
3b9c2ac59ec4 padding bug autodetection improvement 2nd try
michaelni
parents: 1003
diff changeset
312 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
313 max_extra+= 256*256*256*64;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
314
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
315 if(left>max_extra){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
316 av_log(s->avctx, AV_LOG_ERROR, "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
317 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
318 else if(left<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
319 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
320 }else
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1138
diff changeset
321 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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
322
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
323 return 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
324 }
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
325
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
326 av_log(s->avctx, AV_LOG_ERROR, "slice end not reached but screenspace end (%d left %06X, score= %d)\n",
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1004
diff changeset
327 s->gb.size_in_bits - get_bits_count(&s->gb),
1420
ff0220970711 xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents: 1393
diff changeset
328 show_bits(&s->gb, 24), s->padding_bug_score);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
329
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1138
diff changeset
330 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);
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1138
diff changeset
331
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
332 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
333 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
334
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
335 int ff_h263_decode_frame(AVCodecContext *avctx,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
336 void *data, int *data_size,
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9083
diff changeset
337 AVPacket *avpkt)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
338 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9083
diff changeset
339 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9083
diff changeset
340 int buf_size = avpkt->size;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
341 MpegEncContext *s = avctx->priv_data;
1453
20a79b0e6d2a removed warnings
bellard
parents: 1427
diff changeset
342 int ret;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
343 AVFrame *pict = data;
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
344
384
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
345 #ifdef PRINT_FRAME_TIME
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
346 uint64_t time= rdtsc();
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
347 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
348 #ifdef DEBUG
3551
b0953f642148 printf -> av_log, only occurs in DEBUG cases
melanson
parents: 3455
diff changeset
349 av_log(avctx, AV_LOG_DEBUG, "*****frame %d size=%d\n", avctx->frame_number, buf_size);
4636
5bcb6208ac58 Corrections so that builds with DEBUG work
mbardiaux
parents: 4386
diff changeset
350 if(buf_size>0)
5bcb6208ac58 Corrections so that builds with DEBUG work
mbardiaux
parents: 4386
diff changeset
351 av_log(avctx, AV_LOG_DEBUG, "bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
352 #endif
485
20108840b0e5 grayscale only decoding
michaelni
parents: 465
diff changeset
353 s->flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1747
diff changeset
354 s->flags2= avctx->flags2;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
355
1372
b52e62d17bbb last frame decoding fix
michaelni
parents: 1368
diff changeset
356 /* no supplementary picture */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
357 if (buf_size == 0) {
1372
b52e62d17bbb last frame decoding fix
michaelni
parents: 1368
diff changeset
358 /* special case for last picture */
b52e62d17bbb last frame decoding fix
michaelni
parents: 1368
diff changeset
359 if (s->low_delay==0 && s->next_picture_ptr) {
b52e62d17bbb last frame decoding fix
michaelni
parents: 1368
diff changeset
360 *pict= *(AVFrame*)s->next_picture_ptr;
b52e62d17bbb last frame decoding fix
michaelni
parents: 1368
diff changeset
361 s->next_picture_ptr= NULL;
b52e62d17bbb last frame decoding fix
michaelni
parents: 1368
diff changeset
362
b52e62d17bbb last frame decoding fix
michaelni
parents: 1368
diff changeset
363 *data_size = sizeof(AVFrame);
b52e62d17bbb last frame decoding fix
michaelni
parents: 1368
diff changeset
364 }
b52e62d17bbb last frame decoding fix
michaelni
parents: 1368
diff changeset
365
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
366 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
367 }
1026
d6ba0641cc36 cleanup
michaelni
parents: 1025
diff changeset
368
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
369 if(s->flags&CODEC_FLAG_TRUNCATED){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
370 int next;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
371
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
372 if(CONFIG_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4){
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1939
diff changeset
373 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
374 }else if(CONFIG_H263_DECODER && s->codec_id==CODEC_ID_H263){
4938
ee6c1ce06470 Move H.263 parser to its own file.
diego
parents: 4931
diff changeset
375 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
376 }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
377 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
378 return -1;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
379 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
380
4931
0d1cc37d9430 make some parser parameters const to avoid casting const to non-const
aurel
parents: 4636
diff changeset
381 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
382 return buf_size;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
383 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
384
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
385
763
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 761
diff changeset
386 retry:
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
387
1747
8cfd36bfe504 xvid "packed" stuff support
michael
parents: 1739
diff changeset
388 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
389 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size*8);
353
386f430e93f4 freeze fix
michaelni
parents: 350
diff changeset
390 }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
391 init_get_bits(&s->gb, buf, buf_size*8);
465
76c8afc9c1eb 100l divx501+ seeking bugfix
michaelni
parents: 454
diff changeset
392 s->bitstream_buffer_size=0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
393
718
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
394 if (!s->context_initialized) {
752
97077dd24bfa fixing alt_scan for the first frame (variable was reset)
michaelni
parents: 750
diff changeset
395 if (MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix
718
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
396 return -1;
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
397 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
398
5127
4dbe6578f811 misc spelling fixes
diego
parents: 4967
diff changeset
399 /* We need to set current_picture_ptr before reading the header,
4dbe6578f811 misc spelling fixes
diego
parents: 4967
diff changeset
400 * otherwise we cannot store anyting in there */
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1548
diff changeset
401 if(s->current_picture_ptr==NULL || s->current_picture_ptr->data[0]){
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1548
diff changeset
402 int i= ff_find_unused_picture(s, 0);
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1548
diff changeset
403 s->current_picture_ptr= &s->picture[i];
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1548
diff changeset
404 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
405
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
406 /* let's go :-) */
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
407 if (CONFIG_WMV2_DECODER && s->msmpeg4_version==5) {
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
408 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
409 } else if (CONFIG_MSMPEG4_DECODER && s->msmpeg4_version) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
410 ret = msmpeg4_decode_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
411 } 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
412 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
413 GetBitContext gb;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
414
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
415 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
416 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
417 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
418 ret = ff_mpeg4_decode_picture_header(s, &s->gb);
1687
cdc3d4106fb6 cleanup
michael
parents: 1661
diff changeset
419 } else if (s->codec_id == CODEC_ID_H263I) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
420 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
421 } else if (s->h263_flv) {
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1338
diff changeset
422 ret = flv_h263_decode_picture_header(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
423 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
424 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
425 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
426
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
427 if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_size);
1393
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
428
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
429 /* skip if the header was thrashed */
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
430 if (ret < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
431 av_log(s->avctx, AV_LOG_ERROR, "header damaged\n");
1393
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
432 return -1;
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
433 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
434
924
3814e9115672 cleanup / messup?
michaelni
parents: 921
diff changeset
435 avctx->has_b_frames= !s->low_delay;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
436
1420
ff0220970711 xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents: 1393
diff changeset
437 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){
8612
b20c590170cc remove ff_get_fourcc() and use AV_RL32() instead
aurel
parents: 8596
diff changeset
438 if(s->stream_codec_tag == AV_RL32("XVID") ||
b20c590170cc remove ff_get_fourcc() and use AV_RL32() instead
aurel
parents: 8596
diff changeset
439 s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") ||
b20c590170cc remove ff_get_fourcc() and use AV_RL32() instead
aurel
parents: 8596
diff changeset
440 s->codec_tag == AV_RL32("RMP4"))
1420
ff0220970711 xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents: 1393
diff changeset
441 s->xvid_build= -1;
1458
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1457
diff changeset
442 #if 0
8612
b20c590170cc remove ff_get_fourcc() and use AV_RL32() instead
aurel
parents: 8596
diff changeset
443 if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==1
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
444 && s->padding_bug_score > 0 && s->low_delay) // XVID with modified fourcc
1457
460e5ead6722 detect old xvid with fourcc=DIVX
michaelni
parents: 1453
diff changeset
445 s->xvid_build= -1;
1458
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1457
diff changeset
446 #endif
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1457
diff changeset
447 }
1420
ff0220970711 xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents: 1393
diff changeset
448
1458
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1457
diff changeset
449 if(s->xvid_build==0 && s->divx_version==0 && s->lavc_build==0){
8612
b20c590170cc remove ff_get_fourcc() and use AV_RL32() instead
aurel
parents: 8596
diff changeset
450 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
451 s->divx_version= 400; //divx 4
ff0220970711 xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents: 1393
diff changeset
452 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
453
2299
eb0c851db536 xvid fake divx version workaround
michael
parents: 2278
diff changeset
454 if(s->xvid_build && s->divx_version){
eb0c851db536 xvid fake divx version workaround
michael
parents: 2278
diff changeset
455 s->divx_version=
eb0c851db536 xvid fake divx version workaround
michael
parents: 2278
diff changeset
456 s->divx_build= 0;
eb0c851db536 xvid fake divx version workaround
michael
parents: 2278
diff changeset
457 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
458
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
459 if(s->workaround_bugs&FF_BUG_AUTODETECT){
8612
b20c590170cc remove ff_get_fourcc() and use AV_RL32() instead
aurel
parents: 8596
diff changeset
460 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
461 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
462
8612
b20c590170cc remove ff_get_fourcc() and use AV_RL32() instead
aurel
parents: 8596
diff changeset
463 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
464 s->workaround_bugs|= FF_BUG_UMP4;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
465 }
760
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 758
diff changeset
466
5136
7622ba533e05 Workaround adjustments for DivX 6.1 and later
benoit
parents: 5127
diff changeset
467 if(s->divx_version>=500 && s->divx_build<1814){
760
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 758
diff changeset
468 s->workaround_bugs|= FF_BUG_QPEL_CHROMA;
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 758
diff changeset
469 }
761
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
470
5136
7622ba533e05 Workaround adjustments for DivX 6.1 and later
benoit
parents: 5127
diff changeset
471 if(s->divx_version>502 && s->divx_build<1814){
1048
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1035
diff changeset
472 s->workaround_bugs|= FF_BUG_QPEL_CHROMA2;
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1035
diff changeset
473 }
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1035
diff changeset
474
938
1e22655551b9 xvid build 3 still has the padding wrong in 1/8 of the cases :(((((
michaelni
parents: 936
diff changeset
475 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
476 s->padding_bug_score= 256*256*256*64;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
477
761
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
478 if(s->xvid_build && s->xvid_build<=1)
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
479 s->workaround_bugs|= FF_BUG_QPEL_CHROMA;
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
480
1420
ff0220970711 xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents: 1393
diff changeset
481 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
482 s->workaround_bugs|= FF_BUG_EDGE;
ff0220970711 xvid edge bug (if i understand the mpeg4 spec correctly) autodetection
michaelni
parents: 1393
diff changeset
483
2004
ec6bfd8d92fc support decoding mpeg4 with buggy dc clipping
michael
parents: 1988
diff changeset
484 if(s->xvid_build && s->xvid_build<=32)
ec6bfd8d92fc support decoding mpeg4 with buggy dc clipping
michael
parents: 1988
diff changeset
485 s->workaround_bugs|= FF_BUG_DC_CLIP;
ec6bfd8d92fc support decoding mpeg4 with buggy dc clipping
michael
parents: 1988
diff changeset
486
984
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
487 #define SET_QPEL_FUNC(postfix1, postfix2) \
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
488 s->dsp.put_ ## postfix1 = ff_put_ ## postfix2;\
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
489 s->dsp.put_no_rnd_ ## postfix1 = ff_put_no_rnd_ ## postfix2;\
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
490 s->dsp.avg_ ## postfix1 = ff_avg_ ## postfix2;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
491
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
492 if(s->lavc_build && s->lavc_build<4653)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
493 s->workaround_bugs|= FF_BUG_STD_QPEL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
494
1053
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
495 if(s->lavc_build && s->lavc_build<4655)
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
496 s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE;
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
497
1502
michaelni
parents: 1458
diff changeset
498 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
499 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
500 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
501
2004
ec6bfd8d92fc support decoding mpeg4 with buggy dc clipping
michael
parents: 1988
diff changeset
502 if(s->lavc_build && s->lavc_build<=4712)
ec6bfd8d92fc support decoding mpeg4 with buggy dc clipping
michael
parents: 1988
diff changeset
503 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
504
1053
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
505 if(s->divx_version)
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
506 s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE;
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
507 //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
508 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
509 s->padding_bug_score= 256*256*256*64;
1137
7fb0b38ab5a3 cleaner & more flexible edge bug workaround
michaelni
parents: 1124
diff changeset
510
1366
80067f8d6770 fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
michaelni
parents: 1353
diff changeset
511 if(s->divx_version && s->divx_version<500){
1137
7fb0b38ab5a3 cleaner & more flexible edge bug workaround
michaelni
parents: 1124
diff changeset
512 s->workaround_bugs|= FF_BUG_EDGE;
7fb0b38ab5a3 cleaner & more flexible edge bug workaround
michaelni
parents: 1124
diff changeset
513 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
514
1916
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1892
diff changeset
515 if(s->divx_version)
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1892
diff changeset
516 s->workaround_bugs|= FF_BUG_HPEL_CHROMA;
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
517 #if 0
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
518 if(s->divx_version==500)
1088
bb27c685fc72 fixing padding bug autodetection for some rare files, closes bug #647941
michaelni
parents: 1064
diff changeset
519 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
520
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
521 /* 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
522 * 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
523 */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
524 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
525 && 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
526 s->workaround_bugs|= FF_BUG_NO_PADDING;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
527
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
528 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
529 s->workaround_bugs|= FF_BUG_NO_PADDING;
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
530 #endif
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
531 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
532
984
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
533 if(s->workaround_bugs& FF_BUG_STD_QPEL){
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
534 SET_QPEL_FUNC(qpel_pixels_tab[0][ 5], qpel16_mc11_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
535 SET_QPEL_FUNC(qpel_pixels_tab[0][ 7], qpel16_mc31_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
536 SET_QPEL_FUNC(qpel_pixels_tab[0][ 9], qpel16_mc12_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
537 SET_QPEL_FUNC(qpel_pixels_tab[0][11], qpel16_mc32_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
538 SET_QPEL_FUNC(qpel_pixels_tab[0][13], qpel16_mc13_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
539 SET_QPEL_FUNC(qpel_pixels_tab[0][15], qpel16_mc33_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
540
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
541 SET_QPEL_FUNC(qpel_pixels_tab[1][ 5], qpel8_mc11_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
542 SET_QPEL_FUNC(qpel_pixels_tab[1][ 7], qpel8_mc31_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
543 SET_QPEL_FUNC(qpel_pixels_tab[1][ 9], qpel8_mc12_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
544 SET_QPEL_FUNC(qpel_pixels_tab[1][11], qpel8_mc32_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
545 SET_QPEL_FUNC(qpel_pixels_tab[1][13], qpel8_mc13_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
546 SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
547 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
548
1457
460e5ead6722 detect old xvid with fourcc=DIVX
michaelni
parents: 1453
diff changeset
549 if(avctx->debug & FF_DEBUG_BUGS)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
550 av_log(s->avctx, AV_LOG_DEBUG, "bugs: %X lavc_build:%d xvid_build:%d divx_version:%d divx_build:%d %s\n",
1457
460e5ead6722 detect old xvid with fourcc=DIVX
michaelni
parents: 1453
diff changeset
551 s->workaround_bugs, s->lavc_build, s->xvid_build, s->divx_version, s->divx_build,
460e5ead6722 detect old xvid with fourcc=DIVX
michaelni
parents: 1453
diff changeset
552 s->divx_packed ? "p" : "");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
553
585
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
554 #if 0 // dump bits per frame / qp / complexity
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 static FILE *f=NULL;
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
557 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
558 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
559 }
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
560 #endif
2096
83ab15bd1638 10l, non-x86 fix
alex
parents: 2094
diff changeset
561
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8417
diff changeset
562 #if HAVE_MMX
8104
0d108ec85620 Remove duplicated MM_* macros for CPU capabilities from dsputil.h.
rathann
parents: 7831
diff changeset
563 if(s->codec_id == CODEC_ID_MPEG4 && s->xvid_build && avctx->idct_algo == FF_IDCT_AUTO && (mm_flags & FF_MM_MMX)){
2869
f3bc39da0cc4 select xvid idct for xvid files if possible
michael
parents: 2792
diff changeset
564 avctx->idct_algo= FF_IDCT_XVIDMMX;
2278
870597ca3e7a 10l (wrong variable)
michael
parents: 2270
diff changeset
565 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
566 // 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
567 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
568 }
2096
83ab15bd1638 10l, non-x86 fix
alex
parents: 2094
diff changeset
569 #endif
83ab15bd1638 10l, non-x86 fix
alex
parents: 2094
diff changeset
570
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
571 /* After H263 & mpeg4 header decode we have the height, width,*/
160
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
572 /* and other parameters. So then we could init the picture */
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
573 /* FIXME: By the way H263 decoder is evolving it should have */
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
574 /* an H263EncContext */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
575
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
576 if ( s->width != avctx->coded_width
2270
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2266
diff changeset
577 || s->height != avctx->coded_height) {
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
578 /* H.263 could change picture size any time */
1536
992526a710e2 fix "first frame is no keyframe" bug
michael
parents: 1525
diff changeset
579 ParseContext pc= s->parse_context; //FIXME move these demuxng hack to avformat
992526a710e2 fix "first frame is no keyframe" bug
michael
parents: 1525
diff changeset
580 s->parse_context.buffer=0;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
581 MPV_common_end(s);
1536
992526a710e2 fix "first frame is no keyframe" bug
michael
parents: 1525
diff changeset
582 s->parse_context= pc;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
583 }
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
584 if (!s->context_initialized) {
2270
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2266
diff changeset
585 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
586
763
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 761
diff changeset
587 goto retry;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
588 }
758
cca620e89cf0 fixing h263 slice decoding (again)
michaelni
parents: 756
diff changeset
589
8800
8ec0175bbcb5 Initialize s->gob_index for Intel variant of H.263 too
kostya
parents: 8718
diff changeset
590 if((s->codec_id==CODEC_ID_H263 || s->codec_id==CODEC_ID_H263P || s->codec_id == CODEC_ID_H263I))
758
cca620e89cf0 fixing h263 slice decoding (again)
michaelni
parents: 756
diff changeset
591 s->gob_index = ff_h263_get_gob_height(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
592
903
22ee74da2cd3 cleanup
michaelni
parents: 888
diff changeset
593 // for hurry_up==5
22ee74da2cd3 cleanup
michaelni
parents: 888
diff changeset
594 s->current_picture.pict_type= s->pict_type;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6453
diff changeset
595 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
596
2764
2b37bcabe608 spelling fixes
diego
parents: 2632
diff changeset
597 /* skip B-frames if we don't have reference frames */
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6453
diff changeset
598 if(s->last_picture_ptr==NULL && (s->pict_type==FF_B_TYPE || s->dropable)) return get_consumed_bytes(s, buf_size);
345
e05b357a398a export mbskip_table for direct rendering
michaelni
parents: 344
diff changeset
599 /* skip b frames if we are in a hurry */
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6453
diff changeset
600 if(avctx->hurry_up && s->pict_type==FF_B_TYPE) return get_consumed_bytes(s, buf_size);
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6453
diff changeset
601 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE)
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6453
diff changeset
602 || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
603 || avctx->skip_frame >= AVDISCARD_ALL)
2792
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
604 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
605 /* 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
606 if(avctx->hurry_up>=5) return get_consumed_bytes(s, buf_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
607
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
608 if(s->next_p_frame_damaged){
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6453
diff changeset
609 if(s->pict_type==FF_B_TYPE)
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
610 return get_consumed_bytes(s, buf_size);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
611 else
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
612 s->next_p_frame_damaged=0;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
613 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
614
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6453
diff changeset
615 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
616 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
617 s->me.qpel_avg= s->dsp.avg_2tap_qpel_pixels_tab;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6453
diff changeset
618 }else if((!s->no_rounding) || s->pict_type==FF_B_TYPE){
3926
e308e12ac596 10l in r6412
lorenm
parents: 3807
diff changeset
619 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
620 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
621 }else{
3926
e308e12ac596 10l in r6412
lorenm
parents: 3807
diff changeset
622 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
623 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
624 }
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3551
diff changeset
625
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 763
diff changeset
626 if(MPV_frame_start(s, avctx) < 0)
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 763
diff changeset
627 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
628
9064
ca19176df986 Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents: 9033
diff changeset
629 if (avctx->hwaccel) {
ca19176df986 Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents: 9033
diff changeset
630 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
631 return -1;
ca19176df986 Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents: 9033
diff changeset
632 }
ca19176df986 Add HW acceleration hooks for MPEG-4 / H.263 decoding.
benoit
parents: 9033
diff changeset
633
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
634 #ifdef DEBUG
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3131
diff changeset
635 av_log(avctx, AV_LOG_DEBUG, "qscale=%d\n", s->qscale);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
636 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
637
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1138
diff changeset
638 ff_er_frame_start(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
639
1183
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
640 //the second part of the wmv2 header contains the MB skip bits which are stored in current_picture->mb_type
5127
4dbe6578f811 misc spelling fixes
diego
parents: 4967
diff changeset
641 //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
642 if (CONFIG_WMV2_DECODER && s->msmpeg4_version==5){
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents: 5136
diff changeset
643 ret = ff_wmv2_decode_secondary_picture_header(s);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents: 5136
diff changeset
644 if(ret<0) return ret;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents: 5136
diff changeset
645 if(ret==1) goto intrax8_decoded;
1183
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
646 }
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
647
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
648 /* decode each macroblock */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
649 s->mb_x=0;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
650 s->mb_y=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
651
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
652 decode_slice(s);
1183
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
653 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
654 if(s->msmpeg4_version){
4386
09849d8689d6 1/0 fix
michael
parents: 4197
diff changeset
655 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
656 break;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
657 }else{
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
658 if(ff_h263_resync(s)<0)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
659 break;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
660 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
661
983
ca2a303ea039 fixed wmv2 slices
michaelni
parents: 939
diff changeset
662 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
663 ff_mpeg4_clean_buffers(s);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
664
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
665 decode_slice(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
666 }
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 752
diff changeset
667
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6453
diff changeset
668 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
669 if(!CONFIG_MSMPEG4_DECODER || msmpeg4_decode_ext_header(s, buf_size) < 0){
903
22ee74da2cd3 cleanup
michaelni
parents: 888
diff changeset
670 s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR;
22ee74da2cd3 cleanup
michaelni
parents: 888
diff changeset
671 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
672
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
673 /* 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
674 if(s->codec_id==CODEC_ID_MPEG4 && s->bitstream_buffer_size==0 && s->divx_packed){
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
675 int current_pos= get_bits_count(&s->gb)>>3;
1747
8cfd36bfe504 xvid "packed" stuff support
michael
parents: 1739
diff changeset
676 int startcode_found=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
677
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2411
diff changeset
678 if(buf_size - current_pos > 5){
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
679 int i;
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
680 for(i=current_pos; i<buf_size-3; i++){
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
681 if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1 && buf[i+3]==0xB6){
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
682 startcode_found=1;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
683 break;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
684 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
685 }
1747
8cfd36bfe504 xvid "packed" stuff support
michael
parents: 1739
diff changeset
686 }
8cfd36bfe504 xvid "packed" stuff support
michael
parents: 1739
diff changeset
687 if(s->gb.buffer == s->bitstream_buffer && buf_size>20){ //xvid style
8cfd36bfe504 xvid "packed" stuff support
michael
parents: 1739
diff changeset
688 startcode_found=1;
8cfd36bfe504 xvid "packed" stuff support
michael
parents: 1739
diff changeset
689 current_pos=0;
8cfd36bfe504 xvid "packed" stuff support
michael
parents: 1739
diff changeset
690 }
8cfd36bfe504 xvid "packed" stuff support
michael
parents: 1739
diff changeset
691
8cfd36bfe504 xvid "packed" stuff support
michael
parents: 1739
diff changeset
692 if(startcode_found){
9415
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9355
diff changeset
693 av_fast_malloc(
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9355
diff changeset
694 &s->bitstream_buffer,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2869
diff changeset
695 &s->allocated_bitstream_buffer_size,
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2411
diff changeset
696 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
697 if (!s->bitstream_buffer)
141badec76fc Add a av_fast_malloc function and replace several uses of av_fast_realloc,
reimar
parents: 9355
diff changeset
698 return AVERROR(ENOMEM);
1747
8cfd36bfe504 xvid "packed" stuff support
michael
parents: 1739
diff changeset
699 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos);
8cfd36bfe504 xvid "packed" stuff support
michael
parents: 1739
diff changeset
700 s->bitstream_buffer_size= buf_size - current_pos;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
701 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
702 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
703
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents: 5136
diff changeset
704 intrax8_decoded:
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1138
diff changeset
705 ff_er_frame_end(s);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
706
9029
e10f554d8fb7 Another AVhwaccel hunk from Gwenole Beauchesne.
michael
parents: 9028
diff changeset
707 if (avctx->hwaccel) {
e10f554d8fb7 Another AVhwaccel hunk from Gwenole Beauchesne.
michael
parents: 9028
diff changeset
708 if (avctx->hwaccel->end_frame(avctx) < 0)
e10f554d8fb7 Another AVhwaccel hunk from Gwenole Beauchesne.
michael
parents: 9028
diff changeset
709 return -1;
e10f554d8fb7 Another AVhwaccel hunk from Gwenole Beauchesne.
michael
parents: 9028
diff changeset
710 }
e10f554d8fb7 Another AVhwaccel hunk from Gwenole Beauchesne.
michael
parents: 9028
diff changeset
711
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
712 MPV_frame_end(s);
984
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
713
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1278
diff changeset
714 assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1278
diff changeset
715 assert(s->current_picture.pict_type == s->pict_type);
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6453
diff changeset
716 if (s->pict_type == FF_B_TYPE || s->low_delay) {
3185
333e016c2c8a cleanup picture / debug output code
michael
parents: 3177
diff changeset
717 *pict= *(AVFrame*)s->current_picture_ptr;
333e016c2c8a cleanup picture / debug output code
michael
parents: 3177
diff changeset
718 } else if (s->last_picture_ptr != NULL) {
333e016c2c8a cleanup picture / debug output code
michael
parents: 3177
diff changeset
719 *pict= *(AVFrame*)s->last_picture_ptr;
333e016c2c8a cleanup picture / debug output code
michael
parents: 3177
diff changeset
720 }
333e016c2c8a cleanup picture / debug output code
michael
parents: 3177
diff changeset
721
333e016c2c8a cleanup picture / debug output code
michael
parents: 3177
diff changeset
722 if(s->last_picture_ptr || s->low_delay){
333e016c2c8a cleanup picture / debug output code
michael
parents: 3177
diff changeset
723 *data_size = sizeof(AVFrame);
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1687
diff changeset
724 ff_print_debug_info(s, pict);
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
725 }
931
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
726
384
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
727 #ifdef PRINT_FRAME_TIME
4122
daae66c03857 Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 3947
diff changeset
728 av_log(avctx, AV_LOG_DEBUG, "%"PRId64"\n", rdtsc()-time);
384
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
729 #endif
1278
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1219
diff changeset
730
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
731 return get_consumed_bytes(s, buf_size);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
732 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
733
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
734 AVCodec mpeg4_decoder = {
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
735 "mpeg4",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
736 CODEC_TYPE_VIDEO,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
737 CODEC_ID_MPEG4,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
738 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
739 ff_h263_decode_init,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
740 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
741 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
742 ff_h263_decode_frame,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2422
diff changeset
743 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1366
diff changeset
744 .flush= ff_mpeg_flush,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6718
diff changeset
745 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
9067
80f632c55670 Use ff_hwaccel_pixfmt_list_420[] in H.263 decoder.
benoit
parents: 9064
diff changeset
746 .pix_fmts= ff_hwaccel_pixfmt_list_420,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
747 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
748
986e461dc072 Initial revision
glantau
parents:
diff changeset
749 AVCodec h263_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
750 "h263",
986e461dc072 Initial revision
glantau
parents:
diff changeset
751 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
752 CODEC_ID_H263,
986e461dc072 Initial revision
glantau
parents:
diff changeset
753 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
754 ff_h263_decode_init,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
755 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
756 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
757 ff_h263_decode_frame,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2422
diff changeset
758 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1366
diff changeset
759 .flush= ff_mpeg_flush,
9083
bf274494b66e Change a bunch of codec long_names to be more consistent and descriptive.
diego
parents: 9067
diff changeset
760 .long_name= NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"),
9067
80f632c55670 Use ff_hwaccel_pixfmt_list_420[] in H.263 decoder.
benoit
parents: 9064
diff changeset
761 .pix_fmts= ff_hwaccel_pixfmt_list_420,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
762 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
763
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
764 AVCodec msmpeg4v1_decoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
765 "msmpeg4v1",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
766 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
767 CODEC_ID_MSMPEG4V1,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
768 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
769 ff_h263_decode_init,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
770 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
771 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
772 ff_h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
773 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
774 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"),
9028
0f95e4f0a3f5 Add and use ff_pixfmt_list_420.
michael
parents: 9027
diff changeset
775 .pix_fmts= ff_pixfmt_list_420,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
776 };
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
777
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
778 AVCodec msmpeg4v2_decoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
779 "msmpeg4v2",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
780 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
781 CODEC_ID_MSMPEG4V2,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
782 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
783 ff_h263_decode_init,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
784 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
785 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
786 ff_h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
787 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
788 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"),
9028
0f95e4f0a3f5 Add and use ff_pixfmt_list_420.
michael
parents: 9027
diff changeset
789 .pix_fmts= ff_pixfmt_list_420,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
790 };
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
791
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
792 AVCodec msmpeg4v3_decoder = {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
793 "msmpeg4",
986e461dc072 Initial revision
glantau
parents:
diff changeset
794 CODEC_TYPE_VIDEO,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
795 CODEC_ID_MSMPEG4V3,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
796 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
797 ff_h263_decode_init,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
798 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
799 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
800 ff_h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
801 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
802 .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"),
9028
0f95e4f0a3f5 Add and use ff_pixfmt_list_420.
michael
parents: 9027
diff changeset
803 .pix_fmts= ff_pixfmt_list_420,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
804 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
805
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
806 AVCodec wmv1_decoder = {
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
807 "wmv1",
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
808 CODEC_TYPE_VIDEO,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
809 CODEC_ID_WMV1,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
810 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
811 ff_h263_decode_init,
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
812 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
813 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
814 ff_h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
815 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
816 .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"),
9028
0f95e4f0a3f5 Add and use ff_pixfmt_list_420.
michael
parents: 9027
diff changeset
817 .pix_fmts= ff_pixfmt_list_420,
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
818 };
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
819
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
820 AVCodec h263i_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
821 "h263i",
986e461dc072 Initial revision
glantau
parents:
diff changeset
822 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
823 CODEC_ID_H263I,
986e461dc072 Initial revision
glantau
parents:
diff changeset
824 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
825 ff_h263_decode_init,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
826 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
827 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
828 ff_h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
829 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
8672
456d875d3524 Change "H.263 Intel" long name to "Intel H.263".
stefano
parents: 8665
diff changeset
830 .long_name = NULL_IF_CONFIG_SMALL("Intel H.263"),
9028
0f95e4f0a3f5 Add and use ff_pixfmt_list_420.
michael
parents: 9027
diff changeset
831 .pix_fmts= ff_pixfmt_list_420,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
832 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
833
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1338
diff changeset
834 AVCodec flv_decoder = {
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1338
diff changeset
835 "flv",
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1338
diff changeset
836 CODEC_TYPE_VIDEO,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1338
diff changeset
837 CODEC_ID_FLV1,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1338
diff changeset
838 sizeof(MpegEncContext),
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1338
diff changeset
839 ff_h263_decode_init,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1338
diff changeset
840 NULL,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1338
diff changeset
841 ff_h263_decode_end,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1338
diff changeset
842 ff_h263_decode_frame,
6713
f282270c589f Add long names to some AVCodec declarations.
diego
parents: 6631
diff changeset
843 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
9083
bf274494b66e Change a bunch of codec long_names to be more consistent and descriptive.
diego
parents: 9067
diff changeset
844 .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV)"),
9028
0f95e4f0a3f5 Add and use ff_pixfmt_list_420.
michael
parents: 9027
diff changeset
845 .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
846 };