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