Mercurial > libavcodec.hg
annotate mpeg12.c @ 4629:2faa1399dd68 libavcodec
add av_opt_set_defaults2() which sets just defaults from AVOptions whos flags match a user specified & mask = flags
author | michael |
---|---|
date | Wed, 07 Mar 2007 02:21:35 +0000 |
parents | e541c0dd35dd |
children | fd9e324b3978 |
rev | line source |
---|---|
0 | 1 /* |
1106 | 2 * MPEG1 codec / MPEG2 decoder |
429 | 3 * Copyright (c) 2000,2001 Fabrice Bellard. |
2967 | 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:
3776
diff
changeset
|
6 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3776
diff
changeset
|
7 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3776
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:
3776
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:
3776
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:
3776
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:
2979
diff
changeset
|
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 21 */ |
2967 | 22 |
1106 | 23 /** |
24 * @file mpeg12.c | |
1421 | 25 * MPEG1/2 codec |
1106 | 26 */ |
2967 | 27 |
76 | 28 //#define DEBUG |
0 | 29 #include "avcodec.h" |
30 #include "dsputil.h" | |
31 #include "mpegvideo.h" | |
32 | |
33 #include "mpeg12data.h" | |
4623
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
34 #include "bytestream.h" |
0 | 35 |
1708 | 36 //#undef NDEBUG |
37 //#include <assert.h> | |
38 | |
694 | 39 |
0 | 40 /* Start codes. */ |
2979 | 41 #define SEQ_END_CODE 0x000001b7 |
42 #define SEQ_START_CODE 0x000001b3 | |
43 #define GOP_START_CODE 0x000001b8 | |
44 #define PICTURE_START_CODE 0x00000100 | |
45 #define SLICE_MIN_START_CODE 0x00000101 | |
46 #define SLICE_MAX_START_CODE 0x000001af | |
47 #define EXT_START_CODE 0x000001b5 | |
48 #define USER_START_CODE 0x000001b2 | |
0 | 49 |
552 | 50 #define DC_VLC_BITS 9 |
51 #define MV_VLC_BITS 9 | |
52 #define MBINCR_VLC_BITS 9 | |
53 #define MB_PAT_VLC_BITS 9 | |
54 #define MB_PTYPE_VLC_BITS 6 | |
55 #define MB_BTYPE_VLC_BITS 6 | |
56 #define TEX_VLC_BITS 9 | |
57 | |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1503
diff
changeset
|
58 #ifdef CONFIG_ENCODERS |
2967 | 59 static void mpeg1_encode_block(MpegEncContext *s, |
60 DCTELEM *block, | |
0 | 61 int component); |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
62 static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code); // RAL: f_code parameter added |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1503
diff
changeset
|
63 #endif //CONFIG_ENCODERS |
2967 | 64 static inline int mpeg1_decode_block_inter(MpegEncContext *s, |
65 DCTELEM *block, | |
711 | 66 int n); |
2967 | 67 static inline int mpeg1_decode_block_intra(MpegEncContext *s, |
68 DCTELEM *block, | |
0 | 69 int n); |
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
70 static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n); |
2967 | 71 static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, |
72 DCTELEM *block, | |
0 | 73 int n); |
2967 | 74 static inline int mpeg2_decode_block_intra(MpegEncContext *s, |
75 DCTELEM *block, | |
0 | 76 int n); |
2201 | 77 static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n); |
2622 | 78 static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n); |
0 | 79 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred); |
1620 | 80 static void exchange_uv(MpegEncContext *s); |
0 | 81 |
1381 | 82 #ifdef HAVE_XVMC |
83 extern int XVMC_field_start(MpegEncContext *s, AVCodecContext *avctx); | |
84 extern int XVMC_field_end(MpegEncContext *s); | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
85 extern void XVMC_pack_pblocks(MpegEncContext *s,int cbp); |
1620 | 86 extern void XVMC_init_block(MpegEncContext *s);//set s->block |
1381 | 87 #endif |
88 | |
4180 | 89 static const enum PixelFormat pixfmt_yuv_420[]= {PIX_FMT_YUV420P,-1}; |
90 static const enum PixelFormat pixfmt_yuv_422[]= {PIX_FMT_YUV422P,-1}; | |
91 static const enum PixelFormat pixfmt_yuv_444[]= {PIX_FMT_YUV444P,-1}; | |
92 static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = { | |
1821 | 93 PIX_FMT_XVMC_MPEG2_IDCT, |
94 PIX_FMT_XVMC_MPEG2_MC, | |
2979 | 95 -1}; |
947 | 96 #ifdef CONFIG_ENCODERS |
1162 | 97 static uint8_t (*mv_penalty)[MAX_MV*2+1]= NULL; |
1064 | 98 static uint8_t fcode_tab[MAX_MV*2+1]; |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
99 |
947 | 100 static uint8_t uni_mpeg1_ac_vlc_len [64*64*2]; |
3305 | 101 static uint8_t uni_mpeg2_ac_vlc_len [64*64*2]; |
1325 | 102 |
103 /* simple include everything table for dc, first byte is bits number next 3 are code*/ | |
104 static uint32_t mpeg1_lum_dc_uni[512]; | |
105 static uint32_t mpeg1_chr_dc_uni[512]; | |
106 | |
107 static uint8_t mpeg1_index_run[2][64]; | |
108 static int8_t mpeg1_max_level[2][64]; | |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1503
diff
changeset
|
109 #endif //CONFIG_ENCODERS |
947 | 110 |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
111 static void init_2d_vlc_rl(RLTable *rl, int use_static) |
552 | 112 { |
620
a5aa53b6e648
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michaelni
parents:
617
diff
changeset
|
113 int i; |
2967 | 114 |
115 init_vlc(&rl->vlc, TEX_VLC_BITS, rl->n + 2, | |
552 | 116 &rl->table_vlc[0][1], 4, 2, |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
117 &rl->table_vlc[0][0], 4, 2, use_static); |
552 | 118 |
2967 | 119 if(use_static) |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
120 rl->rl_vlc[0]= av_mallocz_static(rl->vlc.table_size*sizeof(RL_VLC_ELEM)); |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
121 else |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
122 rl->rl_vlc[0]= av_malloc(rl->vlc.table_size*sizeof(RL_VLC_ELEM)); |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
123 |
552 | 124 for(i=0; i<rl->vlc.table_size; i++){ |
125 int code= rl->vlc.table[i][0]; | |
126 int len = rl->vlc.table[i][1]; | |
127 int level, run; | |
2967 | 128 |
552 | 129 if(len==0){ // illegal code |
130 run= 65; | |
131 level= MAX_LEVEL; | |
132 }else if(len<0){ //more bits needed | |
133 run= 0; | |
134 level= code; | |
135 }else{ | |
136 if(code==rl->n){ //esc | |
137 run= 65; | |
138 level= 0; | |
139 }else if(code==rl->n+1){ //eob | |
711 | 140 run= 0; |
141 level= 127; | |
552 | 142 }else{ |
143 run= rl->table_run [code] + 1; | |
144 level= rl->table_level[code]; | |
145 } | |
146 } | |
147 rl->rl_vlc[0][i].len= len; | |
148 rl->rl_vlc[0][i].level= level; | |
149 rl->rl_vlc[0][i].run= run; | |
150 } | |
151 } | |
152 | |
1325 | 153 #ifdef CONFIG_ENCODERS |
3304 | 154 static void init_uni_ac_vlc(RLTable *rl, uint8_t *uni_ac_vlc_len){ |
947 | 155 int i; |
156 | |
157 for(i=0; i<128; i++){ | |
158 int level= i-64; | |
159 int run; | |
160 for(run=0; run<64; run++){ | |
161 int len, bits, code; | |
2967 | 162 |
4001 | 163 int alevel= FFABS(level); |
947 | 164 int sign= (level>>31)&1; |
165 | |
166 if (alevel > rl->max_level[0][run]) | |
167 code= 111; /*rl->n*/ | |
168 else | |
169 code= rl->index_run[0][run] + alevel - 1; | |
170 | |
171 if (code < 111 /* rl->n */) { | |
2979 | 172 /* store the vlc & sign at once */ |
3305 | 173 len= rl->table_vlc[code][1]+1; |
174 bits= (rl->table_vlc[code][0]<<1) + sign; | |
947 | 175 } else { |
3305 | 176 len= rl->table_vlc[111/*rl->n*/][1]+6; |
177 bits= rl->table_vlc[111/*rl->n*/][0]<<6; | |
947 | 178 |
179 bits|= run; | |
180 if (alevel < 128) { | |
181 bits<<=8; len+=8; | |
182 bits|= level & 0xff; | |
183 } else { | |
184 bits<<=16; len+=16; | |
185 bits|= level & 0xff; | |
186 if (level < 0) { | |
187 bits|= 0x8001 + level + 255; | |
188 } else { | |
189 bits|= level & 0xffff; | |
190 } | |
191 } | |
192 } | |
193 | |
194 uni_ac_vlc_len [UNI_AC_ENC_INDEX(run, i)]= len; | |
195 } | |
196 } | |
197 } | |
552 | 198 |
1749
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
199 |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
200 static int find_frame_rate_index(MpegEncContext *s){ |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
201 int i; |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
202 int64_t dmin= INT64_MAX; |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
203 int64_t d; |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
204 |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
205 for(i=1;i<14;i++) { |
3391
d60dc0a7dee6
staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)
michael
parents:
3309
diff
changeset
|
206 int64_t n0= 1001LL/ff_frame_rate_tab[i].den*ff_frame_rate_tab[i].num*s->avctx->time_base.num; |
2637 | 207 int64_t n1= 1001LL*s->avctx->time_base.den; |
2658
d1609cfeb1d0
#defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents:
2637
diff
changeset
|
208 if(s->avctx->strict_std_compliance > FF_COMPLIANCE_INOFFICIAL && i>=9) break; |
1837 | 209 |
4001 | 210 d = FFABS(n0 - n1); |
1749
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
211 if(d < dmin){ |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
212 dmin=d; |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
213 s->frame_rate_index= i; |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
214 } |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
215 } |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
216 if(dmin) |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
217 return -1; |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
218 else |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
219 return 0; |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
220 } |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
221 |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
222 static int encode_init(AVCodecContext *avctx) |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
223 { |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
224 MpegEncContext *s = avctx->priv_data; |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
225 |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
226 if(MPV_encode_init(avctx) < 0) |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
227 return -1; |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
228 |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
229 if(find_frame_rate_index(s) < 0){ |
2658
d1609cfeb1d0
#defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents:
2637
diff
changeset
|
230 if(s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){ |
2637 | 231 av_log(avctx, AV_LOG_ERROR, "MPEG1/2 does not support %d/%d fps\n", avctx->time_base.den, avctx->time_base.num); |
1749
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
232 return -1; |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
233 }else{ |
2637 | 234 av_log(avctx, AV_LOG_INFO, "MPEG1/2 does not support %d/%d fps, there may be AV sync issues\n", avctx->time_base.den, avctx->time_base.num); |
1749
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
235 } |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
236 } |
2967 | 237 |
4454 | 238 if(avctx->profile == FF_PROFILE_UNKNOWN){ |
239 if(avctx->level != FF_LEVEL_UNKNOWN){ | |
240 av_log(avctx, AV_LOG_ERROR, "Set profile and level\n"); | |
241 return -1; | |
242 } | |
243 avctx->profile = s->chroma_format == CHROMA_420 ? 4 : 0; /* Main or 4:2:2 */ | |
244 } | |
245 | |
246 if(avctx->level == FF_LEVEL_UNKNOWN){ | |
247 if(avctx->profile == 0){ /* 4:2:2 */ | |
248 if(avctx->width <= 720 && avctx->height <= 608) avctx->level = 5; /* Main */ | |
249 else avctx->level = 2; /* High */ | |
250 }else{ | |
251 if(avctx->profile != 1 && s->chroma_format != CHROMA_420){ | |
252 av_log(avctx, AV_LOG_ERROR, "Only High(1) and 4:2:2(0) profiles support 4:2:2 color sampling\n"); | |
253 return -1; | |
254 } | |
255 if(avctx->width <= 720 && avctx->height <= 576) avctx->level = 8; /* Main */ | |
256 else if(avctx->width <= 1440) avctx->level = 6; /* High 1440 */ | |
257 else avctx->level = 4; /* High */ | |
258 } | |
259 } | |
3309 | 260 |
4158
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
261 if((avctx->flags2 & CODEC_FLAG2_DROP_FRAME_TIMECODE) && s->frame_rate_index != 4){ |
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
262 av_log(avctx, AV_LOG_ERROR, "Drop frame time code only allowed with 1001/30000 fps\n"); |
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
263 return -1; |
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
264 } |
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
265 |
1749
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
266 return 0; |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
267 } |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
268 |
0 | 269 static void put_header(MpegEncContext *s, int header) |
270 { | |
271 align_put_bits(&s->pb); | |
236 | 272 put_bits(&s->pb, 16, header>>16); |
273 put_bits(&s->pb, 16, header&0xFFFF); | |
0 | 274 } |
275 | |
276 /* put sequence header if needed */ | |
277 static void mpeg1_encode_sequence_header(MpegEncContext *s) | |
278 { | |
279 unsigned int vbv_buffer_size; | |
1 | 280 unsigned int fps, v; |
1904 | 281 int i; |
1064 | 282 uint64_t time_code; |
918 | 283 float best_aspect_error= 1E10; |
1548 | 284 float aspect_ratio= av_q2d(s->avctx->sample_aspect_ratio); |
1479 | 285 int constraint_parameter_flag; |
2967 | 286 |
1548 | 287 if(aspect_ratio==0.0) aspect_ratio= 1.0; //pixel aspect 1:1 (VGA) |
2967 | 288 |
903 | 289 if (s->current_picture.key_frame) { |
3391
d60dc0a7dee6
staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)
michael
parents:
3309
diff
changeset
|
290 AVRational framerate= ff_frame_rate_tab[s->frame_rate_index]; |
1837 | 291 |
0 | 292 /* mpeg1 header repeated every gop */ |
293 put_header(s, SEQ_START_CODE); | |
2967 | 294 |
0 | 295 put_bits(&s->pb, 12, s->width); |
296 put_bits(&s->pb, 12, s->height); | |
2967 | 297 |
918 | 298 for(i=1; i<15; i++){ |
1550 | 299 float error= aspect_ratio; |
300 if(s->codec_id == CODEC_ID_MPEG1VIDEO || i <=1) | |
1587
b69b086f5570
100l (SAR is written as height/width instead of width/height in the MPEG1 standard)
michael
parents:
1580
diff
changeset
|
301 error-= 1.0/mpeg1_aspect[i]; |
1550 | 302 else |
303 error-= av_q2d(mpeg2_aspect[i])*s->height/s->width; | |
2967 | 304 |
4001 | 305 error= FFABS(error); |
2967 | 306 |
918 | 307 if(error < best_aspect_error){ |
308 best_aspect_error= error; | |
309 s->aspect_ratio_info= i; | |
310 } | |
311 } | |
2967 | 312 |
918 | 313 put_bits(&s->pb, 4, s->aspect_ratio_info); |
0 | 314 put_bits(&s->pb, 4, s->frame_rate_index); |
2967 | 315 |
1430
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
316 if(s->avctx->rc_max_rate){ |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
317 v = (s->avctx->rc_max_rate + 399) / 400; |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
318 if (v > 0x3ffff && s->codec_id == CODEC_ID_MPEG1VIDEO) |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
319 v = 0x3ffff; |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
320 }else{ |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
321 v= 0x3FFFF; |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
322 } |
639
f449913e8419
new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents:
620
diff
changeset
|
323 |
f449913e8419
new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents:
620
diff
changeset
|
324 if(s->avctx->rc_buffer_size) |
f449913e8419
new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents:
620
diff
changeset
|
325 vbv_buffer_size = s->avctx->rc_buffer_size; |
f449913e8419
new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents:
620
diff
changeset
|
326 else |
f449913e8419
new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents:
620
diff
changeset
|
327 /* VBV calculation: Scaled so that a VCD has the proper VBV size of 40 kilobytes */ |
1430
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
328 vbv_buffer_size = (( 20 * s->bit_rate) / (1151929 / 2)) * 8 * 1024; |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
329 vbv_buffer_size= (vbv_buffer_size + 16383) / 16384; |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
330 |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
331 put_bits(&s->pb, 18, v & 0x3FFFF); |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
332 put_bits(&s->pb, 1, 1); /* marker */ |
1479 | 333 put_bits(&s->pb, 10, vbv_buffer_size & 0x3FF); |
334 | |
2967 | 335 constraint_parameter_flag= |
336 s->width <= 768 && s->height <= 576 && | |
1479 | 337 s->mb_width * s->mb_height <= 396 && |
1837 | 338 s->mb_width * s->mb_height * framerate.num <= framerate.den*396*25 && |
339 framerate.num <= framerate.den*30 && | |
2302 | 340 s->avctx->me_range && s->avctx->me_range < 128 && |
1479 | 341 vbv_buffer_size <= 20 && |
342 v <= 1856000/400 && | |
343 s->codec_id == CODEC_ID_MPEG1VIDEO; | |
2967 | 344 |
1479 | 345 put_bits(&s->pb, 1, constraint_parameter_flag); |
2967 | 346 |
1411 | 347 ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix); |
348 ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix); | |
0 | 349 |
1421 | 350 if(s->codec_id == CODEC_ID_MPEG2VIDEO){ |
351 put_header(s, EXT_START_CODE); | |
352 put_bits(&s->pb, 4, 1); //seq ext | |
3309 | 353 |
4454 | 354 put_bits(&s->pb, 1, s->avctx->profile == 0); //escx 1 for 4:2:2 profile */ |
3309 | 355 |
356 put_bits(&s->pb, 3, s->avctx->profile); //profile | |
357 put_bits(&s->pb, 4, s->avctx->level); //level | |
2167 | 358 |
1677 | 359 put_bits(&s->pb, 1, s->progressive_sequence); |
3309 | 360 put_bits(&s->pb, 2, s->chroma_format); |
1421 | 361 put_bits(&s->pb, 2, 0); //horizontal size ext |
362 put_bits(&s->pb, 2, 0); //vertical size ext | |
363 put_bits(&s->pb, 12, v>>18); //bitrate ext | |
364 put_bits(&s->pb, 1, 1); //marker | |
365 put_bits(&s->pb, 8, vbv_buffer_size >>10); //vbv buffer ext | |
366 put_bits(&s->pb, 1, s->low_delay); | |
367 put_bits(&s->pb, 2, 0); // frame_rate_ext_n | |
368 put_bits(&s->pb, 5, 0); // frame_rate_ext_d | |
369 } | |
2967 | 370 |
0 | 371 put_header(s, GOP_START_CODE); |
4158
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
372 put_bits(&s->pb, 1, !!(s->avctx->flags & CODEC_FLAG2_DROP_FRAME_TIMECODE)); /* drop frame flag */ |
0 | 373 /* time code : we must convert from the real frame rate to a |
374 fake mpeg frame rate in case of low frame rate */ | |
1837 | 375 fps = (framerate.num + framerate.den/2)/ framerate.den; |
4158
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
376 time_code = s->current_picture_ptr->coded_picture_number + s->avctx->timecode_frame_start; |
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
377 |
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
378 s->gop_picture_number = s->current_picture_ptr->coded_picture_number; |
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
379 if (s->avctx->flags2 & CODEC_FLAG2_DROP_FRAME_TIMECODE) { |
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
380 /* only works for NTSC 29.97 */ |
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
381 int d = time_code / 17982; |
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
382 int m = time_code % 17982; |
4159 | 383 //if (m < 2) m += 2; /* not needed since -2,-1 / 1798 in C returns 0 */ |
4158
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
384 time_code += 18 * d + 2 * ((m - 2) / 1798); |
47d1b5261f17
add option to set mpeg1/2 gop timecode start, and drop frame flag timecode flag
bcoudurier
parents:
4151
diff
changeset
|
385 } |
1064 | 386 put_bits(&s->pb, 5, (uint32_t)((time_code / (fps * 3600)) % 24)); |
387 put_bits(&s->pb, 6, (uint32_t)((time_code / (fps * 60)) % 60)); | |
0 | 388 put_bits(&s->pb, 1, 1); |
1064 | 389 put_bits(&s->pb, 6, (uint32_t)((time_code / fps) % 60)); |
1727 | 390 put_bits(&s->pb, 6, (uint32_t)((time_code % fps))); |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1749
diff
changeset
|
391 put_bits(&s->pb, 1, !!(s->flags & CODEC_FLAG_CLOSED_GOP)); |
0 | 392 put_bits(&s->pb, 1, 0); /* broken link */ |
393 } | |
394 } | |
395 | |
1160 | 396 static inline void encode_mb_skip_run(MpegEncContext *s, int run){ |
397 while (run >= 33) { | |
398 put_bits(&s->pb, 11, 0x008); | |
399 run -= 33; | |
400 } | |
2967 | 401 put_bits(&s->pb, mbAddrIncrTable[run][1], |
1160 | 402 mbAddrIncrTable[run][0]); |
403 } | |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1503
diff
changeset
|
404 #endif //CONFIG_ENCODERS |
0 | 405 |
498 | 406 static void common_init(MpegEncContext *s) |
407 { | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
408 |
498 | 409 s->y_dc_scale_table= |
1992 | 410 s->c_dc_scale_table= mpeg2_dc_scale_table[s->intra_dc_precision]; |
1903 | 411 |
498 | 412 } |
413 | |
1325 | 414 void ff_mpeg1_clean_buffers(MpegEncContext *s){ |
415 s->last_dc[0] = 1 << (7 + s->intra_dc_precision); | |
416 s->last_dc[1] = s->last_dc[0]; | |
417 s->last_dc[2] = s->last_dc[0]; | |
418 memset(s->last_mv, 0, sizeof(s->last_mv)); | |
419 } | |
420 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
421 #ifdef CONFIG_ENCODERS |
1160 | 422 |
4621 | 423 static av_always_inline void put_qscale(MpegEncContext *s) |
424 { | |
425 if(s->q_scale_type){ | |
426 assert(s->qscale>=1 && s->qscale <=12); | |
427 put_bits(&s->pb, 5, inv_non_linear_qscale[s->qscale]); | |
428 }else{ | |
429 put_bits(&s->pb, 5, s->qscale); | |
430 } | |
431 } | |
432 | |
1160 | 433 void ff_mpeg1_encode_slice_header(MpegEncContext *s){ |
434 put_header(s, SLICE_MIN_START_CODE + s->mb_y); | |
4621 | 435 put_qscale(s); |
1160 | 436 put_bits(&s->pb, 1, 0); /* slice extra information */ |
437 } | |
438 | |
0 | 439 void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number) |
440 { | |
441 mpeg1_encode_sequence_header(s); | |
442 | |
443 /* mpeg1 picture header */ | |
444 put_header(s, PICTURE_START_CODE); | |
445 /* temporal reference */ | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
446 |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
447 // RAL: s->picture_number instead of s->fake_picture_number |
2967 | 448 put_bits(&s->pb, 10, (s->picture_number - |
449 s->gop_picture_number) & 0x3ff); | |
0 | 450 put_bits(&s->pb, 3, s->pict_type); |
1697 | 451 |
1786 | 452 s->vbv_delay_ptr= s->pb.buf + put_bits_count(&s->pb)/8; |
1697 | 453 put_bits(&s->pb, 16, 0xFFFF); /* vbv_delay */ |
2967 | 454 |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
455 // RAL: Forward f_code also needed for B frames |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
456 if (s->pict_type == P_TYPE || s->pict_type == B_TYPE) { |
0 | 457 put_bits(&s->pb, 1, 0); /* half pel coordinates */ |
1432 | 458 if(s->codec_id == CODEC_ID_MPEG1VIDEO) |
459 put_bits(&s->pb, 3, s->f_code); /* forward_f_code */ | |
460 else | |
461 put_bits(&s->pb, 3, 7); /* forward_f_code */ | |
0 | 462 } |
2967 | 463 |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
464 // RAL: Backward f_code necessary for B frames |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
465 if (s->pict_type == B_TYPE) { |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
466 put_bits(&s->pb, 1, 0); /* half pel coordinates */ |
1432 | 467 if(s->codec_id == CODEC_ID_MPEG1VIDEO) |
468 put_bits(&s->pb, 3, s->b_code); /* backward_f_code */ | |
469 else | |
470 put_bits(&s->pb, 3, 7); /* backward_f_code */ | |
1421 | 471 } |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
472 |
0 | 473 put_bits(&s->pb, 1, 0); /* extra bit picture */ |
1677 | 474 |
475 s->frame_pred_frame_dct = 1; | |
1421 | 476 if(s->codec_id == CODEC_ID_MPEG2VIDEO){ |
477 put_header(s, EXT_START_CODE); | |
478 put_bits(&s->pb, 4, 8); //pic ext | |
1432 | 479 if (s->pict_type == P_TYPE || s->pict_type == B_TYPE) { |
480 put_bits(&s->pb, 4, s->f_code); | |
481 put_bits(&s->pb, 4, s->f_code); | |
482 }else{ | |
483 put_bits(&s->pb, 8, 255); | |
484 } | |
485 if (s->pict_type == B_TYPE) { | |
486 put_bits(&s->pb, 4, s->b_code); | |
487 put_bits(&s->pb, 4, s->b_code); | |
488 }else{ | |
489 put_bits(&s->pb, 8, 255); | |
490 } | |
1421 | 491 put_bits(&s->pb, 2, s->intra_dc_precision); |
2967 | 492 |
1799 | 493 assert(s->picture_structure == PICT_FRAME); |
494 put_bits(&s->pb, 2, s->picture_structure); | |
1682 | 495 if (s->progressive_sequence) { |
496 put_bits(&s->pb, 1, 0); /* no repeat */ | |
497 } else { | |
498 put_bits(&s->pb, 1, s->current_picture_ptr->top_field_first); | |
499 } | |
1677 | 500 /* XXX: optimize the generation of this flag with entropy |
501 measures */ | |
502 s->frame_pred_frame_dct = s->progressive_sequence; | |
2967 | 503 |
1677 | 504 put_bits(&s->pb, 1, s->frame_pred_frame_dct); |
1421 | 505 put_bits(&s->pb, 1, s->concealment_motion_vectors); |
506 put_bits(&s->pb, 1, s->q_scale_type); | |
507 put_bits(&s->pb, 1, s->intra_vlc_format); | |
508 put_bits(&s->pb, 1, s->alternate_scan); | |
509 put_bits(&s->pb, 1, s->repeat_first_field); | |
1677 | 510 s->progressive_frame = s->progressive_sequence; |
3309 | 511 put_bits(&s->pb, 1, s->chroma_format == CHROMA_420 ? s->progressive_frame : 0); /* chroma_420_type */ |
1677 | 512 put_bits(&s->pb, 1, s->progressive_frame); |
1421 | 513 put_bits(&s->pb, 1, 0); //composite_display_flag |
514 } | |
1721 | 515 if(s->flags & CODEC_FLAG_SVCD_SCAN_OFFSET){ |
516 int i; | |
517 | |
518 put_header(s, USER_START_CODE); | |
519 for(i=0; i<sizeof(svcd_scan_offset_placeholder); i++){ | |
520 put_bits(&s->pb, 8, svcd_scan_offset_placeholder[i]); | |
521 } | |
522 } | |
2967 | 523 |
1160 | 524 s->mb_y=0; |
525 ff_mpeg1_encode_slice_header(s); | |
0 | 526 } |
527 | |
2967 | 528 static inline void put_mb_modes(MpegEncContext *s, int n, int bits, |
1708 | 529 int has_mv, int field_motion) |
1677 | 530 { |
531 put_bits(&s->pb, n, bits); | |
532 if (!s->frame_pred_frame_dct) { | |
2967 | 533 if (has_mv) |
1708 | 534 put_bits(&s->pb, 2, 2 - field_motion); /* motion_type: frame/field */ |
1677 | 535 put_bits(&s->pb, 1, s->interlaced_dct); |
536 } | |
537 } | |
538 | |
4283
d6f83e2f8804
rename always_inline to av_always_inline and move to common.h
mru
parents:
4180
diff
changeset
|
539 static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s, |
3309 | 540 DCTELEM block[6][64], |
541 int motion_x, int motion_y, | |
542 int mb_block_count) | |
0 | 543 { |
1160 | 544 int i, cbp; |
545 const int mb_x = s->mb_x; | |
546 const int mb_y = s->mb_y; | |
547 const int first_mb= mb_x == s->resync_mb_x && mb_y == s->resync_mb_y; | |
0 | 548 |
549 /* compute cbp */ | |
550 cbp = 0; | |
3309 | 551 for(i=0;i<mb_block_count;i++) { |
0 | 552 if (s->block_last_index[i] >= 0) |
3309 | 553 cbp |= 1 << (mb_block_count - 1 - i); |
0 | 554 } |
2967 | 555 |
1915 | 556 if (cbp == 0 && !first_mb && s->mv_type == MV_TYPE_16X16 && |
2967 | 557 (mb_x != s->mb_width - 1 || (mb_y != s->mb_height - 1 && s->codec_id == CODEC_ID_MPEG1VIDEO)) && |
1915 | 558 ((s->pict_type == P_TYPE && (motion_x | motion_y) == 0) || |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
559 (s->pict_type == B_TYPE && s->mv_dir == s->last_mv_dir && (((s->mv_dir & MV_DIR_FORWARD) ? ((s->mv[0][0][0] - s->last_mv[0][0][0])|(s->mv[0][0][1] - s->last_mv[0][0][1])) : 0) | |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
560 ((s->mv_dir & MV_DIR_BACKWARD) ? ((s->mv[1][0][0] - s->last_mv[1][0][0])|(s->mv[1][0][1] - s->last_mv[1][0][1])) : 0)) == 0))) { |
1160 | 561 s->mb_skip_run++; |
694 | 562 s->qscale -= s->dquant; |
740 | 563 s->skip_count++; |
564 s->misc_bits++; | |
565 s->last_bits++; | |
1708 | 566 if(s->pict_type == P_TYPE){ |
2967 | 567 s->last_mv[0][1][0]= s->last_mv[0][0][0]= |
1708 | 568 s->last_mv[0][1][1]= s->last_mv[0][0][1]= 0; |
569 } | |
0 | 570 } else { |
1160 | 571 if(first_mb){ |
572 assert(s->mb_skip_run == 0); | |
573 encode_mb_skip_run(s, s->mb_x); | |
574 }else{ | |
575 encode_mb_skip_run(s, s->mb_skip_run); | |
0 | 576 } |
2967 | 577 |
0 | 578 if (s->pict_type == I_TYPE) { |
694 | 579 if(s->dquant && cbp){ |
1708 | 580 put_mb_modes(s, 2, 1, 0, 0); /* macroblock_type : macroblock_quant = 1 */ |
4621 | 581 put_qscale(s); |
694 | 582 }else{ |
1708 | 583 put_mb_modes(s, 1, 1, 0, 0); /* macroblock_type : macroblock_quant = 0 */ |
694 | 584 s->qscale -= s->dquant; |
585 } | |
740 | 586 s->misc_bits+= get_bits_diff(s); |
587 s->i_count++; | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
588 } else if (s->mb_intra) { |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
589 if(s->dquant && cbp){ |
1708 | 590 put_mb_modes(s, 6, 0x01, 0, 0); |
4621 | 591 put_qscale(s); |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
592 }else{ |
1708 | 593 put_mb_modes(s, 5, 0x03, 0, 0); |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
594 s->qscale -= s->dquant; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
595 } |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
596 s->misc_bits+= get_bits_diff(s); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
597 s->i_count++; |
1708 | 598 memset(s->last_mv, 0, sizeof(s->last_mv)); |
2967 | 599 } else if (s->pict_type == P_TYPE) { |
1708 | 600 if(s->mv_type == MV_TYPE_16X16){ |
0 | 601 if (cbp != 0) { |
1708 | 602 if ((motion_x|motion_y) == 0) { |
694 | 603 if(s->dquant){ |
1708 | 604 put_mb_modes(s, 5, 1, 0, 0); /* macroblock_pattern & quant */ |
4621 | 605 put_qscale(s); |
694 | 606 }else{ |
1708 | 607 put_mb_modes(s, 2, 1, 0, 0); /* macroblock_pattern only */ |
694 | 608 } |
740 | 609 s->misc_bits+= get_bits_diff(s); |
0 | 610 } else { |
694 | 611 if(s->dquant){ |
1708 | 612 put_mb_modes(s, 5, 2, 1, 0); /* motion + cbp */ |
4621 | 613 put_qscale(s); |
694 | 614 }else{ |
1708 | 615 put_mb_modes(s, 1, 1, 1, 0); /* motion + cbp */ |
694 | 616 } |
740 | 617 s->misc_bits+= get_bits_diff(s); |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
618 mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code); // RAL: f_code parameter added |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
619 mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code); // RAL: f_code parameter added |
740 | 620 s->mv_bits+= get_bits_diff(s); |
0 | 621 } |
622 } else { | |
623 put_bits(&s->pb, 3, 1); /* motion only */ | |
1677 | 624 if (!s->frame_pred_frame_dct) |
625 put_bits(&s->pb, 2, 2); /* motion_type: frame */ | |
1708 | 626 s->misc_bits+= get_bits_diff(s); |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
627 mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code); // RAL: f_code parameter added |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
628 mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code); // RAL: f_code parameter added |
694 | 629 s->qscale -= s->dquant; |
740 | 630 s->mv_bits+= get_bits_diff(s); |
0 | 631 } |
1708 | 632 s->last_mv[0][1][0]= s->last_mv[0][0][0]= motion_x; |
633 s->last_mv[0][1][1]= s->last_mv[0][0][1]= motion_y; | |
634 }else{ | |
635 assert(!s->frame_pred_frame_dct && s->mv_type == MV_TYPE_FIELD); | |
636 | |
637 if (cbp) { | |
638 if(s->dquant){ | |
639 put_mb_modes(s, 5, 2, 1, 1); /* motion + cbp */ | |
4621 | 640 put_qscale(s); |
1708 | 641 }else{ |
642 put_mb_modes(s, 1, 1, 1, 1); /* motion + cbp */ | |
643 } | |
644 } else { | |
645 put_bits(&s->pb, 3, 1); /* motion only */ | |
646 put_bits(&s->pb, 2, 1); /* motion_type: field */ | |
647 s->qscale -= s->dquant; | |
648 } | |
649 s->misc_bits+= get_bits_diff(s); | |
650 for(i=0; i<2; i++){ | |
651 put_bits(&s->pb, 1, s->field_select[0][i]); | |
652 mpeg1_encode_motion(s, s->mv[0][i][0] - s->last_mv[0][i][0] , s->f_code); | |
653 mpeg1_encode_motion(s, s->mv[0][i][1] - (s->last_mv[0][i][1]>>1), s->f_code); | |
654 s->last_mv[0][i][0]= s->mv[0][i][0]; | |
655 s->last_mv[0][i][1]= 2*s->mv[0][i][1]; | |
656 } | |
657 s->mv_bits+= get_bits_diff(s); | |
658 } | |
3309 | 659 if(cbp) { |
660 if (s->chroma_y_shift) { | |
661 put_bits(&s->pb, mbPatTable[cbp][1], mbPatTable[cbp][0]); | |
662 } else { | |
663 put_bits(&s->pb, mbPatTable[cbp>>2][1], mbPatTable[cbp>>2][0]); | |
664 put_bits(&s->pb, 2, cbp & 3); | |
665 } | |
666 } | |
1708 | 667 s->f_count++; |
2967 | 668 } else{ |
1708 | 669 static const int mb_type_len[4]={0,3,4,2}; //bak,for,bi |
670 | |
671 if(s->mv_type == MV_TYPE_16X16){ | |
672 if (cbp){ // With coded bloc pattern | |
673 if (s->dquant) { | |
674 if(s->mv_dir == MV_DIR_FORWARD) | |
675 put_mb_modes(s, 6, 3, 1, 0); | |
676 else | |
677 put_mb_modes(s, mb_type_len[s->mv_dir]+3, 2, 1, 0); | |
4621 | 678 put_qscale(s); |
1708 | 679 } else { |
680 put_mb_modes(s, mb_type_len[s->mv_dir], 3, 1, 0); | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
681 } |
1708 | 682 }else{ // No coded bloc pattern |
683 put_bits(&s->pb, mb_type_len[s->mv_dir], 2); | |
684 if (!s->frame_pred_frame_dct) | |
685 put_bits(&s->pb, 2, 2); /* motion_type: frame */ | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
686 s->qscale -= s->dquant; |
1708 | 687 } |
688 s->misc_bits += get_bits_diff(s); | |
689 if (s->mv_dir&MV_DIR_FORWARD){ | |
2967 | 690 mpeg1_encode_motion(s, s->mv[0][0][0] - s->last_mv[0][0][0], s->f_code); |
691 mpeg1_encode_motion(s, s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code); | |
1708 | 692 s->last_mv[0][0][0]=s->last_mv[0][1][0]= s->mv[0][0][0]; |
693 s->last_mv[0][0][1]=s->last_mv[0][1][1]= s->mv[0][0][1]; | |
694 s->f_count++; | |
695 } | |
696 if (s->mv_dir&MV_DIR_BACKWARD){ | |
2967 | 697 mpeg1_encode_motion(s, s->mv[1][0][0] - s->last_mv[1][0][0], s->b_code); |
698 mpeg1_encode_motion(s, s->mv[1][0][1] - s->last_mv[1][0][1], s->b_code); | |
1708 | 699 s->last_mv[1][0][0]=s->last_mv[1][1][0]= s->mv[1][0][0]; |
700 s->last_mv[1][0][1]=s->last_mv[1][1][1]= s->mv[1][0][1]; | |
701 s->b_count++; | |
702 } | |
703 }else{ | |
704 assert(s->mv_type == MV_TYPE_FIELD); | |
705 assert(!s->frame_pred_frame_dct); | |
706 if (cbp){ // With coded bloc pattern | |
707 if (s->dquant) { | |
708 if(s->mv_dir == MV_DIR_FORWARD) | |
709 put_mb_modes(s, 6, 3, 1, 1); | |
710 else | |
711 put_mb_modes(s, mb_type_len[s->mv_dir]+3, 2, 1, 1); | |
4621 | 712 put_qscale(s); |
1708 | 713 } else { |
714 put_mb_modes(s, mb_type_len[s->mv_dir], 3, 1, 1); | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
715 } |
1708 | 716 }else{ // No coded bloc pattern |
717 put_bits(&s->pb, mb_type_len[s->mv_dir], 2); | |
718 put_bits(&s->pb, 2, 1); /* motion_type: field */ | |
719 s->qscale -= s->dquant; | |
720 } | |
721 s->misc_bits += get_bits_diff(s); | |
722 if (s->mv_dir&MV_DIR_FORWARD){ | |
723 for(i=0; i<2; i++){ | |
724 put_bits(&s->pb, 1, s->field_select[0][i]); | |
725 mpeg1_encode_motion(s, s->mv[0][i][0] - s->last_mv[0][i][0] , s->f_code); | |
726 mpeg1_encode_motion(s, s->mv[0][i][1] - (s->last_mv[0][i][1]>>1), s->f_code); | |
727 s->last_mv[0][i][0]= s->mv[0][i][0]; | |
728 s->last_mv[0][i][1]= 2*s->mv[0][i][1]; | |
729 } | |
730 s->f_count++; | |
731 } | |
732 if (s->mv_dir&MV_DIR_BACKWARD){ | |
733 for(i=0; i<2; i++){ | |
734 put_bits(&s->pb, 1, s->field_select[1][i]); | |
735 mpeg1_encode_motion(s, s->mv[1][i][0] - s->last_mv[1][i][0] , s->b_code); | |
736 mpeg1_encode_motion(s, s->mv[1][i][1] - (s->last_mv[1][i][1]>>1), s->b_code); | |
737 s->last_mv[1][i][0]= s->mv[1][i][0]; | |
738 s->last_mv[1][i][1]= 2*s->mv[1][i][1]; | |
739 } | |
740 s->b_count++; | |
741 } | |
0 | 742 } |
1708 | 743 s->mv_bits += get_bits_diff(s); |
3309 | 744 if(cbp) { |
745 if (s->chroma_y_shift) { | |
746 put_bits(&s->pb, mbPatTable[cbp][1], mbPatTable[cbp][0]); | |
747 } else { | |
748 put_bits(&s->pb, mbPatTable[cbp>>2][1], mbPatTable[cbp>>2][0]); | |
749 put_bits(&s->pb, 2, cbp & 3); | |
750 } | |
751 } | |
1708 | 752 } |
3309 | 753 for(i=0;i<mb_block_count;i++) { |
754 if (cbp & (1 << (mb_block_count - 1 - i))) { | |
0 | 755 mpeg1_encode_block(s, block[i], i); |
756 } | |
757 } | |
1160 | 758 s->mb_skip_run = 0; |
740 | 759 if(s->mb_intra) |
760 s->i_tex_bits+= get_bits_diff(s); | |
761 else | |
762 s->p_tex_bits+= get_bits_diff(s); | |
0 | 763 } |
764 } | |
765 | |
3309 | 766 void mpeg1_encode_mb(MpegEncContext *s, DCTELEM block[6][64], int motion_x, int motion_y) |
767 { | |
768 if (s->chroma_format == CHROMA_420) mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 6); | |
769 else mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 8); | |
770 } | |
771 | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
772 // RAL: Parameter added: f_or_b_code |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
773 static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code) |
0 | 774 { |
2093 | 775 int code, bit_size, l, bits, range, sign; |
0 | 776 |
777 if (val == 0) { | |
778 /* zero vector */ | |
779 code = 0; | |
780 put_bits(&s->pb, | |
2967 | 781 mbMotionVectorTable[0][1], |
782 mbMotionVectorTable[0][0]); | |
0 | 783 } else { |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
784 bit_size = f_or_b_code - 1; |
0 | 785 range = 1 << bit_size; |
786 /* modulo encoding */ | |
2093 | 787 l= INT_BIT - 5 - bit_size; |
788 val= (val<<l)>>l; | |
0 | 789 |
790 if (val >= 0) { | |
791 val--; | |
792 code = (val >> bit_size) + 1; | |
793 bits = val & (range - 1); | |
794 sign = 0; | |
795 } else { | |
796 val = -val; | |
797 val--; | |
798 code = (val >> bit_size) + 1; | |
799 bits = val & (range - 1); | |
800 sign = 1; | |
801 } | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
802 |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
803 assert(code > 0 && code <= 16); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
804 |
0 | 805 put_bits(&s->pb, |
2967 | 806 mbMotionVectorTable[code][1], |
807 mbMotionVectorTable[code][0]); | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
808 |
0 | 809 put_bits(&s->pb, 1, sign); |
810 if (bit_size > 0) { | |
811 put_bits(&s->pb, bit_size, bits); | |
812 } | |
813 } | |
814 } | |
815 | |
498 | 816 void ff_mpeg1_encode_init(MpegEncContext *s) |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
817 { |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
818 static int done=0; |
498 | 819 |
820 common_init(s); | |
821 | |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
822 if(!done){ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
823 int f_code; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
824 int mv; |
2979 | 825 int i; |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
826 |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
827 done=1; |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
828 init_rl(&rl_mpeg1, 1); |
3305 | 829 if(s->intra_vlc_format) |
830 init_rl(&rl_mpeg2, 1); | |
947 | 831 |
2979 | 832 for(i=0; i<64; i++) |
833 { | |
834 mpeg1_max_level[0][i]= rl_mpeg1.max_level[0][i]; | |
835 mpeg1_index_run[0][i]= rl_mpeg1.index_run[0][i]; | |
836 } | |
2967 | 837 |
3304 | 838 init_uni_ac_vlc(&rl_mpeg1, uni_mpeg1_ac_vlc_len); |
3305 | 839 if(s->intra_vlc_format) |
840 init_uni_ac_vlc(&rl_mpeg2, uni_mpeg2_ac_vlc_len); | |
498 | 841 |
2979 | 842 /* build unified dc encoding tables */ |
843 for(i=-255; i<256; i++) | |
844 { | |
845 int adiff, index; | |
846 int bits, code; | |
847 int diff=i; | |
848 | |
4001 | 849 adiff = FFABS(diff); |
2979 | 850 if(diff<0) diff--; |
851 index = av_log2(2*adiff); | |
852 | |
853 bits= vlc_dc_lum_bits[index] + index; | |
854 code= (vlc_dc_lum_code[index]<<index) + (diff & ((1 << index) - 1)); | |
855 mpeg1_lum_dc_uni[i+255]= bits + (code<<8); | |
856 | |
857 bits= vlc_dc_chroma_bits[index] + index; | |
858 code= (vlc_dc_chroma_code[index]<<index) + (diff & ((1 << index) - 1)); | |
859 mpeg1_chr_dc_uni[i+255]= bits + (code<<8); | |
860 } | |
498 | 861 |
1162 | 862 mv_penalty= av_mallocz( sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1) ); |
863 | |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
864 for(f_code=1; f_code<=MAX_FCODE; f_code++){ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
865 for(mv=-MAX_MV; mv<=MAX_MV; mv++){ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
866 int len; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
867 |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
868 if(mv==0) len= mbMotionVectorTable[0][1]; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
869 else{ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
870 int val, bit_size, range, code; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
871 |
1893
779bdf5063ce
1000000l (using uninitalized variable for initalizing bits per MV table)
michael
parents:
1892
diff
changeset
|
872 bit_size = f_code - 1; |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
873 range = 1 << bit_size; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
874 |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
875 val=mv; |
2967 | 876 if (val < 0) |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
877 val = -val; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
878 val--; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
879 code = (val >> bit_size) + 1; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
880 if(code<17){ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
881 len= mbMotionVectorTable[code][1] + 1 + bit_size; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
882 }else{ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
883 len= mbMotionVectorTable[16][1] + 2 + bit_size; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
884 } |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
885 } |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
886 |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
887 mv_penalty[f_code][mv+MAX_MV]= len; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
888 } |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
889 } |
2967 | 890 |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
891 |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
892 for(f_code=MAX_FCODE; f_code>0; f_code--){ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
893 for(mv=-(8<<f_code); mv<(8<<f_code); mv++){ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
894 fcode_tab[mv+MAX_MV]= f_code; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
895 } |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
896 } |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
897 } |
936 | 898 s->me.mv_penalty= mv_penalty; |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
899 s->fcode_tab= fcode_tab; |
1421 | 900 if(s->codec_id == CODEC_ID_MPEG1VIDEO){ |
901 s->min_qcoeff=-255; | |
902 s->max_qcoeff= 255; | |
903 }else{ | |
904 s->min_qcoeff=-2047; | |
905 s->max_qcoeff= 2047; | |
906 } | |
3305 | 907 if (s->intra_vlc_format) { |
908 s->intra_ac_vlc_length= | |
909 s->intra_ac_vlc_last_length= uni_mpeg2_ac_vlc_len; | |
910 } else { | |
911 s->intra_ac_vlc_length= | |
912 s->intra_ac_vlc_last_length= uni_mpeg1_ac_vlc_len; | |
913 } | |
1503 | 914 s->inter_ac_vlc_length= |
915 s->inter_ac_vlc_last_length= uni_mpeg1_ac_vlc_len; | |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
916 } |
498 | 917 |
0 | 918 static inline void encode_dc(MpegEncContext *s, int diff, int component) |
919 { | |
1992 | 920 if(((unsigned) (diff+255)) >= 511){ |
921 int index; | |
922 | |
923 if(diff<0){ | |
924 index= av_log2_16bit(-2*diff); | |
925 diff--; | |
926 }else{ | |
927 index= av_log2_16bit(2*diff); | |
928 } | |
929 if (component == 0) { | |
930 put_bits( | |
2967 | 931 &s->pb, |
1992 | 932 vlc_dc_lum_bits[index] + index, |
933 (vlc_dc_lum_code[index]<<index) + (diff & ((1 << index) - 1))); | |
934 }else{ | |
935 put_bits( | |
2967 | 936 &s->pb, |
1992 | 937 vlc_dc_chroma_bits[index] + index, |
938 (vlc_dc_chroma_code[index]<<index) + (diff & ((1 << index) - 1))); | |
939 } | |
940 }else{ | |
0 | 941 if (component == 0) { |
237
75123d30f862
optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents:
236
diff
changeset
|
942 put_bits( |
2979 | 943 &s->pb, |
944 mpeg1_lum_dc_uni[diff+255]&0xFF, | |
945 mpeg1_lum_dc_uni[diff+255]>>8); | |
0 | 946 } else { |
237
75123d30f862
optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents:
236
diff
changeset
|
947 put_bits( |
2967 | 948 &s->pb, |
2979 | 949 mpeg1_chr_dc_uni[diff+255]&0xFF, |
950 mpeg1_chr_dc_uni[diff+255]>>8); | |
0 | 951 } |
1992 | 952 } |
0 | 953 } |
954 | |
2967 | 955 static void mpeg1_encode_block(MpegEncContext *s, |
956 DCTELEM *block, | |
0 | 957 int n) |
958 { | |
959 int alevel, level, last_non_zero, dc, diff, i, j, run, last_index, sign; | |
960 int code, component; | |
3305 | 961 const uint16_t (*table_vlc)[2] = rl_mpeg1.table_vlc; |
0 | 962 |
963 last_index = s->block_last_index[n]; | |
964 | |
965 /* DC coef */ | |
966 if (s->mb_intra) { | |
3309 | 967 component = (n <= 3 ? 0 : (n&1) + 1); |
0 | 968 dc = block[0]; /* overflow is impossible */ |
969 diff = dc - s->last_dc[component]; | |
970 encode_dc(s, diff, component); | |
971 s->last_dc[component] = dc; | |
972 i = 1; | |
1421 | 973 if (s->intra_vlc_format) |
3305 | 974 table_vlc = rl_mpeg2.table_vlc; |
0 | 975 } else { |
976 /* encode the first coefficient : needs to be done here because | |
977 it is handled slightly differently */ | |
978 level = block[0]; | |
979 if (abs(level) == 1) { | |
1064 | 980 code = ((uint32_t)level >> 31); /* the sign bit */ |
0 | 981 put_bits(&s->pb, 2, code | 0x02); |
982 i = 1; | |
983 } else { | |
984 i = 0; | |
985 last_non_zero = -1; | |
986 goto next_coef; | |
987 } | |
988 } | |
989 | |
990 /* now quantify & encode AC coefs */ | |
991 last_non_zero = i - 1; | |
236 | 992 |
0 | 993 for(;i<=last_index;i++) { |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
994 j = s->intra_scantable.permutated[i]; |
0 | 995 level = block[j]; |
996 next_coef: | |
997 #if 0 | |
998 if (level != 0) | |
999 dprintf("level[%d]=%d\n", i, level); | |
2967 | 1000 #endif |
0 | 1001 /* encode using VLC */ |
1002 if (level != 0) { | |
1003 run = i - last_non_zero - 1; | |
2967 | 1004 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
1005 alevel= level; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
1006 MASK_ABS(sign, alevel) |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
1007 sign&=1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
1008 |
947 | 1009 if (alevel <= mpeg1_max_level[0][run]){ |
236 | 1010 code= mpeg1_index_run[0][run] + alevel - 1; |
2979 | 1011 /* store the vlc & sign at once */ |
3305 | 1012 put_bits(&s->pb, table_vlc[code][1]+1, (table_vlc[code][0]<<1) + sign); |
0 | 1013 } else { |
2979 | 1014 /* escape seems to be pretty rare <5% so i dont optimize it */ |
3305 | 1015 put_bits(&s->pb, table_vlc[111][1], table_vlc[111][0]); |
0 | 1016 /* escape: only clip in this case */ |
1017 put_bits(&s->pb, 6, run); | |
1421 | 1018 if(s->codec_id == CODEC_ID_MPEG1VIDEO){ |
1019 if (alevel < 128) { | |
1020 put_bits(&s->pb, 8, level & 0xff); | |
0 | 1021 } else { |
1421 | 1022 if (level < 0) { |
1023 put_bits(&s->pb, 16, 0x8001 + level + 255); | |
1024 } else { | |
1025 put_bits(&s->pb, 16, level & 0xffff); | |
1026 } | |
0 | 1027 } |
1421 | 1028 }else{ |
1029 put_bits(&s->pb, 12, level & 0xfff); | |
0 | 1030 } |
1031 } | |
1032 last_non_zero = i; | |
1033 } | |
1034 } | |
1035 /* end of block */ | |
3305 | 1036 put_bits(&s->pb, table_vlc[112][1], table_vlc[112][0]); |
0 | 1037 } |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
1038 #endif //CONFIG_ENCODERS |
0 | 1039 |
1040 /******************************************/ | |
1041 /* decoding */ | |
1042 | |
1043 static VLC dc_lum_vlc; | |
1044 static VLC dc_chroma_vlc; | |
1045 static VLC mv_vlc; | |
1046 static VLC mbincr_vlc; | |
1047 static VLC mb_ptype_vlc; | |
1048 static VLC mb_btype_vlc; | |
1049 static VLC mb_pat_vlc; | |
1050 | |
1904 | 1051 static void init_vlcs(void) |
0 | 1052 { |
1053 static int done = 0; | |
1054 | |
1055 if (!done) { | |
494 | 1056 done = 1; |
0 | 1057 |
2967 | 1058 init_vlc(&dc_lum_vlc, DC_VLC_BITS, 12, |
0 | 1059 vlc_dc_lum_bits, 1, 1, |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
1060 vlc_dc_lum_code, 2, 2, 1); |
2967 | 1061 init_vlc(&dc_chroma_vlc, DC_VLC_BITS, 12, |
0 | 1062 vlc_dc_chroma_bits, 1, 1, |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
1063 vlc_dc_chroma_code, 2, 2, 1); |
2967 | 1064 init_vlc(&mv_vlc, MV_VLC_BITS, 17, |
0 | 1065 &mbMotionVectorTable[0][1], 2, 1, |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
1066 &mbMotionVectorTable[0][0], 2, 1, 1); |
2967 | 1067 init_vlc(&mbincr_vlc, MBINCR_VLC_BITS, 36, |
0 | 1068 &mbAddrIncrTable[0][1], 2, 1, |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
1069 &mbAddrIncrTable[0][0], 2, 1, 1); |
1853 | 1070 init_vlc(&mb_pat_vlc, MB_PAT_VLC_BITS, 64, |
0 | 1071 &mbPatTable[0][1], 2, 1, |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
1072 &mbPatTable[0][0], 2, 1, 1); |
2967 | 1073 |
1074 init_vlc(&mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7, | |
0 | 1075 &table_mb_ptype[0][1], 2, 1, |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
1076 &table_mb_ptype[0][0], 2, 1, 1); |
2967 | 1077 init_vlc(&mb_btype_vlc, MB_BTYPE_VLC_BITS, 11, |
0 | 1078 &table_mb_btype[0][1], 2, 1, |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
1079 &table_mb_btype[0][0], 2, 1, 1); |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
1080 init_rl(&rl_mpeg1, 1); |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
1081 init_rl(&rl_mpeg2, 1); |
552 | 1082 |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
1083 init_2d_vlc_rl(&rl_mpeg1, 1); |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
1084 init_2d_vlc_rl(&rl_mpeg2, 1); |
0 | 1085 } |
1086 } | |
1087 | |
1088 static inline int get_dmv(MpegEncContext *s) | |
1089 { | |
2967 | 1090 if(get_bits1(&s->gb)) |
21 | 1091 return 1 - (get_bits1(&s->gb) << 1); |
0 | 1092 else |
1093 return 0; | |
1094 } | |
1095 | |
54 | 1096 static inline int get_qscale(MpegEncContext *s) |
1097 { | |
1253
5642ebadf1b5
small optimize mpeg12.c/get_qscale patch by (BERO <bero at geocities dot co dot jp>) and the return idea by arpi
michaelni
parents:
1220
diff
changeset
|
1098 int qscale = get_bits(&s->gb, 5); |
1728 | 1099 if (s->q_scale_type) { |
1100 return non_linear_qscale[qscale]; | |
1101 } else { | |
1102 return qscale << 1; | |
54 | 1103 } |
1104 } | |
1105 | |
0 | 1106 /* motion type (for mpeg2) */ |
1107 #define MT_FIELD 1 | |
1108 #define MT_FRAME 2 | |
1109 #define MT_16X8 2 | |
1110 #define MT_DMV 3 | |
1111 | |
1112 static int mpeg_decode_mb(MpegEncContext *s, | |
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1841
diff
changeset
|
1113 DCTELEM block[12][64]) |
0 | 1114 { |
751 | 1115 int i, j, k, cbp, val, mb_type, motion_type; |
2591
65874d96c2da
Typo errors patch by (QuickTime | ffmpeg gmail com>
michael
parents:
2590
diff
changeset
|
1116 const int mb_block_count = 4 + (1<< s->chroma_format); |
2076 | 1117 |
0 | 1118 dprintf("decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y); |
1119 | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2624
diff
changeset
|
1120 assert(s->mb_skipped==0); |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
947
diff
changeset
|
1121 |
1160 | 1122 if (s->mb_skip_run-- != 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:
1164
diff
changeset
|
1123 if(s->pict_type == I_TYPE){ |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2624
diff
changeset
|
1124 av_log(s->avctx, AV_LOG_ERROR, "skipped MB in I frame at %d %d\n", s->mb_x, s->mb_y); |
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:
1164
diff
changeset
|
1125 return -1; |
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:
1164
diff
changeset
|
1126 } |
2967 | 1127 |
0 | 1128 /* skip mb */ |
1129 s->mb_intra = 0; | |
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1841
diff
changeset
|
1130 for(i=0;i<12;i++) |
0 | 1131 s->block_last_index[i] = -1; |
1841 | 1132 if(s->picture_structure == PICT_FRAME) |
1133 s->mv_type = MV_TYPE_16X16; | |
1134 else | |
1135 s->mv_type = MV_TYPE_FIELD; | |
0 | 1136 if (s->pict_type == P_TYPE) { |
1137 /* if P type, zero motion vector is implied */ | |
1138 s->mv_dir = MV_DIR_FORWARD; | |
1139 s->mv[0][0][0] = s->mv[0][0][1] = 0; | |
1140 s->last_mv[0][0][0] = s->last_mv[0][0][1] = 0; | |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1141 s->last_mv[0][1][0] = s->last_mv[0][1][1] = 0; |
1841 | 1142 s->field_select[0][0]= s->picture_structure - 1; |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2624
diff
changeset
|
1143 s->mb_skipped = 1; |
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:
1164
diff
changeset
|
1144 s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16; |
0 | 1145 } else { |
2575 | 1146 int mb_type; |
2967 | 1147 |
2575 | 1148 if(s->mb_x) |
1149 mb_type= s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride - 1]; | |
1150 else | |
2967 | 1151 mb_type= s->current_picture.mb_type[ s->mb_width + (s->mb_y-1)*s->mb_stride - 1]; // FIXME not sure if this is allowed in mpeg at all, |
2575 | 1152 if(IS_INTRA(mb_type)) |
1153 return -1; | |
2967 | 1154 |
0 | 1155 /* if B type, reuse previous vectors and directions */ |
1156 s->mv[0][0][0] = s->last_mv[0][0][0]; | |
1157 s->mv[0][0][1] = s->last_mv[0][0][1]; | |
1158 s->mv[1][0][0] = s->last_mv[1][0][0]; | |
1159 s->mv[1][0][1] = s->last_mv[1][0][1]; | |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
947
diff
changeset
|
1160 |
2967 | 1161 s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= |
2575 | 1162 mb_type | MB_TYPE_SKIP; |
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:
1164
diff
changeset
|
1163 // assert(s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride - 1]&(MB_TYPE_16x16|MB_TYPE_16x8)); |
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:
1164
diff
changeset
|
1164 |
2967 | 1165 if((s->mv[0][0][0]|s->mv[0][0][1]|s->mv[1][0][0]|s->mv[1][0][1])==0) |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2624
diff
changeset
|
1166 s->mb_skipped = 1; |
0 | 1167 } |
930 | 1168 |
0 | 1169 return 0; |
1170 } | |
1171 | |
1172 switch(s->pict_type) { | |
1173 default: | |
1174 case I_TYPE: | |
21 | 1175 if (get_bits1(&s->gb) == 0) { |
1376 | 1176 if (get_bits1(&s->gb) == 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1177 av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in I Frame at %d %d\n", s->mb_x, s->mb_y); |
0 | 1178 return -1; |
1376 | 1179 } |
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:
1164
diff
changeset
|
1180 mb_type = MB_TYPE_QUANT | MB_TYPE_INTRA; |
0 | 1181 } else { |
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:
1164
diff
changeset
|
1182 mb_type = MB_TYPE_INTRA; |
0 | 1183 } |
1184 break; | |
1185 case P_TYPE: | |
545 | 1186 mb_type = get_vlc2(&s->gb, mb_ptype_vlc.table, MB_PTYPE_VLC_BITS, 1); |
568 | 1187 if (mb_type < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1188 av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in P Frame at %d %d\n", s->mb_x, s->mb_y); |
0 | 1189 return -1; |
568 | 1190 } |
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:
1164
diff
changeset
|
1191 mb_type = ptype2mb_type[ mb_type ]; |
0 | 1192 break; |
1193 case B_TYPE: | |
545 | 1194 mb_type = get_vlc2(&s->gb, mb_btype_vlc.table, MB_BTYPE_VLC_BITS, 1); |
568 | 1195 if (mb_type < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1196 av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in B Frame at %d %d\n", s->mb_x, s->mb_y); |
0 | 1197 return -1; |
568 | 1198 } |
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:
1164
diff
changeset
|
1199 mb_type = btype2mb_type[ mb_type ]; |
0 | 1200 break; |
1201 } | |
1202 dprintf("mb_type=%x\n", mb_type); | |
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:
1164
diff
changeset
|
1203 // motion_type = 0; /* avoid warning */ |
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:
1164
diff
changeset
|
1204 if (IS_INTRA(mb_type)) { |
2624 | 1205 s->dsp.clear_blocks(s->block[0]); |
2967 | 1206 |
2624 | 1207 if(!s->chroma_y_shift){ |
1208 s->dsp.clear_blocks(s->block[6]); | |
1209 } | |
2967 | 1210 |
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:
1164
diff
changeset
|
1211 /* compute dct type */ |
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:
1164
diff
changeset
|
1212 if (s->picture_structure == PICT_FRAME && //FIXME add a interlaced_dct coded var? |
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:
1164
diff
changeset
|
1213 !s->frame_pred_frame_dct) { |
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:
1164
diff
changeset
|
1214 s->interlaced_dct = get_bits1(&s->gb); |
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:
1164
diff
changeset
|
1215 } |
0 | 1216 |
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:
1164
diff
changeset
|
1217 if (IS_QUANT(mb_type)) |
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:
1164
diff
changeset
|
1218 s->qscale = get_qscale(s); |
2967 | 1219 |
0 | 1220 if (s->concealment_motion_vectors) { |
1221 /* just parse them */ | |
2967 | 1222 if (s->picture_structure != PICT_FRAME) |
21 | 1223 skip_bits1(&s->gb); /* field select */ |
2967 | 1224 |
1225 s->mv[0][0][0]= s->last_mv[0][0][0]= s->last_mv[0][1][0] = | |
1323 | 1226 mpeg_decode_motion(s, s->mpeg_f_code[0][0], s->last_mv[0][0][0]); |
2967 | 1227 s->mv[0][0][1]= s->last_mv[0][0][1]= s->last_mv[0][1][1] = |
1323 | 1228 mpeg_decode_motion(s, s->mpeg_f_code[0][1], s->last_mv[0][0][1]); |
1229 | |
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:
1164
diff
changeset
|
1230 skip_bits1(&s->gb); /* marker */ |
1323 | 1231 }else |
1232 memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */ | |
0 | 1233 s->mb_intra = 1; |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1234 #ifdef HAVE_XVMC |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1235 //one 1 we memcpy blocks in xvmcvideo |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1236 if(s->avctx->xvmc_acceleration > 1){ |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1237 XVMC_pack_pblocks(s,-1);//inter are always full blocks |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1238 if(s->swap_uv){ |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1239 exchange_uv(s); |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1240 } |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1241 } |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1242 #endif |
0 | 1243 |
1421 | 1244 if (s->codec_id == CODEC_ID_MPEG2VIDEO) { |
2622 | 1245 if(s->flags2 & CODEC_FLAG2_FAST){ |
1246 for(i=0;i<6;i++) { | |
1247 mpeg2_fast_decode_block_intra(s, s->pblocks[i], i); | |
1248 } | |
1249 }else{ | |
1250 for(i=0;i<mb_block_count;i++) { | |
1251 if (mpeg2_decode_block_intra(s, s->pblocks[i], i) < 0) | |
1252 return -1; | |
1253 } | |
0 | 1254 } |
1255 } else { | |
1256 for(i=0;i<6;i++) { | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1257 if (mpeg1_decode_block_intra(s, s->pblocks[i], i) < 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:
1164
diff
changeset
|
1258 return -1; |
0 | 1259 } |
1260 } | |
1261 } else { | |
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:
1164
diff
changeset
|
1262 if (mb_type & MB_TYPE_ZERO_MV){ |
1655 | 1263 assert(mb_type & MB_TYPE_CBP); |
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:
1164
diff
changeset
|
1264 |
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:
1164
diff
changeset
|
1265 /* compute dct type */ |
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:
1164
diff
changeset
|
1266 if (s->picture_structure == PICT_FRAME && //FIXME add a interlaced_dct coded var? |
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:
1164
diff
changeset
|
1267 !s->frame_pred_frame_dct) { |
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:
1164
diff
changeset
|
1268 s->interlaced_dct = get_bits1(&s->gb); |
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:
1164
diff
changeset
|
1269 } |
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:
1164
diff
changeset
|
1270 |
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:
1164
diff
changeset
|
1271 if (IS_QUANT(mb_type)) |
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:
1164
diff
changeset
|
1272 s->qscale = get_qscale(s); |
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:
1164
diff
changeset
|
1273 |
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:
1164
diff
changeset
|
1274 s->mv_dir = MV_DIR_FORWARD; |
1841 | 1275 if(s->picture_structure == PICT_FRAME) |
1276 s->mv_type = MV_TYPE_16X16; | |
1277 else{ | |
1278 s->mv_type = MV_TYPE_FIELD; | |
1279 mb_type |= MB_TYPE_INTERLACED; | |
1280 s->field_select[0][0]= s->picture_structure - 1; | |
1281 } | |
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:
1164
diff
changeset
|
1282 s->last_mv[0][0][0] = 0; |
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:
1164
diff
changeset
|
1283 s->last_mv[0][0][1] = 0; |
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:
1164
diff
changeset
|
1284 s->last_mv[0][1][0] = 0; |
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:
1164
diff
changeset
|
1285 s->last_mv[0][1][1] = 0; |
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:
1164
diff
changeset
|
1286 s->mv[0][0][0] = 0; |
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:
1164
diff
changeset
|
1287 s->mv[0][0][1] = 0; |
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:
1164
diff
changeset
|
1288 }else{ |
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:
1164
diff
changeset
|
1289 assert(mb_type & MB_TYPE_L0L1); |
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:
1164
diff
changeset
|
1290 //FIXME decide if MBs in field pictures are MB_TYPE_INTERLACED |
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:
1164
diff
changeset
|
1291 /* get additionnal motion vector type */ |
2967 | 1292 if (s->frame_pred_frame_dct) |
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:
1164
diff
changeset
|
1293 motion_type = MT_FRAME; |
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:
1164
diff
changeset
|
1294 else{ |
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:
1164
diff
changeset
|
1295 motion_type = get_bits(&s->gb, 2); |
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:
1164
diff
changeset
|
1296 } |
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:
1164
diff
changeset
|
1297 |
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:
1164
diff
changeset
|
1298 /* compute dct type */ |
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:
1164
diff
changeset
|
1299 if (s->picture_structure == PICT_FRAME && //FIXME add a interlaced_dct coded var? |
1655 | 1300 !s->frame_pred_frame_dct && HAS_CBP(mb_type)) { |
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:
1164
diff
changeset
|
1301 s->interlaced_dct = get_bits1(&s->gb); |
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:
1164
diff
changeset
|
1302 } |
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:
1164
diff
changeset
|
1303 |
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:
1164
diff
changeset
|
1304 if (IS_QUANT(mb_type)) |
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:
1164
diff
changeset
|
1305 s->qscale = get_qscale(s); |
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:
1164
diff
changeset
|
1306 |
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:
1164
diff
changeset
|
1307 /* motion vectors */ |
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:
1164
diff
changeset
|
1308 s->mv_dir = 0; |
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:
1164
diff
changeset
|
1309 for(i=0;i<2;i++) { |
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:
1164
diff
changeset
|
1310 if (USES_LIST(mb_type, i)) { |
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:
1164
diff
changeset
|
1311 s->mv_dir |= (MV_DIR_FORWARD >> i); |
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:
1164
diff
changeset
|
1312 dprintf("motion_type=%d\n", motion_type); |
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:
1164
diff
changeset
|
1313 switch(motion_type) { |
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:
1164
diff
changeset
|
1314 case MT_FRAME: /* or MT_16X8 */ |
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:
1164
diff
changeset
|
1315 if (s->picture_structure == PICT_FRAME) { |
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:
1164
diff
changeset
|
1316 /* MT_FRAME */ |
2967 | 1317 mb_type |= MB_TYPE_16x16; |
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:
1164
diff
changeset
|
1318 s->mv_type = MV_TYPE_16X16; |
2967 | 1319 s->mv[i][0][0]= s->last_mv[i][0][0]= s->last_mv[i][1][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:
1164
diff
changeset
|
1320 mpeg_decode_motion(s, s->mpeg_f_code[i][0], s->last_mv[i][0][0]); |
2967 | 1321 s->mv[i][0][1]= s->last_mv[i][0][1]= s->last_mv[i][1][1] = |
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:
1164
diff
changeset
|
1322 mpeg_decode_motion(s, s->mpeg_f_code[i][1], s->last_mv[i][0][1]); |
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:
1164
diff
changeset
|
1323 /* full_pel: only for mpeg1 */ |
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:
1164
diff
changeset
|
1324 if (s->full_pel[i]){ |
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:
1164
diff
changeset
|
1325 s->mv[i][0][0] <<= 1; |
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:
1164
diff
changeset
|
1326 s->mv[i][0][1] <<= 1; |
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:
1164
diff
changeset
|
1327 } |
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:
1164
diff
changeset
|
1328 } else { |
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:
1164
diff
changeset
|
1329 /* MT_16X8 */ |
2967 | 1330 mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED; |
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:
1164
diff
changeset
|
1331 s->mv_type = MV_TYPE_16X8; |
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:
1164
diff
changeset
|
1332 for(j=0;j<2;j++) { |
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:
1164
diff
changeset
|
1333 s->field_select[i][j] = get_bits1(&s->gb); |
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:
1164
diff
changeset
|
1334 for(k=0;k<2;k++) { |
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:
1164
diff
changeset
|
1335 val = mpeg_decode_motion(s, s->mpeg_f_code[i][k], |
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:
1164
diff
changeset
|
1336 s->last_mv[i][j][k]); |
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:
1164
diff
changeset
|
1337 s->last_mv[i][j][k] = val; |
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:
1164
diff
changeset
|
1338 s->mv[i][j][k] = val; |
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:
1164
diff
changeset
|
1339 } |
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:
1164
diff
changeset
|
1340 } |
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:
1164
diff
changeset
|
1341 } |
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:
1164
diff
changeset
|
1342 break; |
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:
1164
diff
changeset
|
1343 case MT_FIELD: |
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:
1164
diff
changeset
|
1344 s->mv_type = MV_TYPE_FIELD; |
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:
1164
diff
changeset
|
1345 if (s->picture_structure == PICT_FRAME) { |
2967 | 1346 mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED; |
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:
1164
diff
changeset
|
1347 for(j=0;j<2;j++) { |
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:
1164
diff
changeset
|
1348 s->field_select[i][j] = get_bits1(&s->gb); |
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:
1164
diff
changeset
|
1349 val = mpeg_decode_motion(s, s->mpeg_f_code[i][0], |
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:
1164
diff
changeset
|
1350 s->last_mv[i][j][0]); |
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:
1164
diff
changeset
|
1351 s->last_mv[i][j][0] = val; |
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:
1164
diff
changeset
|
1352 s->mv[i][j][0] = val; |
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:
1164
diff
changeset
|
1353 dprintf("fmx=%d\n", val); |
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:
1164
diff
changeset
|
1354 val = mpeg_decode_motion(s, s->mpeg_f_code[i][1], |
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:
1164
diff
changeset
|
1355 s->last_mv[i][j][1] >> 1); |
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:
1164
diff
changeset
|
1356 s->last_mv[i][j][1] = val << 1; |
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:
1164
diff
changeset
|
1357 s->mv[i][j][1] = val; |
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:
1164
diff
changeset
|
1358 dprintf("fmy=%d\n", val); |
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:
1164
diff
changeset
|
1359 } |
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:
1164
diff
changeset
|
1360 } else { |
2967 | 1361 mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED; |
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:
1164
diff
changeset
|
1362 s->field_select[i][0] = get_bits1(&s->gb); |
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:
1164
diff
changeset
|
1363 for(k=0;k<2;k++) { |
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:
1164
diff
changeset
|
1364 val = mpeg_decode_motion(s, s->mpeg_f_code[i][k], |
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:
1164
diff
changeset
|
1365 s->last_mv[i][0][k]); |
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:
1164
diff
changeset
|
1366 s->last_mv[i][0][k] = val; |
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:
1164
diff
changeset
|
1367 s->last_mv[i][1][k] = val; |
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:
1164
diff
changeset
|
1368 s->mv[i][0][k] = val; |
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:
1164
diff
changeset
|
1369 } |
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:
1164
diff
changeset
|
1370 } |
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:
1164
diff
changeset
|
1371 break; |
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:
1164
diff
changeset
|
1372 case MT_DMV: |
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:
1164
diff
changeset
|
1373 { |
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:
1164
diff
changeset
|
1374 int dmx, dmy, mx, my, m; |
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:
1164
diff
changeset
|
1375 |
2967 | 1376 mx = mpeg_decode_motion(s, s->mpeg_f_code[i][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:
1164
diff
changeset
|
1377 s->last_mv[i][0][0]); |
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:
1164
diff
changeset
|
1378 s->last_mv[i][0][0] = mx; |
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:
1164
diff
changeset
|
1379 s->last_mv[i][1][0] = mx; |
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:
1164
diff
changeset
|
1380 dmx = get_dmv(s); |
2967 | 1381 my = mpeg_decode_motion(s, s->mpeg_f_code[i][1], |
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:
1164
diff
changeset
|
1382 s->last_mv[i][0][1] >> 1); |
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:
1164
diff
changeset
|
1383 dmy = get_dmv(s); |
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:
1164
diff
changeset
|
1384 s->mv_type = MV_TYPE_DMV; |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1385 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1386 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1387 s->last_mv[i][0][1] = my<<1; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1388 s->last_mv[i][1][1] = my<<1; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1389 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1390 s->mv[i][0][0] = mx; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1391 s->mv[i][0][1] = my; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1392 s->mv[i][1][0] = mx;//not used |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1393 s->mv[i][1][1] = my;//not used |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1394 |
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:
1164
diff
changeset
|
1395 if (s->picture_structure == PICT_FRAME) { |
2967 | 1396 mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED; |
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:
1164
diff
changeset
|
1397 |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1398 //m = 1 + 2 * s->top_field_first; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1399 m = s->top_field_first ? 1 : 3; |
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:
1164
diff
changeset
|
1400 |
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:
1164
diff
changeset
|
1401 /* top -> top pred */ |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1402 s->mv[i][2][0] = ((mx * m + (mx > 0)) >> 1) + dmx; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1403 s->mv[i][2][1] = ((my * m + (my > 0)) >> 1) + dmy - 1; |
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:
1164
diff
changeset
|
1404 m = 4 - m; |
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:
1164
diff
changeset
|
1405 s->mv[i][3][0] = ((mx * m + (mx > 0)) >> 1) + dmx; |
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:
1164
diff
changeset
|
1406 s->mv[i][3][1] = ((my * m + (my > 0)) >> 1) + dmy + 1; |
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:
1164
diff
changeset
|
1407 } else { |
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:
1164
diff
changeset
|
1408 mb_type |= MB_TYPE_16x16; |
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:
1164
diff
changeset
|
1409 |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1410 s->mv[i][2][0] = ((mx + (mx > 0)) >> 1) + dmx; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1411 s->mv[i][2][1] = ((my + (my > 0)) >> 1) + dmy; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1412 if(s->picture_structure == PICT_TOP_FIELD) |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1413 s->mv[i][2][1]--; |
2967 | 1414 else |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1415 s->mv[i][2][1]++; |
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:
1164
diff
changeset
|
1416 } |
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:
1164
diff
changeset
|
1417 } |
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:
1164
diff
changeset
|
1418 break; |
1673 | 1419 default: |
1420 av_log(s->avctx, AV_LOG_ERROR, "00 motion_type at %d %d\n", s->mb_x, s->mb_y); | |
1421 return -1; | |
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:
1164
diff
changeset
|
1422 } |
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:
1164
diff
changeset
|
1423 } |
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:
1164
diff
changeset
|
1424 } |
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:
1164
diff
changeset
|
1425 } |
2967 | 1426 |
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:
1164
diff
changeset
|
1427 s->mb_intra = 0; |
2624 | 1428 if (HAS_CBP(mb_type)) { |
1429 s->dsp.clear_blocks(s->block[0]); | |
2967 | 1430 |
2624 | 1431 if(!s->chroma_y_shift){ |
1432 s->dsp.clear_blocks(s->block[6]); | |
1433 } | |
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:
1164
diff
changeset
|
1434 |
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:
1164
diff
changeset
|
1435 cbp = get_vlc2(&s->gb, mb_pat_vlc.table, MB_PAT_VLC_BITS, 1); |
1858 | 1436 if (cbp < 0 || ((cbp == 0) && (s->chroma_format < 2)) ){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1437 av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y); |
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:
1164
diff
changeset
|
1438 return -1; |
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:
1164
diff
changeset
|
1439 } |
2076 | 1440 if(mb_block_count > 6){ |
2979 | 1441 cbp<<= mb_block_count-6; |
1442 cbp |= get_bits(&s->gb, mb_block_count-6); | |
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1841
diff
changeset
|
1443 } |
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:
1164
diff
changeset
|
1444 |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1445 #ifdef HAVE_XVMC |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1446 //on 1 we memcpy blocks in xvmcvideo |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1447 if(s->avctx->xvmc_acceleration > 1){ |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1448 XVMC_pack_pblocks(s,cbp); |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1449 if(s->swap_uv){ |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1450 exchange_uv(s); |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1451 } |
2967 | 1452 } |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1453 #endif |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1454 |
1421 | 1455 if (s->codec_id == CODEC_ID_MPEG2VIDEO) { |
2201 | 1456 if(s->flags2 & CODEC_FLAG2_FAST){ |
1457 for(i=0;i<6;i++) { | |
1458 if(cbp & 32) { | |
1459 mpeg2_fast_decode_block_non_intra(s, s->pblocks[i], i); | |
1460 } else { | |
1461 s->block_last_index[i] = -1; | |
1462 } | |
1463 cbp+=cbp; | |
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:
1164
diff
changeset
|
1464 } |
2201 | 1465 }else{ |
1466 cbp<<= 12-mb_block_count; | |
2967 | 1467 |
2201 | 1468 for(i=0;i<mb_block_count;i++) { |
1469 if ( cbp & (1<<11) ) { | |
1470 if (mpeg2_decode_block_non_intra(s, s->pblocks[i], i) < 0) | |
1471 return -1; | |
1472 } else { | |
1473 s->block_last_index[i] = -1; | |
1474 } | |
1475 cbp+=cbp; | |
1476 } | |
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:
1164
diff
changeset
|
1477 } |
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:
1164
diff
changeset
|
1478 } else { |
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1479 if(s->flags2 & CODEC_FLAG2_FAST){ |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1480 for(i=0;i<6;i++) { |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1481 if (cbp & 32) { |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1482 mpeg1_fast_decode_block_inter(s, s->pblocks[i], i); |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1483 } else { |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1484 s->block_last_index[i] = -1; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1485 } |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1486 cbp+=cbp; |
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:
1164
diff
changeset
|
1487 } |
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1488 }else{ |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1489 for(i=0;i<6;i++) { |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1490 if (cbp & 32) { |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1491 if (mpeg1_decode_block_inter(s, s->pblocks[i], i) < 0) |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1492 return -1; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1493 } else { |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1494 s->block_last_index[i] = -1; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1495 } |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1496 cbp+=cbp; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1497 } |
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:
1164
diff
changeset
|
1498 } |
711 | 1499 } |
1500 }else{ | |
2947
18d47c6673f7
Mark all 12 block unused when there are no coded blocks
iive
parents:
2834
diff
changeset
|
1501 for(i=0;i<12;i++) |
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:
1164
diff
changeset
|
1502 s->block_last_index[i] = -1; |
0 | 1503 } |
1504 } | |
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:
1164
diff
changeset
|
1505 |
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:
1164
diff
changeset
|
1506 s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= mb_type; |
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:
1164
diff
changeset
|
1507 |
0 | 1508 return 0; |
1509 } | |
1510 | |
1511 /* as h263, but only 17 codes */ | |
1512 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred) | |
1513 { | |
1255
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
1514 int code, sign, val, l, shift; |
0 | 1515 |
545 | 1516 code = get_vlc2(&s->gb, mv_vlc.table, MV_VLC_BITS, 2); |
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:
1164
diff
changeset
|
1517 if (code == 0) { |
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:
1164
diff
changeset
|
1518 return pred; |
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:
1164
diff
changeset
|
1519 } |
0 | 1520 if (code < 0) { |
1521 return 0xffff; | |
1522 } | |
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:
1164
diff
changeset
|
1523 |
21 | 1524 sign = get_bits1(&s->gb); |
0 | 1525 shift = fcode - 1; |
1255
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
1526 val = code; |
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
1527 if (shift) { |
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
1528 val = (val - 1) << shift; |
0 | 1529 val |= get_bits(&s->gb, shift); |
1255
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
1530 val++; |
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
1531 } |
0 | 1532 if (sign) |
1533 val = -val; | |
1534 val += pred; | |
2967 | 1535 |
0 | 1536 /* modulo decoding */ |
2093 | 1537 l= INT_BIT - 5 - shift; |
1538 val = (val<<l)>>l; | |
0 | 1539 return val; |
1540 } | |
1541 | |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1542 static inline int decode_dc(GetBitContext *gb, int component) |
0 | 1543 { |
1544 int code, diff; | |
1545 | |
1546 if (component == 0) { | |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1547 code = get_vlc2(gb, dc_lum_vlc.table, DC_VLC_BITS, 2); |
0 | 1548 } else { |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1549 code = get_vlc2(gb, dc_chroma_vlc.table, DC_VLC_BITS, 2); |
0 | 1550 } |
568 | 1551 if (code < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1552 av_log(NULL, AV_LOG_ERROR, "invalid dc code at\n"); |
0 | 1553 return 0xffff; |
568 | 1554 } |
0 | 1555 if (code == 0) { |
1556 diff = 0; | |
1557 } else { | |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1558 diff = get_xbits(gb, code); |
0 | 1559 } |
1560 return diff; | |
1561 } | |
1562 | |
2967 | 1563 static inline int mpeg1_decode_block_intra(MpegEncContext *s, |
1564 DCTELEM *block, | |
0 | 1565 int n) |
1566 { | |
1567 int level, dc, diff, i, j, run; | |
711 | 1568 int component; |
0 | 1569 RLTable *rl = &rl_mpeg1; |
1064 | 1570 uint8_t * const scantable= s->intra_scantable.permutated; |
1571 const uint16_t *quant_matrix= s->intra_matrix; | |
711 | 1572 const int qscale= s->qscale; |
0 | 1573 |
711 | 1574 /* DC coef */ |
1575 component = (n <= 3 ? 0 : n - 4 + 1); | |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1576 diff = decode_dc(&s->gb, component); |
711 | 1577 if (diff >= 0xffff) |
1578 return -1; | |
1579 dc = s->last_dc[component]; | |
1580 dc += diff; | |
1581 s->last_dc[component] = dc; | |
1582 block[0] = dc<<3; | |
1583 dprintf("dc=%d diff=%d\n", dc, diff); | |
1584 i = 0; | |
1585 { | |
2967 | 1586 OPEN_READER(re, &s->gb); |
711 | 1587 /* now quantify & encode AC coefs */ |
1588 for(;;) { | |
1589 UPDATE_CACHE(re, &s->gb); | |
2615
0d88e3f89379
avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents:
2591
diff
changeset
|
1590 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); |
2967 | 1591 |
711 | 1592 if(level == 127){ |
1593 break; | |
1594 } else if(level != 0) { | |
1595 i += run; | |
1596 j = scantable[i]; | |
1728 | 1597 level= (level*qscale*quant_matrix[j])>>4; |
711 | 1598 level= (level-1)|1; |
1599 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
1600 LAST_SKIP_BITS(re, &s->gb, 1); | |
1601 } else { | |
1602 /* escape */ | |
1603 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
1604 UPDATE_CACHE(re, &s->gb); | |
1605 level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8); | |
1606 if (level == -128) { | |
1607 level = SHOW_UBITS(re, &s->gb, 8) - 256; LAST_SKIP_BITS(re, &s->gb, 8); | |
1608 } else if (level == 0) { | |
1609 level = SHOW_UBITS(re, &s->gb, 8) ; LAST_SKIP_BITS(re, &s->gb, 8); | |
1610 } | |
1611 i += run; | |
1612 j = scantable[i]; | |
1613 if(level<0){ | |
1614 level= -level; | |
1728 | 1615 level= (level*qscale*quant_matrix[j])>>4; |
711 | 1616 level= (level-1)|1; |
1617 level= -level; | |
1618 }else{ | |
1728 | 1619 level= (level*qscale*quant_matrix[j])>>4; |
711 | 1620 level= (level-1)|1; |
1621 } | |
1622 } | |
1623 if (i > 63){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1624 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
711 | 1625 return -1; |
1626 } | |
1627 | |
1628 block[j] = level; | |
1629 } | |
1630 CLOSE_READER(re, &s->gb); | |
1631 } | |
1632 s->block_last_index[n] = i; | |
1633 return 0; | |
1634 } | |
1635 | |
2967 | 1636 static inline int mpeg1_decode_block_inter(MpegEncContext *s, |
1637 DCTELEM *block, | |
711 | 1638 int n) |
1639 { | |
1640 int level, i, j, run; | |
1641 RLTable *rl = &rl_mpeg1; | |
1064 | 1642 uint8_t * const scantable= s->intra_scantable.permutated; |
1643 const uint16_t *quant_matrix= s->inter_matrix; | |
711 | 1644 const int qscale= s->qscale; |
1645 | |
1646 { | |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1647 OPEN_READER(re, &s->gb); |
711 | 1648 i = -1; |
0 | 1649 /* special case for the first coef. no need to add a second vlc table */ |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1650 UPDATE_CACHE(re, &s->gb); |
2617 | 1651 if (((int32_t)GET_CACHE(re, &s->gb)) < 0) { |
1728 | 1652 level= (3*qscale*quant_matrix[0])>>5; |
711 | 1653 level= (level-1)|1; |
2617 | 1654 if(GET_CACHE(re, &s->gb)&0x40000000) |
711 | 1655 level= -level; |
714 | 1656 block[0] = level; |
711 | 1657 i++; |
2617 | 1658 SKIP_BITS(re, &s->gb, 2); |
1659 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) | |
1660 goto end; | |
0 | 1661 } |
714 | 1662 |
711 | 1663 /* now quantify & encode AC coefs */ |
1664 for(;;) { | |
2615
0d88e3f89379
avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents:
2591
diff
changeset
|
1665 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); |
2967 | 1666 |
2617 | 1667 if(level != 0) { |
711 | 1668 i += run; |
1669 j = scantable[i]; | |
1728 | 1670 level= ((level*2+1)*qscale*quant_matrix[j])>>5; |
711 | 1671 level= (level-1)|1; |
1672 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
2617 | 1673 SKIP_BITS(re, &s->gb, 1); |
711 | 1674 } else { |
1675 /* escape */ | |
1676 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
1677 UPDATE_CACHE(re, &s->gb); | |
1678 level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8); | |
1679 if (level == -128) { | |
2617 | 1680 level = SHOW_UBITS(re, &s->gb, 8) - 256; SKIP_BITS(re, &s->gb, 8); |
711 | 1681 } else if (level == 0) { |
2617 | 1682 level = SHOW_UBITS(re, &s->gb, 8) ; SKIP_BITS(re, &s->gb, 8); |
711 | 1683 } |
1684 i += run; | |
1685 j = scantable[i]; | |
1686 if(level<0){ | |
1687 level= -level; | |
1728 | 1688 level= ((level*2+1)*qscale*quant_matrix[j])>>5; |
711 | 1689 level= (level-1)|1; |
1690 level= -level; | |
1691 }else{ | |
1728 | 1692 level= ((level*2+1)*qscale*quant_matrix[j])>>5; |
711 | 1693 level= (level-1)|1; |
1694 } | |
1695 } | |
1696 if (i > 63){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1697 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
711 | 1698 return -1; |
1699 } | |
0 | 1700 |
711 | 1701 block[j] = level; |
2617 | 1702 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) |
1703 break; | |
1704 UPDATE_CACHE(re, &s->gb); | |
0 | 1705 } |
2617 | 1706 end: |
1707 LAST_SKIP_BITS(re, &s->gb, 2); | |
711 | 1708 CLOSE_READER(re, &s->gb); |
0 | 1709 } |
711 | 1710 s->block_last_index[n] = i; |
0 | 1711 return 0; |
1712 } | |
1713 | |
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1714 static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n) |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1715 { |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1716 int level, i, j, run; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1717 RLTable *rl = &rl_mpeg1; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1718 uint8_t * const scantable= s->intra_scantable.permutated; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1719 const int qscale= s->qscale; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1720 |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1721 { |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1722 OPEN_READER(re, &s->gb); |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1723 i = -1; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1724 /* special case for the first coef. no need to add a second vlc table */ |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1725 UPDATE_CACHE(re, &s->gb); |
2617 | 1726 if (((int32_t)GET_CACHE(re, &s->gb)) < 0) { |
2203 | 1727 level= (3*qscale)>>1; |
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1728 level= (level-1)|1; |
2617 | 1729 if(GET_CACHE(re, &s->gb)&0x40000000) |
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1730 level= -level; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1731 block[0] = level; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1732 i++; |
2617 | 1733 SKIP_BITS(re, &s->gb, 2); |
1734 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) | |
1735 goto end; | |
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1736 } |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1737 |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1738 /* now quantify & encode AC coefs */ |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1739 for(;;) { |
2615
0d88e3f89379
avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents:
2591
diff
changeset
|
1740 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); |
2967 | 1741 |
2617 | 1742 if(level != 0) { |
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1743 i += run; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1744 j = scantable[i]; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1745 level= ((level*2+1)*qscale)>>1; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1746 level= (level-1)|1; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1747 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); |
2617 | 1748 SKIP_BITS(re, &s->gb, 1); |
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1749 } else { |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1750 /* escape */ |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1751 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1752 UPDATE_CACHE(re, &s->gb); |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1753 level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8); |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1754 if (level == -128) { |
2617 | 1755 level = SHOW_UBITS(re, &s->gb, 8) - 256; SKIP_BITS(re, &s->gb, 8); |
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1756 } else if (level == 0) { |
2617 | 1757 level = SHOW_UBITS(re, &s->gb, 8) ; SKIP_BITS(re, &s->gb, 8); |
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1758 } |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1759 i += run; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1760 j = scantable[i]; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1761 if(level<0){ |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1762 level= -level; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1763 level= ((level*2+1)*qscale)>>1; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1764 level= (level-1)|1; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1765 level= -level; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1766 }else{ |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1767 level= ((level*2+1)*qscale)>>1; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1768 level= (level-1)|1; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1769 } |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1770 } |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1771 |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1772 block[j] = level; |
2617 | 1773 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) |
1774 break; | |
1775 UPDATE_CACHE(re, &s->gb); | |
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1776 } |
2617 | 1777 end: |
1778 LAST_SKIP_BITS(re, &s->gb, 2); | |
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1779 CLOSE_READER(re, &s->gb); |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1780 } |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1781 s->block_last_index[n] = i; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1782 return 0; |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1783 } |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1784 |
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
1785 |
2967 | 1786 static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, |
1787 DCTELEM *block, | |
714 | 1788 int n) |
0 | 1789 { |
1790 int level, i, j, run; | |
1791 RLTable *rl = &rl_mpeg1; | |
1064 | 1792 uint8_t * const scantable= s->intra_scantable.permutated; |
1793 const uint16_t *quant_matrix; | |
714 | 1794 const int qscale= s->qscale; |
0 | 1795 int mismatch; |
1796 | |
1797 mismatch = 1; | |
1798 | |
1799 { | |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1800 OPEN_READER(re, &s->gb); |
714 | 1801 i = -1; |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1802 if (n < 4) |
714 | 1803 quant_matrix = s->inter_matrix; |
0 | 1804 else |
714 | 1805 quant_matrix = s->chroma_inter_matrix; |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1806 |
0 | 1807 /* special case for the first coef. no need to add a second vlc table */ |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1808 UPDATE_CACHE(re, &s->gb); |
2617 | 1809 if (((int32_t)GET_CACHE(re, &s->gb)) < 0) { |
714 | 1810 level= (3*qscale*quant_matrix[0])>>5; |
2617 | 1811 if(GET_CACHE(re, &s->gb)&0x40000000) |
714 | 1812 level= -level; |
1813 block[0] = level; | |
1814 mismatch ^= level; | |
1815 i++; | |
2617 | 1816 SKIP_BITS(re, &s->gb, 2); |
1817 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) | |
1818 goto end; | |
714 | 1819 } |
1820 | |
1821 /* now quantify & encode AC coefs */ | |
1822 for(;;) { | |
2615
0d88e3f89379
avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents:
2591
diff
changeset
|
1823 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); |
2967 | 1824 |
2617 | 1825 if(level != 0) { |
714 | 1826 i += run; |
1827 j = scantable[i]; | |
1828 level= ((level*2+1)*qscale*quant_matrix[j])>>5; | |
1829 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
2617 | 1830 SKIP_BITS(re, &s->gb, 1); |
714 | 1831 } else { |
1832 /* escape */ | |
1833 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
1834 UPDATE_CACHE(re, &s->gb); | |
1835 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); | |
1836 | |
1837 i += run; | |
1838 j = scantable[i]; | |
1839 if(level<0){ | |
1840 level= ((-level*2+1)*qscale*quant_matrix[j])>>5; | |
1841 level= -level; | |
1842 }else{ | |
1843 level= ((level*2+1)*qscale*quant_matrix[j])>>5; | |
1844 } | |
1845 } | |
1846 if (i > 63){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1847 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
714 | 1848 return -1; |
1849 } | |
2967 | 1850 |
714 | 1851 mismatch ^= level; |
1852 block[j] = level; | |
2617 | 1853 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) |
1854 break; | |
1855 UPDATE_CACHE(re, &s->gb); | |
0 | 1856 } |
2617 | 1857 end: |
1858 LAST_SKIP_BITS(re, &s->gb, 2); | |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1859 CLOSE_READER(re, &s->gb); |
0 | 1860 } |
1861 block[63] ^= (mismatch & 1); | |
2967 | 1862 |
0 | 1863 s->block_last_index[n] = i; |
1864 return 0; | |
1865 } | |
1866 | |
2967 | 1867 static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, |
1868 DCTELEM *block, | |
2201 | 1869 int n) |
1870 { | |
1871 int level, i, j, run; | |
1872 RLTable *rl = &rl_mpeg1; | |
1873 uint8_t * const scantable= s->intra_scantable.permutated; | |
1874 const int qscale= s->qscale; | |
1875 OPEN_READER(re, &s->gb); | |
1876 i = -1; | |
1877 | |
1878 /* special case for the first coef. no need to add a second vlc table */ | |
1879 UPDATE_CACHE(re, &s->gb); | |
2617 | 1880 if (((int32_t)GET_CACHE(re, &s->gb)) < 0) { |
2201 | 1881 level= (3*qscale)>>1; |
2617 | 1882 if(GET_CACHE(re, &s->gb)&0x40000000) |
2201 | 1883 level= -level; |
1884 block[0] = level; | |
1885 i++; | |
2617 | 1886 SKIP_BITS(re, &s->gb, 2); |
1887 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) | |
1888 goto end; | |
2201 | 1889 } |
1890 | |
1891 /* now quantify & encode AC coefs */ | |
1892 for(;;) { | |
2615
0d88e3f89379
avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents:
2591
diff
changeset
|
1893 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); |
2967 | 1894 |
2617 | 1895 if(level != 0) { |
2201 | 1896 i += run; |
1897 j = scantable[i]; | |
1898 level= ((level*2+1)*qscale)>>1; | |
1899 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
2617 | 1900 SKIP_BITS(re, &s->gb, 1); |
2201 | 1901 } else { |
1902 /* escape */ | |
1903 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
1904 UPDATE_CACHE(re, &s->gb); | |
1905 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); | |
1906 | |
1907 i += run; | |
1908 j = scantable[i]; | |
1909 if(level<0){ | |
1910 level= ((-level*2+1)*qscale)>>1; | |
1911 level= -level; | |
1912 }else{ | |
1913 level= ((level*2+1)*qscale)>>1; | |
1914 } | |
1915 } | |
2967 | 1916 |
2201 | 1917 block[j] = level; |
2617 | 1918 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) |
1919 break; | |
1920 UPDATE_CACHE(re, &s->gb); | |
2201 | 1921 } |
2617 | 1922 end: |
2967 | 1923 LAST_SKIP_BITS(re, &s->gb, 2); |
2201 | 1924 CLOSE_READER(re, &s->gb); |
1925 s->block_last_index[n] = i; | |
1926 return 0; | |
1927 } | |
1928 | |
1929 | |
2967 | 1930 static inline int mpeg2_decode_block_intra(MpegEncContext *s, |
1931 DCTELEM *block, | |
714 | 1932 int n) |
0 | 1933 { |
1934 int level, dc, diff, i, j, run; | |
714 | 1935 int component; |
0 | 1936 RLTable *rl; |
1064 | 1937 uint8_t * const scantable= s->intra_scantable.permutated; |
1938 const uint16_t *quant_matrix; | |
714 | 1939 const int qscale= s->qscale; |
0 | 1940 int mismatch; |
1941 | |
1942 /* DC coef */ | |
714 | 1943 if (n < 4){ |
1944 quant_matrix = s->intra_matrix; | |
2967 | 1945 component = 0; |
714 | 1946 }else{ |
1947 quant_matrix = s->chroma_intra_matrix; | |
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1841
diff
changeset
|
1948 component = (n&1) + 1; |
714 | 1949 } |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1950 diff = decode_dc(&s->gb, component); |
0 | 1951 if (diff >= 0xffff) |
1952 return -1; | |
1953 dc = s->last_dc[component]; | |
1954 dc += diff; | |
1955 s->last_dc[component] = dc; | |
1956 block[0] = dc << (3 - s->intra_dc_precision); | |
1957 dprintf("dc=%d\n", block[0]); | |
58
0e0a24def67a
fixed last zero mv for field - fixed mismatch handling for intra coefs
glantau
parents:
54
diff
changeset
|
1958 mismatch = block[0] ^ 1; |
714 | 1959 i = 0; |
0 | 1960 if (s->intra_vlc_format) |
1961 rl = &rl_mpeg2; | |
1962 else | |
1963 rl = &rl_mpeg1; | |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1964 |
714 | 1965 { |
2967 | 1966 OPEN_READER(re, &s->gb); |
714 | 1967 /* now quantify & encode AC coefs */ |
1968 for(;;) { | |
1969 UPDATE_CACHE(re, &s->gb); | |
2615
0d88e3f89379
avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents:
2591
diff
changeset
|
1970 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); |
2967 | 1971 |
714 | 1972 if(level == 127){ |
1973 break; | |
1974 } else if(level != 0) { | |
1975 i += run; | |
1976 j = scantable[i]; | |
1977 level= (level*qscale*quant_matrix[j])>>4; | |
1978 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
1979 LAST_SKIP_BITS(re, &s->gb, 1); | |
1980 } else { | |
1981 /* escape */ | |
1982 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
1983 UPDATE_CACHE(re, &s->gb); | |
1984 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); | |
1985 i += run; | |
1986 j = scantable[i]; | |
1987 if(level<0){ | |
1988 level= (-level*qscale*quant_matrix[j])>>4; | |
1989 level= -level; | |
1990 }else{ | |
1991 level= (level*qscale*quant_matrix[j])>>4; | |
1992 } | |
1993 } | |
1994 if (i > 63){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1995 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
714 | 1996 return -1; |
1997 } | |
2967 | 1998 |
714 | 1999 mismatch^= level; |
2000 block[j] = level; | |
568 | 2001 } |
714 | 2002 CLOSE_READER(re, &s->gb); |
0 | 2003 } |
714 | 2004 block[63]^= mismatch&1; |
2967 | 2005 |
0 | 2006 s->block_last_index[n] = i; |
2007 return 0; | |
2008 } | |
2009 | |
2967 | 2010 static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, |
2011 DCTELEM *block, | |
2622 | 2012 int n) |
2013 { | |
2014 int level, dc, diff, j, run; | |
2015 int component; | |
2016 RLTable *rl; | |
2017 uint8_t * scantable= s->intra_scantable.permutated; | |
2018 const uint16_t *quant_matrix; | |
2019 const int qscale= s->qscale; | |
2020 | |
2021 /* DC coef */ | |
2022 if (n < 4){ | |
2023 quant_matrix = s->intra_matrix; | |
2967 | 2024 component = 0; |
2622 | 2025 }else{ |
2026 quant_matrix = s->chroma_intra_matrix; | |
2027 component = (n&1) + 1; | |
2028 } | |
2029 diff = decode_dc(&s->gb, component); | |
2030 if (diff >= 0xffff) | |
2031 return -1; | |
2032 dc = s->last_dc[component]; | |
2033 dc += diff; | |
2034 s->last_dc[component] = dc; | |
2035 block[0] = dc << (3 - s->intra_dc_precision); | |
2036 if (s->intra_vlc_format) | |
2037 rl = &rl_mpeg2; | |
2038 else | |
2039 rl = &rl_mpeg1; | |
2040 | |
2041 { | |
2967 | 2042 OPEN_READER(re, &s->gb); |
2622 | 2043 /* now quantify & encode AC coefs */ |
2044 for(;;) { | |
2045 UPDATE_CACHE(re, &s->gb); | |
2046 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); | |
2967 | 2047 |
2622 | 2048 if(level == 127){ |
2049 break; | |
2050 } else if(level != 0) { | |
2051 scantable += run; | |
2052 j = *scantable; | |
2053 level= (level*qscale*quant_matrix[j])>>4; | |
2054 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
2055 LAST_SKIP_BITS(re, &s->gb, 1); | |
2056 } else { | |
2057 /* escape */ | |
2058 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
2059 UPDATE_CACHE(re, &s->gb); | |
2060 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); | |
2061 scantable += run; | |
2062 j = *scantable; | |
2063 if(level<0){ | |
2064 level= (-level*qscale*quant_matrix[j])>>4; | |
2065 level= -level; | |
2066 }else{ | |
2067 level= (level*qscale*quant_matrix[j])>>4; | |
2068 } | |
2069 } | |
2967 | 2070 |
2622 | 2071 block[j] = level; |
2072 } | |
2073 CLOSE_READER(re, &s->gb); | |
2074 } | |
2967 | 2075 |
2622 | 2076 s->block_last_index[n] = scantable - s->intra_scantable.permutated; |
2077 return 0; | |
2078 } | |
2079 | |
0 | 2080 typedef struct Mpeg1Context { |
2081 MpegEncContext mpeg_enc_ctx; | |
2082 int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ | |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2083 int repeat_field; /* true if we must repeat the field */ |
1546 | 2084 AVPanScan pan_scan; /** some temporary storage for the panscan */ |
1827 | 2085 int slice_count; |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2086 int swap_uv;//indicate VCR2 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2087 int save_aspect_info; |
2219 | 2088 AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2089 |
0 | 2090 } Mpeg1Context; |
2091 | |
2092 static int mpeg_decode_init(AVCodecContext *avctx) | |
2093 { | |
2094 Mpeg1Context *s = avctx->priv_data; | |
1892 | 2095 MpegEncContext *s2 = &s->mpeg_enc_ctx; |
1990 | 2096 int i; |
2967 | 2097 |
1990 | 2098 //we need some parmutation to store |
2099 //matrixes, until MPV_common_init() | |
2967 | 2100 //set the real permutatuon |
1990 | 2101 for(i=0;i<64;i++) |
2102 s2->dsp.idct_permutation[i]=i; | |
2103 | |
1892 | 2104 MPV_decode_defaults(s2); |
2967 | 2105 |
1732
f716b8f47d98
uninitalized variables fix by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
1728
diff
changeset
|
2106 s->mpeg_enc_ctx.avctx= avctx; |
558 | 2107 s->mpeg_enc_ctx.flags= avctx->flags; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1749
diff
changeset
|
2108 s->mpeg_enc_ctx.flags2= avctx->flags2; |
498 | 2109 common_init(&s->mpeg_enc_ctx); |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
2110 init_vlcs(); |
0 | 2111 |
2112 s->mpeg_enc_ctx_allocated = 0; | |
2113 s->mpeg_enc_ctx.picture_number = 0; | |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2114 s->repeat_field = 0; |
344 | 2115 s->mpeg_enc_ctx.codec_id= avctx->codec->id; |
0 | 2116 return 0; |
2117 } | |
2118 | |
2967 | 2119 static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm, |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2120 const uint8_t *new_perm){ |
2219 | 2121 uint16_t temp_matrix[64]; |
2122 int i; | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2123 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2124 memcpy(temp_matrix,matrix,64*sizeof(uint16_t)); |
2967 | 2125 |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2126 for(i=0;i<64;i++){ |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2127 matrix[new_perm[i]] = temp_matrix[old_perm[i]]; |
2967 | 2128 } |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2129 } |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2130 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2131 //Call this function when we know all parameters |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2132 //it may be called in different places for mpeg1 and mpeg2 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2133 static int mpeg_decode_postinit(AVCodecContext *avctx){ |
2219 | 2134 Mpeg1Context *s1 = avctx->priv_data; |
2135 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
2136 uint8_t old_permutation[64]; | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2137 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2138 if ( |
2979 | 2139 (s1->mpeg_enc_ctx_allocated == 0)|| |
2270 | 2140 avctx->coded_width != s->width || |
2141 avctx->coded_height != s->height|| | |
2590 | 2142 s1->save_aspect_info != s->aspect_ratio_info|| |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2143 0) |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2144 { |
2967 | 2145 |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2146 if (s1->mpeg_enc_ctx_allocated) { |
2681 | 2147 ParseContext pc= s->parse_context; |
2148 s->parse_context.buffer=0; | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2149 MPV_common_end(s); |
2681 | 2150 s->parse_context= pc; |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2151 } |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2152 |
2979 | 2153 if( (s->width == 0 )||(s->height == 0)) |
2154 return -2; | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2155 |
2270 | 2156 avcodec_set_dimensions(avctx, s->width, s->height); |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2157 avctx->bit_rate = s->bit_rate; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2158 s1->save_aspect_info = s->aspect_ratio_info; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2159 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2160 //low_delay may be forced, in this case we will have B frames |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2161 //that behave like P frames |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2162 avctx->has_b_frames = !(s->low_delay); |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2163 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2164 if(avctx->sub_id==1){//s->codec_id==avctx->codec_id==CODEC_ID |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2165 //mpeg1 fps |
3391
d60dc0a7dee6
staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)
michael
parents:
3309
diff
changeset
|
2166 avctx->time_base.den= ff_frame_rate_tab[s->frame_rate_index].num; |
d60dc0a7dee6
staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)
michael
parents:
3309
diff
changeset
|
2167 avctx->time_base.num= ff_frame_rate_tab[s->frame_rate_index].den; |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2168 //mpeg1 aspect |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2169 avctx->sample_aspect_ratio= av_d2q( |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2170 1.0/mpeg1_aspect[s->aspect_ratio_info], 255); |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2171 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2172 }else{//mpeg2 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2173 //mpeg2 fps |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2174 av_reduce( |
2967 | 2175 &s->avctx->time_base.den, |
2176 &s->avctx->time_base.num, | |
3391
d60dc0a7dee6
staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)
michael
parents:
3309
diff
changeset
|
2177 ff_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num, |
d60dc0a7dee6
staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)
michael
parents:
3309
diff
changeset
|
2178 ff_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den, |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2179 1<<30); |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2180 //mpeg2 aspect |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2181 if(s->aspect_ratio_info > 1){ |
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
2182 if( (s1->pan_scan.width == 0 )||(s1->pan_scan.height == 0) ){ |
2967 | 2183 s->avctx->sample_aspect_ratio= |
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2184 av_div_q( |
2967 | 2185 mpeg2_aspect[s->aspect_ratio_info], |
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2186 (AVRational){s->width, s->height} |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2187 ); |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2188 }else{ |
2967 | 2189 s->avctx->sample_aspect_ratio= |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2190 av_div_q( |
2967 | 2191 mpeg2_aspect[s->aspect_ratio_info], |
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
2192 (AVRational){s1->pan_scan.width, s1->pan_scan.height} |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2193 ); |
2979 | 2194 } |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2195 }else{ |
2967 | 2196 s->avctx->sample_aspect_ratio= |
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2197 mpeg2_aspect[s->aspect_ratio_info]; |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2198 } |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2199 }//mpeg2 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2200 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2201 if(avctx->xvmc_acceleration){ |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2202 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_xvmc_mpg2_420); |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2203 }else{ |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2204 if(s->chroma_format < 2){ |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2205 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_420); |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2206 }else |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2207 if(s->chroma_format == 2){ |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2208 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_422); |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2209 }else |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2210 if(s->chroma_format > 2){ |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2211 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_444); |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2212 } |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2213 } |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2214 //until then pix_fmt may be changed right after codec init |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2215 if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT ) |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2216 if( avctx->idct_algo == FF_IDCT_AUTO ) |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2217 avctx->idct_algo = FF_IDCT_SIMPLE; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2218 |
2967 | 2219 //quantization matrixes may need reordering |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2220 //if dct permutation is changed |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2221 memcpy(old_permutation,s->dsp.idct_permutation,64*sizeof(uint8_t)); |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2222 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2223 if (MPV_common_init(s) < 0) |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2224 return -2; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2225 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2226 quant_matrix_rebuild(s->intra_matrix, old_permutation,s->dsp.idct_permutation); |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2227 quant_matrix_rebuild(s->inter_matrix, old_permutation,s->dsp.idct_permutation); |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2228 quant_matrix_rebuild(s->chroma_intra_matrix,old_permutation,s->dsp.idct_permutation); |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2229 quant_matrix_rebuild(s->chroma_inter_matrix,old_permutation,s->dsp.idct_permutation); |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2230 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2231 s1->mpeg_enc_ctx_allocated = 1; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2232 } |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2233 return 0; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2234 } |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2235 |
2967 | 2236 static int mpeg1_decode_picture(AVCodecContext *avctx, |
1862 | 2237 const uint8_t *buf, int buf_size) |
0 | 2238 { |
2239 Mpeg1Context *s1 = avctx->priv_data; | |
2240 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
1697 | 2241 int ref, f_code, vbv_delay; |
0 | 2242 |
2967 | 2243 if(mpeg_decode_postinit(s->avctx) < 0) |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2244 return -2; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2245 |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
1021
diff
changeset
|
2246 init_get_bits(&s->gb, buf, buf_size*8); |
0 | 2247 |
2248 ref = get_bits(&s->gb, 10); /* temporal ref */ | |
2249 s->pict_type = get_bits(&s->gb, 3); | |
2575 | 2250 if(s->pict_type == 0 || s->pict_type > 3) |
2251 return -1; | |
872 | 2252 |
1697 | 2253 vbv_delay= get_bits(&s->gb, 16); |
0 | 2254 if (s->pict_type == P_TYPE || s->pict_type == B_TYPE) { |
21 | 2255 s->full_pel[0] = get_bits1(&s->gb); |
0 | 2256 f_code = get_bits(&s->gb, 3); |
2786 | 2257 if (f_code == 0 && avctx->error_resilience >= FF_ER_COMPLIANT) |
0 | 2258 return -1; |
2259 s->mpeg_f_code[0][0] = f_code; | |
2260 s->mpeg_f_code[0][1] = f_code; | |
2261 } | |
2262 if (s->pict_type == B_TYPE) { | |
21 | 2263 s->full_pel[1] = get_bits1(&s->gb); |
0 | 2264 f_code = get_bits(&s->gb, 3); |
2786 | 2265 if (f_code == 0 && avctx->error_resilience >= FF_ER_COMPLIANT) |
0 | 2266 return -1; |
2267 s->mpeg_f_code[1][0] = f_code; | |
2268 s->mpeg_f_code[1][1] = f_code; | |
2269 } | |
903 | 2270 s->current_picture.pict_type= s->pict_type; |
2271 s->current_picture.key_frame= s->pict_type == I_TYPE; | |
2967 | 2272 |
2575 | 2273 if(avctx->debug & FF_DEBUG_PICT_INFO) |
2274 av_log(avctx, AV_LOG_DEBUG, "vbv_delay %d, ref %d type:%d\n", vbv_delay, ref, s->pict_type); | |
2967 | 2275 |
0 | 2276 s->y_dc_scale = 8; |
2277 s->c_dc_scale = 8; | |
2278 s->first_slice = 1; | |
2279 return 0; | |
2280 } | |
2281 | |
2219 | 2282 static void mpeg_decode_sequence_extension(Mpeg1Context *s1) |
0 | 2283 { |
2219 | 2284 MpegEncContext *s= &s1->mpeg_enc_ctx; |
0 | 2285 int horiz_size_ext, vert_size_ext; |
1721 | 2286 int bit_rate_ext; |
0 | 2287 |
1421 | 2288 skip_bits(&s->gb, 1); /* profil and level esc*/ |
2167 | 2289 s->avctx->profile= get_bits(&s->gb, 3); |
2290 s->avctx->level= get_bits(&s->gb, 4); | |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2291 s->progressive_sequence = get_bits1(&s->gb); /* progressive_sequence */ |
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1841
diff
changeset
|
2292 s->chroma_format = get_bits(&s->gb, 2); /* chroma_format 1=420, 2=422, 3=444 */ |
0 | 2293 horiz_size_ext = get_bits(&s->gb, 2); |
2294 vert_size_ext = get_bits(&s->gb, 2); | |
2295 s->width |= (horiz_size_ext << 12); | |
2296 s->height |= (vert_size_ext << 12); | |
2297 bit_rate_ext = get_bits(&s->gb, 12); /* XXX: handle it */ | |
2540 | 2298 s->bit_rate += (bit_rate_ext << 18) * 400; |
21 | 2299 skip_bits1(&s->gb); /* marker */ |
1710
4a68b20eeb2c
print vbv buffer size & bitrate when decoding with -debug 1
michael
parents:
1708
diff
changeset
|
2300 s->avctx->rc_buffer_size += get_bits(&s->gb, 8)*1024*16<<10; |
1346 | 2301 |
917 | 2302 s->low_delay = get_bits1(&s->gb); |
1346 | 2303 if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1; |
2304 | |
2219 | 2305 s1->frame_rate_ext.num = get_bits(&s->gb, 2)+1; |
2306 s1->frame_rate_ext.den = get_bits(&s->gb, 5)+1; | |
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
2307 |
0 | 2308 dprintf("sequence extension\n"); |
1421 | 2309 s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO; |
401
e20655449d4a
mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents:
391
diff
changeset
|
2310 s->avctx->sub_id = 2; /* indicates mpeg2 found */ |
917 | 2311 |
1421 | 2312 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
2967 | 2313 av_log(s->avctx, AV_LOG_DEBUG, "profile: %d, level: %d vbv buffer: %d, bitrate:%d\n", |
2167 | 2314 s->avctx->profile, s->avctx->level, s->avctx->rc_buffer_size, s->bit_rate); |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2315 |
0 | 2316 } |
2317 | |
1546 | 2318 static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) |
2319 { | |
2320 MpegEncContext *s= &s1->mpeg_enc_ctx; | |
2321 int color_description, w, h; | |
2322 | |
2323 skip_bits(&s->gb, 3); /* video format */ | |
2324 color_description= get_bits1(&s->gb); | |
2325 if(color_description){ | |
2326 skip_bits(&s->gb, 8); /* color primaries */ | |
2327 skip_bits(&s->gb, 8); /* transfer_characteristics */ | |
2328 skip_bits(&s->gb, 8); /* matrix_coefficients */ | |
2329 } | |
2330 w= get_bits(&s->gb, 14); | |
2331 skip_bits(&s->gb, 1); //marker | |
2332 h= get_bits(&s->gb, 14); | |
2333 skip_bits(&s->gb, 1); //marker | |
2967 | 2334 |
1546 | 2335 s1->pan_scan.width= 16*w; |
2336 s1->pan_scan.height=16*h; | |
2967 | 2337 |
1546 | 2338 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2339 av_log(s->avctx, AV_LOG_DEBUG, "sde w:%d, h:%d\n", w, h); |
1546 | 2340 } |
2341 | |
2342 static void mpeg_decode_picture_display_extension(Mpeg1Context *s1) | |
2343 { | |
2344 MpegEncContext *s= &s1->mpeg_enc_ctx; | |
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
2345 int i,nofco; |
1546 | 2346 |
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
2347 nofco = 1; |
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
2348 if(s->progressive_sequence){ |
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
2349 if(s->repeat_first_field){ |
2979 | 2350 nofco++; |
2351 if(s->top_field_first) | |
2352 nofco++; | |
2353 } | |
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
2354 }else{ |
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
2355 if(s->picture_structure == PICT_FRAME){ |
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
2356 nofco++; |
2979 | 2357 if(s->repeat_first_field) |
2358 nofco++; | |
2359 } | |
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
2360 } |
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
2361 for(i=0; i<nofco; i++){ |
1546 | 2362 s1->pan_scan.position[i][0]= get_sbits(&s->gb, 16); |
2363 skip_bits(&s->gb, 1); //marker | |
2364 s1->pan_scan.position[i][1]= get_sbits(&s->gb, 16); | |
2365 skip_bits(&s->gb, 1); //marker | |
2366 } | |
2967 | 2367 |
1546 | 2368 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
2967 | 2369 av_log(s->avctx, AV_LOG_DEBUG, "pde (%d,%d) (%d,%d) (%d,%d)\n", |
2370 s1->pan_scan.position[0][0], s1->pan_scan.position[0][1], | |
2371 s1->pan_scan.position[1][0], s1->pan_scan.position[1][1], | |
1546 | 2372 s1->pan_scan.position[2][0], s1->pan_scan.position[2][1] |
2373 ); | |
2374 } | |
2375 | |
0 | 2376 static void mpeg_decode_quant_matrix_extension(MpegEncContext *s) |
2377 { | |
38
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
2378 int i, v, j; |
0 | 2379 |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2380 dprintf("matrix extension\n"); |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2381 |
21 | 2382 if (get_bits1(&s->gb)) { |
0 | 2383 for(i=0;i<64;i++) { |
2384 v = get_bits(&s->gb, 8); | |
1092 | 2385 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
38
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
2386 s->intra_matrix[j] = v; |
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
2387 s->chroma_intra_matrix[j] = v; |
0 | 2388 } |
2389 } | |
21 | 2390 if (get_bits1(&s->gb)) { |
0 | 2391 for(i=0;i<64;i++) { |
2392 v = get_bits(&s->gb, 8); | |
1092 | 2393 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
344 | 2394 s->inter_matrix[j] = v; |
2395 s->chroma_inter_matrix[j] = v; | |
0 | 2396 } |
2397 } | |
21 | 2398 if (get_bits1(&s->gb)) { |
0 | 2399 for(i=0;i<64;i++) { |
2400 v = get_bits(&s->gb, 8); | |
1092 | 2401 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
38
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
2402 s->chroma_intra_matrix[j] = v; |
0 | 2403 } |
2404 } | |
21 | 2405 if (get_bits1(&s->gb)) { |
0 | 2406 for(i=0;i<64;i++) { |
2407 v = get_bits(&s->gb, 8); | |
1092 | 2408 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
344 | 2409 s->chroma_inter_matrix[j] = v; |
0 | 2410 } |
2411 } | |
2412 } | |
2413 | |
2414 static void mpeg_decode_picture_coding_extension(MpegEncContext *s) | |
2415 { | |
2416 s->full_pel[0] = s->full_pel[1] = 0; | |
2417 s->mpeg_f_code[0][0] = get_bits(&s->gb, 4); | |
2418 s->mpeg_f_code[0][1] = get_bits(&s->gb, 4); | |
2419 s->mpeg_f_code[1][0] = get_bits(&s->gb, 4); | |
2420 s->mpeg_f_code[1][1] = get_bits(&s->gb, 4); | |
2421 s->intra_dc_precision = get_bits(&s->gb, 2); | |
2422 s->picture_structure = get_bits(&s->gb, 2); | |
21 | 2423 s->top_field_first = get_bits1(&s->gb); |
2424 s->frame_pred_frame_dct = get_bits1(&s->gb); | |
2425 s->concealment_motion_vectors = get_bits1(&s->gb); | |
2426 s->q_scale_type = get_bits1(&s->gb); | |
2427 s->intra_vlc_format = get_bits1(&s->gb); | |
2428 s->alternate_scan = get_bits1(&s->gb); | |
2429 s->repeat_first_field = get_bits1(&s->gb); | |
2430 s->chroma_420_type = get_bits1(&s->gb); | |
2431 s->progressive_frame = get_bits1(&s->gb); | |
1708 | 2432 |
4070 | 2433 if(s->picture_structure == PICT_FRAME){ |
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
2434 s->first_field=0; |
4070 | 2435 s->v_edge_pos= 16*s->mb_height; |
2436 }else{ | |
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
2437 s->first_field ^= 1; |
4070 | 2438 s->v_edge_pos= 8*s->mb_height; |
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:
1164
diff
changeset
|
2439 memset(s->mbskip_table, 0, s->mb_stride*s->mb_height); |
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
2440 } |
2967 | 2441 |
715
8b3ccabfce4a
move scantable init from block-decode to header parser
michaelni
parents:
714
diff
changeset
|
2442 if(s->alternate_scan){ |
1273 | 2443 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan); |
2444 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan); | |
715
8b3ccabfce4a
move scantable init from block-decode to header parser
michaelni
parents:
714
diff
changeset
|
2445 }else{ |
1273 | 2446 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct); |
2447 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct); | |
715
8b3ccabfce4a
move scantable init from block-decode to header parser
michaelni
parents:
714
diff
changeset
|
2448 } |
2967 | 2449 |
0 | 2450 /* composite display not parsed */ |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2451 dprintf("intra_dc_precision=%d\n", s->intra_dc_precision); |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2452 dprintf("picture_structure=%d\n", s->picture_structure); |
383
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2453 dprintf("top field first=%d\n", s->top_field_first); |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2454 dprintf("repeat first field=%d\n", s->repeat_first_field); |
0 | 2455 dprintf("conceal=%d\n", s->concealment_motion_vectors); |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2456 dprintf("intra_vlc_format=%d\n", s->intra_vlc_format); |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2457 dprintf("alternate_scan=%d\n", s->alternate_scan); |
0 | 2458 dprintf("frame_pred_frame_dct=%d\n", s->frame_pred_frame_dct); |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2459 dprintf("progressive_frame=%d\n", s->progressive_frame); |
0 | 2460 } |
2461 | |
2967 | 2462 static void mpeg_decode_extension(AVCodecContext *avctx, |
1862 | 2463 const uint8_t *buf, int buf_size) |
0 | 2464 { |
2465 Mpeg1Context *s1 = avctx->priv_data; | |
2466 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
2467 int ext_type; | |
2468 | |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
1021
diff
changeset
|
2469 init_get_bits(&s->gb, buf, buf_size*8); |
2967 | 2470 |
0 | 2471 ext_type = get_bits(&s->gb, 4); |
2472 switch(ext_type) { | |
2473 case 0x1: | |
2219 | 2474 mpeg_decode_sequence_extension(s1); |
0 | 2475 break; |
1546 | 2476 case 0x2: |
2477 mpeg_decode_sequence_display_extension(s1); | |
2478 break; | |
0 | 2479 case 0x3: |
2480 mpeg_decode_quant_matrix_extension(s); | |
2481 break; | |
1546 | 2482 case 0x7: |
2483 mpeg_decode_picture_display_extension(s1); | |
2484 break; | |
0 | 2485 case 0x8: |
2486 mpeg_decode_picture_coding_extension(s); | |
2487 break; | |
2488 } | |
2489 } | |
2490 | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2491 static void exchange_uv(MpegEncContext *s){ |
2219 | 2492 short * tmp = s->pblocks[4]; |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2493 s->pblocks[4] = s->pblocks[5]; |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2494 s->pblocks[5] = tmp; |
1380 | 2495 } |
2496 | |
1827 | 2497 static int mpeg_field_start(MpegEncContext *s){ |
2498 AVCodecContext *avctx= s->avctx; | |
2499 Mpeg1Context *s1 = (Mpeg1Context*)s; | |
826 | 2500 |
0 | 2501 /* start frame decoding */ |
1827 | 2502 if(s->first_field || s->picture_structure==PICT_FRAME){ |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
751
diff
changeset
|
2503 if(MPV_frame_start(s, avctx) < 0) |
1827 | 2504 return -1; |
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:
1164
diff
changeset
|
2505 |
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:
1164
diff
changeset
|
2506 ff_er_frame_start(s); |
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:
1164
diff
changeset
|
2507 |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2508 /* first check if we must repeat the frame */ |
1409 | 2509 s->current_picture_ptr->repeat_pict = 0; |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2510 if (s->repeat_first_field) { |
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2511 if (s->progressive_sequence) { |
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2512 if (s->top_field_first) |
1409 | 2513 s->current_picture_ptr->repeat_pict = 4; |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2514 else |
1409 | 2515 s->current_picture_ptr->repeat_pict = 2; |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2516 } else if (s->progressive_frame) { |
1409 | 2517 s->current_picture_ptr->repeat_pict = 1; |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2518 } |
2967 | 2519 } |
1546 | 2520 |
2521 *s->current_picture_ptr->pan_scan= s1->pan_scan; | |
1827 | 2522 }else{ //second field |
1138 | 2523 int i; |
2967 | 2524 |
1182
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
2525 if(!s->current_picture_ptr){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2526 av_log(s->avctx, AV_LOG_ERROR, "first field missing\n"); |
1182
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
2527 return -1; |
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
2528 } |
2967 | 2529 |
1138 | 2530 for(i=0; i<4; i++){ |
2531 s->current_picture.data[i] = s->current_picture_ptr->data[i]; | |
2532 if(s->picture_structure == PICT_BOTTOM_FIELD){ | |
2533 s->current_picture.data[i] += s->current_picture_ptr->linesize[i]; | |
2967 | 2534 } |
1138 | 2535 } |
1827 | 2536 } |
1381 | 2537 #ifdef HAVE_XVMC |
2538 // MPV_frame_start will call this function too, | |
2539 // but we need to call it on every field | |
1827 | 2540 if(s->avctx->xvmc_acceleration) |
1381 | 2541 XVMC_field_start(s,avctx); |
2542 #endif | |
1827 | 2543 |
2544 return 0; | |
2545 } | |
2546 | |
2547 #define DECODE_SLICE_ERROR -1 | |
2548 #define DECODE_SLICE_OK 0 | |
0 | 2549 |
1827 | 2550 /** |
2551 * decodes a slice. MpegEncContext.mb_y must be set to the MB row from the startcode | |
2552 * @return DECODE_SLICE_ERROR if the slice is damaged<br> | |
2553 * DECODE_SLICE_OK if this slice is ok<br> | |
2554 */ | |
2555 static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, | |
1862 | 2556 const uint8_t **buf, int buf_size) |
1827 | 2557 { |
2558 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
2559 AVCodecContext *avctx= s->avctx; | |
2560 int ret; | |
2561 const int field_pic= s->picture_structure != PICT_FRAME; | |
2256 | 2562 const int lowres= s->avctx->lowres; |
1827 | 2563 |
2564 s->resync_mb_x= | |
2565 s->resync_mb_y= -1; | |
2566 | |
1953 | 2567 if (mb_y<<field_pic >= s->mb_height){ |
2568 av_log(s->avctx, AV_LOG_ERROR, "slice below image (%d >= %d)\n", mb_y, s->mb_height); | |
1827 | 2569 return -1; |
2570 } | |
2967 | 2571 |
1211 | 2572 init_get_bits(&s->gb, *buf, buf_size*8); |
0 | 2573 |
1827 | 2574 ff_mpeg1_clean_buffers(s); |
2575 s->interlaced_dct = 0; | |
2576 | |
54 | 2577 s->qscale = get_qscale(s); |
1690 | 2578 |
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:
1164
diff
changeset
|
2579 if(s->qscale == 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2580 av_log(s->avctx, AV_LOG_ERROR, "qscale == 0\n"); |
1285 | 2581 return -1; |
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:
1164
diff
changeset
|
2582 } |
2967 | 2583 |
0 | 2584 /* extra slice info */ |
21 | 2585 while (get_bits1(&s->gb) != 0) { |
2586 skip_bits(&s->gb, 8); | |
0 | 2587 } |
2967 | 2588 |
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:
1164
diff
changeset
|
2589 s->mb_x=0; |
0 | 2590 |
716 | 2591 for(;;) { |
2592 int code = get_vlc2(&s->gb, mbincr_vlc.table, MBINCR_VLC_BITS, 2); | |
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:
1164
diff
changeset
|
2593 if (code < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2594 av_log(s->avctx, AV_LOG_ERROR, "first mb_incr damaged\n"); |
1285 | 2595 return -1; |
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:
1164
diff
changeset
|
2596 } |
716 | 2597 if (code >= 33) { |
2598 if (code == 33) { | |
2599 s->mb_x += 33; | |
2600 } | |
2601 /* otherwise, stuffing, nothing to do */ | |
2602 } else { | |
2603 s->mb_x += code; | |
2604 break; | |
2605 } | |
2606 } | |
4502
ff5472c81ab8
fix segfault with lol-ffplay2.mpg (dunno if this is exploitable, probably not easily)
michael
parents:
4454
diff
changeset
|
2607 if(s->mb_x >= (unsigned)s->mb_width){ |
ff5472c81ab8
fix segfault with lol-ffplay2.mpg (dunno if this is exploitable, probably not easily)
michael
parents:
4454
diff
changeset
|
2608 av_log(s->avctx, AV_LOG_ERROR, "initial skip overflow\n"); |
ff5472c81ab8
fix segfault with lol-ffplay2.mpg (dunno if this is exploitable, probably not easily)
michael
parents:
4454
diff
changeset
|
2609 return -1; |
ff5472c81ab8
fix segfault with lol-ffplay2.mpg (dunno if this is exploitable, probably not easily)
michael
parents:
4454
diff
changeset
|
2610 } |
1827 | 2611 |
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:
1164
diff
changeset
|
2612 s->resync_mb_x= s->mb_x; |
1827 | 2613 s->resync_mb_y= s->mb_y= mb_y; |
1160 | 2614 s->mb_skip_run= 0; |
1389 | 2615 ff_init_block_index(s); |
716 | 2616 |
1827 | 2617 if (s->mb_y==0 && s->mb_x==0 && (s->first_field || s->picture_structure==PICT_FRAME)) { |
2618 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
2967 | 2619 av_log(s->avctx, AV_LOG_DEBUG, "qp:%d fc:%2d%2d%2d%2d %s %s %s %s %s dc:%d pstruct:%d fdct:%d cmv:%d qtype:%d ivlc:%d rff:%d %s\n", |
1827 | 2620 s->qscale, s->mpeg_f_code[0][0],s->mpeg_f_code[0][1],s->mpeg_f_code[1][0],s->mpeg_f_code[1][1], |
2967 | 2621 s->pict_type == I_TYPE ? "I" : (s->pict_type == P_TYPE ? "P" : (s->pict_type == B_TYPE ? "B" : "S")), |
2622 s->progressive_sequence ? "ps" :"", s->progressive_frame ? "pf" : "", s->alternate_scan ? "alt" :"", s->top_field_first ? "top" :"", | |
1827 | 2623 s->intra_dc_precision, s->picture_structure, s->frame_pred_frame_dct, s->concealment_motion_vectors, |
2624 s->q_scale_type, s->intra_vlc_format, s->repeat_first_field, s->chroma_420_type ? "420" :""); | |
2625 } | |
2967 | 2626 } |
2627 | |
0 | 2628 for(;;) { |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2629 #ifdef HAVE_XVMC |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2630 //one 1 we memcpy blocks in xvmcvideo |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2631 if(s->avctx->xvmc_acceleration > 1) |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2632 XVMC_init_block(s);//set s->block |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2633 #endif |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2634 |
12
4d50c7d89e0f
use block[] in structure to have it aligned on 8 bytes for mmx optimizations
glantau
parents:
7
diff
changeset
|
2635 ret = mpeg_decode_mb(s, s->block); |
1644 | 2636 s->chroma_qscale= s->qscale; |
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:
1164
diff
changeset
|
2637 |
0 | 2638 dprintf("ret=%d\n", ret); |
2639 if (ret < 0) | |
2640 return -1; | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2641 |
1692 | 2642 if(s->current_picture.motion_val[0] && !s->encoding){ //note motion_val is normally NULL unless we want to extract the MVs |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1915
diff
changeset
|
2643 const int wrap = field_pic ? 2*s->b8_stride : s->b8_stride; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1915
diff
changeset
|
2644 int xy = s->mb_x*2 + s->mb_y*2*wrap; |
1841 | 2645 int motion_x, motion_y, dir, i; |
1692 | 2646 if(field_pic && !s->first_field) |
2647 xy += wrap/2; | |
2648 | |
1852 | 2649 for(i=0; i<2; i++){ |
2650 for(dir=0; dir<2; dir++){ | |
1841 | 2651 if (s->mb_intra || (dir==1 && s->pict_type != B_TYPE)) { |
2652 motion_x = motion_y = 0; | |
1946 | 2653 }else if (s->mv_type == MV_TYPE_16X16 || (s->mv_type == MV_TYPE_FIELD && field_pic)){ |
1841 | 2654 motion_x = s->mv[dir][0][0]; |
2655 motion_y = s->mv[dir][0][1]; | |
2656 } else /*if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8))*/ { | |
2657 motion_x = s->mv[dir][i][0]; | |
2658 motion_y = s->mv[dir][i][1]; | |
2659 } | |
1948 | 2660 |
1841 | 2661 s->current_picture.motion_val[dir][xy ][0] = motion_x; |
2662 s->current_picture.motion_val[dir][xy ][1] = motion_y; | |
2663 s->current_picture.motion_val[dir][xy + 1][0] = motion_x; | |
2664 s->current_picture.motion_val[dir][xy + 1][1] = motion_y; | |
1948 | 2665 s->current_picture.ref_index [dir][xy ]= |
2666 s->current_picture.ref_index [dir][xy + 1]= s->field_select[dir][i]; | |
2670 | 2667 assert(s->field_select[dir][i]==0 || s->field_select[dir][i]==1); |
1841 | 2668 } |
1852 | 2669 xy += wrap; |
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:
1164
diff
changeset
|
2670 } |
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:
1164
diff
changeset
|
2671 } |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2672 |
2256 | 2673 s->dest[0] += 16 >> lowres; |
2674 s->dest[1] += 16 >> (s->chroma_x_shift + lowres); | |
2675 s->dest[2] += 16 >> (s->chroma_x_shift + lowres); | |
1389 | 2676 |
716 | 2677 MPV_decode_mb(s, s->block); |
2967 | 2678 |
716 | 2679 if (++s->mb_x >= s->mb_width) { |
2261 | 2680 const int mb_size= 16>>s->avctx->lowres; |
1380 | 2681 |
2261 | 2682 ff_draw_horiz_band(s, mb_size*s->mb_y, mb_size); |
716 | 2683 |
2684 s->mb_x = 0; | |
2685 s->mb_y++; | |
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2686 |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2687 if(s->mb_y<<field_pic >= s->mb_height){ |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2688 int left= s->gb.size_in_bits - get_bits_count(&s->gb); |
3287 | 2689 int is_d10= s->chroma_format==2 && s->pict_type==I_TYPE && avctx->profile==0 && avctx->level==5 |
2690 && s->intra_dc_precision == 2 && s->q_scale_type == 1 && s->alternate_scan == 0 | |
2691 && s->progressive_frame == 0 /* vbv_delay == 0xBBB || 0xE10*/; | |
2692 | |
2693 if(left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)) && !is_d10) | |
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2694 || (avctx->error_resilience >= FF_ER_AGGRESSIVE && left>8)){ |
3287 | 2695 av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n", left, show_bits(&s->gb, FFMIN(left, 23))); |
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2696 return -1; |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2697 }else |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2698 goto eos; |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2699 } |
2967 | 2700 |
1389 | 2701 ff_init_block_index(s); |
716 | 2702 } |
2703 | |
2704 /* skip mb handling */ | |
1160 | 2705 if (s->mb_skip_run == -1) { |
716 | 2706 /* read again increment */ |
1160 | 2707 s->mb_skip_run = 0; |
716 | 2708 for(;;) { |
2709 int code = get_vlc2(&s->gb, mbincr_vlc.table, MBINCR_VLC_BITS, 2); | |
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:
1164
diff
changeset
|
2710 if (code < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2711 av_log(s->avctx, AV_LOG_ERROR, "mb incr damaged\n"); |
1181 | 2712 return -1; |
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:
1164
diff
changeset
|
2713 } |
716 | 2714 if (code >= 33) { |
2715 if (code == 33) { | |
1160 | 2716 s->mb_skip_run += 33; |
1181 | 2717 }else if(code == 35){ |
2718 if(s->mb_skip_run != 0 || show_bits(&s->gb, 15) != 0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2719 av_log(s->avctx, AV_LOG_ERROR, "slice mismatch\n"); |
1181 | 2720 return -1; |
2721 } | |
2722 goto eos; /* end of slice */ | |
716 | 2723 } |
2724 /* otherwise, stuffing, nothing to do */ | |
2725 } else { | |
1160 | 2726 s->mb_skip_run += code; |
716 | 2727 break; |
2728 } | |
2729 } | |
2730 } | |
0 | 2731 } |
1285 | 2732 eos: // end of slice |
2733 *buf += get_bits_count(&s->gb)/8 - 1; | |
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:
1164
diff
changeset
|
2734 //printf("y %d %d %d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y); |
1285 | 2735 return 0; |
2736 } | |
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:
1164
diff
changeset
|
2737 |
1827 | 2738 static int slice_decode_thread(AVCodecContext *c, void *arg){ |
2739 MpegEncContext *s= arg; | |
1861 | 2740 const uint8_t *buf= s->gb.buffer; |
1827 | 2741 int mb_y= s->start_mb_y; |
2742 | |
2743 s->error_count= 3*(s->end_mb_y - s->start_mb_y)*s->mb_width; | |
2744 | |
2745 for(;;){ | |
3776 | 2746 uint32_t start_code; |
2747 int ret; | |
1827 | 2748 |
2749 ret= mpeg_decode_slice((Mpeg1Context*)s, mb_y, &buf, s->gb.buffer_end - buf); | |
2750 emms_c(); | |
2967 | 2751 //av_log(c, AV_LOG_DEBUG, "ret:%d resync:%d/%d mb:%d/%d ts:%d/%d ec:%d\n", |
1827 | 2752 //ret, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, s->start_mb_y, s->end_mb_y, s->error_count); |
2753 if(ret < 0){ | |
2754 if(s->resync_mb_x>=0 && s->resync_mb_y>=0) | |
2755 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); | |
2756 }else{ | |
2757 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); | |
2758 } | |
2967 | 2759 |
1827 | 2760 if(s->mb_y == s->end_mb_y) |
2761 return 0; | |
2967 | 2762 |
3086 | 2763 start_code= -1; |
2764 buf = ff_find_start_code(buf, s->gb.buffer_end, &start_code); | |
1827 | 2765 mb_y= start_code - SLICE_MIN_START_CODE; |
2766 if(mb_y < 0 || mb_y >= s->end_mb_y) | |
2767 return -1; | |
2768 } | |
2967 | 2769 |
1827 | 2770 return 0; //not reached |
2771 } | |
2772 | |
1285 | 2773 /** |
2774 * handles slice ends. | |
2967 | 2775 * @return 1 if it seems to be the last slice of |
1285 | 2776 */ |
2777 static int slice_end(AVCodecContext *avctx, AVFrame *pict) | |
2778 { | |
2779 Mpeg1Context *s1 = avctx->priv_data; | |
2780 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
2967 | 2781 |
1402
f662e9c86cf2
* fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents:
1389
diff
changeset
|
2782 if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr) |
1311
fc858abf6b10
fixed segfault if sequence header has not been found before slice decoding
bellard
parents:
1289
diff
changeset
|
2783 return 0; |
fc858abf6b10
fixed segfault if sequence header has not been found before slice decoding
bellard
parents:
1289
diff
changeset
|
2784 |
1381 | 2785 #ifdef HAVE_XVMC |
2786 if(s->avctx->xvmc_acceleration) | |
2787 XVMC_field_end(s); | |
2788 #endif | |
0 | 2789 /* end of slice reached */ |
1285 | 2790 if (/*s->mb_y<<field_pic == s->mb_height &&*/ !s->first_field) { |
0 | 2791 /* end of image */ |
903 | 2792 |
1728 | 2793 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_MPEG2; |
1196 | 2794 |
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:
1164
diff
changeset
|
2795 ff_er_frame_end(s); |
0 | 2796 |
2797 MPV_frame_end(s); | |
2798 | |
924 | 2799 if (s->pict_type == B_TYPE || s->low_delay) { |
1328 | 2800 *pict= *(AVFrame*)s->current_picture_ptr; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1697
diff
changeset
|
2801 ff_print_debug_info(s, pict); |
0 | 2802 } else { |
903 | 2803 s->picture_number++; |
0 | 2804 /* latency of 1 frame for I and P frames */ |
2805 /* XXX: use another variable than picture_number */ | |
1211 | 2806 if (s->last_picture_ptr != NULL) { |
1328 | 2807 *pict= *(AVFrame*)s->last_picture_ptr; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1697
diff
changeset
|
2808 ff_print_debug_info(s, pict); |
0 | 2809 } |
2810 } | |
1380 | 2811 |
1285 | 2812 return 1; |
0 | 2813 } else { |
1285 | 2814 return 0; |
0 | 2815 } |
2816 } | |
2817 | |
2967 | 2818 static int mpeg1_decode_sequence(AVCodecContext *avctx, |
1862 | 2819 const uint8_t *buf, int buf_size) |
0 | 2820 { |
2821 Mpeg1Context *s1 = avctx->priv_data; | |
2822 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2823 int width,height; |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2824 int i, v, j; |
401
e20655449d4a
mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents:
391
diff
changeset
|
2825 |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
1021
diff
changeset
|
2826 init_get_bits(&s->gb, buf, buf_size*8); |
0 | 2827 |
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2828 width = get_bits(&s->gb, 12); |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2829 height = get_bits(&s->gb, 12); |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2830 if (width <= 0 || height <= 0 || |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2831 (width % 2) != 0 || (height % 2) != 0) |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2832 return -1; |
917 | 2833 s->aspect_ratio_info= get_bits(&s->gb, 4); |
1674
835964e33ba2
fixed potential problem if aspect_ratio_info == 0 for MPEG stream - fixed aspect ratio problem if CODEC_ID_MPEG2VIDEO is used to decode an MPEG1 stream (which is the recommended codec id for mpeg video)
bellard
parents:
1673
diff
changeset
|
2834 if (s->aspect_ratio_info == 0) |
835964e33ba2
fixed potential problem if aspect_ratio_info == 0 for MPEG stream - fixed aspect ratio problem if CODEC_ID_MPEG2VIDEO is used to decode an MPEG1 stream (which is the recommended codec id for mpeg video)
bellard
parents:
1673
diff
changeset
|
2835 return -1; |
0 | 2836 s->frame_rate_index = get_bits(&s->gb, 4); |
1837 | 2837 if (s->frame_rate_index == 0 || s->frame_rate_index > 13) |
0 | 2838 return -1; |
2839 s->bit_rate = get_bits(&s->gb, 18) * 400; | |
21 | 2840 if (get_bits1(&s->gb) == 0) /* marker */ |
0 | 2841 return -1; |
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2842 s->width = width; |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2843 s->height = height; |
0 | 2844 |
1710
4a68b20eeb2c
print vbv buffer size & bitrate when decoding with -debug 1
michael
parents:
1708
diff
changeset
|
2845 s->avctx->rc_buffer_size= get_bits(&s->gb, 10) * 1024*16; |
21 | 2846 skip_bits(&s->gb, 1); |
0 | 2847 |
2848 /* get matrix */ | |
21 | 2849 if (get_bits1(&s->gb)) { |
0 | 2850 for(i=0;i<64;i++) { |
2851 v = get_bits(&s->gb, 8); | |
1809 | 2852 if(v==0){ |
2853 av_log(s->avctx, AV_LOG_ERROR, "intra matrix damaged\n"); | |
2854 return -1; | |
2855 } | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2856 j = s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
38
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
2857 s->intra_matrix[j] = v; |
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
2858 s->chroma_intra_matrix[j] = v; |
0 | 2859 } |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2860 #ifdef DEBUG |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2861 dprintf("intra matrix present\n"); |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2862 for(i=0;i<64;i++) |
2591
65874d96c2da
Typo errors patch by (QuickTime | ffmpeg gmail com>
michael
parents:
2590
diff
changeset
|
2863 dprintf(" %d", s->intra_matrix[s->dsp.idct_permutation[i]]); |
3177 | 2864 dprintf("\n"); |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2865 #endif |
0 | 2866 } else { |
2867 for(i=0;i<64;i++) { | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2868 j = s->dsp.idct_permutation[i]; |
533
3c07cf9595de
adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)
michaelni
parents:
520
diff
changeset
|
2869 v = ff_mpeg1_default_intra_matrix[i]; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
2870 s->intra_matrix[j] = v; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
2871 s->chroma_intra_matrix[j] = v; |
0 | 2872 } |
2873 } | |
21 | 2874 if (get_bits1(&s->gb)) { |
0 | 2875 for(i=0;i<64;i++) { |
2876 v = get_bits(&s->gb, 8); | |
1809 | 2877 if(v==0){ |
2878 av_log(s->avctx, AV_LOG_ERROR, "inter matrix damaged\n"); | |
2879 return -1; | |
2880 } | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2881 j = s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
344 | 2882 s->inter_matrix[j] = v; |
2883 s->chroma_inter_matrix[j] = v; | |
0 | 2884 } |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2885 #ifdef DEBUG |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2886 dprintf("non intra matrix present\n"); |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2887 for(i=0;i<64;i++) |
2591
65874d96c2da
Typo errors patch by (QuickTime | ffmpeg gmail com>
michael
parents:
2590
diff
changeset
|
2888 dprintf(" %d", s->inter_matrix[s->dsp.idct_permutation[i]]); |
3177 | 2889 dprintf("\n"); |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2890 #endif |
0 | 2891 } else { |
2892 for(i=0;i<64;i++) { | |
1092 | 2893 int j= s->dsp.idct_permutation[i]; |
533
3c07cf9595de
adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)
michaelni
parents:
520
diff
changeset
|
2894 v = ff_mpeg1_default_non_intra_matrix[i]; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
2895 s->inter_matrix[j] = v; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
2896 s->chroma_inter_matrix[j] = v; |
0 | 2897 } |
2898 } | |
2967 | 2899 |
1809 | 2900 if(show_bits(&s->gb, 23) != 0){ |
2901 av_log(s->avctx, AV_LOG_ERROR, "sequence header damaged\n"); | |
2902 return -1; | |
2903 } | |
0 | 2904 |
2905 /* we set mpeg2 parameters so that it emulates mpeg1 */ | |
2906 s->progressive_sequence = 1; | |
2907 s->progressive_frame = 1; | |
2908 s->picture_structure = PICT_FRAME; | |
2909 s->frame_pred_frame_dct = 1; | |
1850 | 2910 s->chroma_format = 1; |
1421 | 2911 s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG1VIDEO; |
401
e20655449d4a
mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents:
391
diff
changeset
|
2912 avctx->sub_id = 1; /* indicates mpeg1 */ |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2913 s->out_format = FMT_MPEG1; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2914 s->swap_uv = 0;//AFAIK VCR2 don't have SEQ_HEADER |
1672 | 2915 if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1; |
2967 | 2916 |
1710
4a68b20eeb2c
print vbv buffer size & bitrate when decoding with -debug 1
michael
parents:
1708
diff
changeset
|
2917 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
2967 | 2918 av_log(s->avctx, AV_LOG_DEBUG, "vbv buffer: %d, bitrate:%d\n", |
1710
4a68b20eeb2c
print vbv buffer size & bitrate when decoding with -debug 1
michael
parents:
1708
diff
changeset
|
2919 s->avctx->rc_buffer_size, s->bit_rate); |
2967 | 2920 |
0 | 2921 return 0; |
2922 } | |
2923 | |
1376 | 2924 static int vcr2_init_sequence(AVCodecContext *avctx) |
2925 { | |
2926 Mpeg1Context *s1 = avctx->priv_data; | |
2927 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
1377 | 2928 int i, v; |
1376 | 2929 |
2930 /* start new mpeg1 context decoding */ | |
2931 s->out_format = FMT_MPEG1; | |
2932 if (s1->mpeg_enc_ctx_allocated) { | |
2933 MPV_common_end(s); | |
2934 } | |
2270 | 2935 s->width = avctx->coded_width; |
2936 s->height = avctx->coded_height; | |
1376 | 2937 avctx->has_b_frames= 0; //true? |
1380 | 2938 s->low_delay= 1; |
1381 | 2939 |
1821 | 2940 if(avctx->xvmc_acceleration){ |
2941 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_xvmc_mpg2_420); | |
2942 }else{ | |
2943 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_420); | |
2944 } | |
2945 | |
1381 | 2946 if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT ) |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2947 if( avctx->idct_algo == FF_IDCT_AUTO ) |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2948 avctx->idct_algo = FF_IDCT_SIMPLE; |
2967 | 2949 |
1376 | 2950 if (MPV_common_init(s) < 0) |
2951 return -1; | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2952 exchange_uv(s);//common init reset pblocks, so we swap them here |
2967 | 2953 s->swap_uv = 1;// in case of xvmc we need to swap uv for each MB |
1376 | 2954 s1->mpeg_enc_ctx_allocated = 1; |
2955 | |
2956 for(i=0;i<64;i++) { | |
2957 int j= s->dsp.idct_permutation[i]; | |
2958 v = ff_mpeg1_default_intra_matrix[i]; | |
2959 s->intra_matrix[j] = v; | |
2960 s->chroma_intra_matrix[j] = v; | |
2961 | |
2962 v = ff_mpeg1_default_non_intra_matrix[i]; | |
2963 s->inter_matrix[j] = v; | |
2964 s->chroma_inter_matrix[j] = v; | |
2965 } | |
2966 | |
2967 s->progressive_sequence = 1; | |
2968 s->progressive_frame = 1; | |
2969 s->picture_structure = PICT_FRAME; | |
2970 s->frame_pred_frame_dct = 1; | |
1850 | 2971 s->chroma_format = 1; |
1421 | 2972 s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO; |
1377 | 2973 avctx->sub_id = 2; /* indicates mpeg2 */ |
1376 | 2974 return 0; |
2975 } | |
2976 | |
2977 | |
2967 | 2978 static void mpeg_decode_user_data(AVCodecContext *avctx, |
1084 | 2979 const uint8_t *buf, int buf_size) |
2980 { | |
2981 const uint8_t *p; | |
2982 int len, flags; | |
2983 p = buf; | |
2984 len = buf_size; | |
2985 | |
2986 /* we parse the DTG active format information */ | |
2987 if (len >= 5 && | |
2988 p[0] == 'D' && p[1] == 'T' && p[2] == 'G' && p[3] == '1') { | |
2989 flags = p[4]; | |
2990 p += 5; | |
2991 len -= 5; | |
2992 if (flags & 0x80) { | |
2993 /* skip event id */ | |
2994 if (len < 2) | |
2995 return; | |
2996 p += 2; | |
2997 len -= 2; | |
2998 } | |
2999 if (flags & 0x40) { | |
3000 if (len < 1) | |
3001 return; | |
3002 avctx->dtg_active_format = p[0] & 0x0f; | |
3003 } | |
3004 } | |
3005 } | |
3006 | |
2967 | 3007 static void mpeg_decode_gop(AVCodecContext *avctx, |
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3008 const uint8_t *buf, int buf_size){ |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3009 Mpeg1Context *s1 = avctx->priv_data; |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3010 MpegEncContext *s = &s1->mpeg_enc_ctx; |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3011 |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3012 int drop_frame_flag; |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3013 int time_code_hours, time_code_minutes; |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3014 int time_code_seconds, time_code_pictures; |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3015 int broken_link; |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3016 |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3017 init_get_bits(&s->gb, buf, buf_size*8); |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3018 |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3019 drop_frame_flag = get_bits1(&s->gb); |
2967 | 3020 |
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3021 time_code_hours=get_bits(&s->gb,5); |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3022 time_code_minutes = get_bits(&s->gb,6); |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3023 skip_bits1(&s->gb);//marker bit |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3024 time_code_seconds = get_bits(&s->gb,6); |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3025 time_code_pictures = get_bits(&s->gb,6); |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3026 |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3027 /*broken_link indicate that after editing the |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3028 reference frames of the first B-Frames after GOP I-Frame |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3029 are missing (open gop)*/ |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3030 broken_link = get_bits1(&s->gb); |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3031 |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3032 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3033 av_log(s->avctx, AV_LOG_DEBUG, "GOP (%2d:%02d:%02d.[%02d]) broken_link=%d\n", |
2979 | 3034 time_code_hours, time_code_minutes, time_code_seconds, |
3035 time_code_pictures, broken_link); | |
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
3036 } |
1211 | 3037 /** |
3038 * finds the end of the current frame in the bitstream. | |
3039 * @return the position of the first byte of the next frame, or -1 | |
3040 */ | |
4151
93baab5a86d2
rename ff_mpeg1_find_frame_end to mpeg1_find_frame_end and make it static
bcoudurier
parents:
4150
diff
changeset
|
3041 static int mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size) |
1988 | 3042 { |
1211 | 3043 int i; |
3086 | 3044 uint32_t state= pc->state; |
2967 | 3045 |
1211 | 3046 i=0; |
3047 if(!pc->frame_start_found){ | |
3048 for(i=0; i<buf_size; i++){ | |
3086 | 3049 i= ff_find_start_code(buf+i, buf+buf_size, &state) - buf - 1; |
1211 | 3050 if(state >= SLICE_MIN_START_CODE && state <= SLICE_MAX_START_CODE){ |
3051 i++; | |
3052 pc->frame_start_found=1; | |
3053 break; | |
3054 } | |
3055 } | |
3056 } | |
2967 | 3057 |
1211 | 3058 if(pc->frame_start_found){ |
1988 | 3059 /* EOF considered as end of frame */ |
3060 if (buf_size == 0) | |
3061 return 0; | |
1211 | 3062 for(; i<buf_size; i++){ |
3086 | 3063 i= ff_find_start_code(buf+i, buf+buf_size, &state) - buf - 1; |
1211 | 3064 if((state&0xFFFFFF00) == 0x100){ |
3065 if(state < SLICE_MIN_START_CODE || state > SLICE_MAX_START_CODE){ | |
3066 pc->frame_start_found=0; | |
2967 | 3067 pc->state=-1; |
1211 | 3068 return i-3; |
3069 } | |
3070 } | |
3071 } | |
2967 | 3072 } |
1211 | 3073 pc->state= state; |
1218
358bbc952e27
10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents:
1211
diff
changeset
|
3074 return END_NOT_FOUND; |
1211 | 3075 } |
3076 | |
0 | 3077 /* handle buffering and image synchronisation */ |
2967 | 3078 static int mpeg_decode_frame(AVCodecContext *avctx, |
0 | 3079 void *data, int *data_size, |
1064 | 3080 uint8_t *buf, int buf_size) |
0 | 3081 { |
3082 Mpeg1Context *s = avctx->priv_data; | |
1862 | 3083 const uint8_t *buf_end; |
3084 const uint8_t *buf_ptr; | |
3776 | 3085 uint32_t start_code; |
3086 int ret, input_size; | |
925 | 3087 AVFrame *picture = data; |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
3088 MpegEncContext *s2 = &s->mpeg_enc_ctx; |
0 | 3089 dprintf("fill_buffer\n"); |
3090 | |
2130
50779a18844c
Avoid segfault on ffmpeg "buffer flush" in mpeg12.c patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents:
2111
diff
changeset
|
3091 if (buf_size == 0) { |
2979 | 3092 /* special case for last picture */ |
3093 if (s2->low_delay==0 && s2->next_picture_ptr) { | |
3094 *picture= *(AVFrame*)s2->next_picture_ptr; | |
3095 s2->next_picture_ptr= NULL; | |
3096 | |
3097 *data_size = sizeof(AVFrame); | |
3098 } | |
0 | 3099 return 0; |
3100 } | |
3101 | |
1211 | 3102 if(s2->flags&CODEC_FLAG_TRUNCATED){ |
4151
93baab5a86d2
rename ff_mpeg1_find_frame_end to mpeg1_find_frame_end and make it static
bcoudurier
parents:
4150
diff
changeset
|
3103 int next= mpeg1_find_frame_end(&s2->parse_context, buf, buf_size); |
2967 | 3104 |
1988 | 3105 if( ff_combine_frame(&s2->parse_context, next, &buf, &buf_size) < 0 ) |
1211 | 3106 return buf_size; |
2967 | 3107 } |
3108 | |
0 | 3109 buf_ptr = buf; |
3110 buf_end = buf + buf_size; | |
383
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
3111 |
2967 | 3112 #if 0 |
3113 if (s->repeat_field % 2 == 1) { | |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
3114 s->repeat_field++; |
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
3115 //fprintf(stderr,"\nRepeating last frame: %d -> %d! pict: %d %d", avctx->frame_number-1, avctx->frame_number, |
383
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
3116 // s2->picture_number, s->repeat_field); |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
3117 if (avctx->flags & CODEC_FLAG_REPEAT_FIELD) { |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
3118 *data_size = sizeof(AVPicture); |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
3119 goto the_end; |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
3120 } |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
3121 } |
383
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
3122 #endif |
1376 | 3123 |
3124 if(s->mpeg_enc_ctx_allocated==0 && avctx->codec_tag == ff_get_fourcc("VCR2")) | |
3125 vcr2_init_sequence(avctx); | |
2967 | 3126 |
1827 | 3127 s->slice_count= 0; |
2967 | 3128 |
1211 | 3129 for(;;) { |
0 | 3130 /* find start next code */ |
3086 | 3131 start_code = -1; |
3132 buf_ptr = ff_find_start_code(buf_ptr,buf_end, &start_code); | |
3776 | 3133 if (start_code > 0x1ff){ |
2792 | 3134 if(s2->pict_type != B_TYPE || avctx->skip_frame <= AVDISCARD_DEFAULT){ |
1827 | 3135 if(avctx->thread_count > 1){ |
3136 int i; | |
3137 | |
3138 avctx->execute(avctx, slice_decode_thread, (void**)&(s2->thread_context[0]), NULL, s->slice_count); | |
3139 for(i=0; i<s->slice_count; i++) | |
3140 s2->error_count += s2->thread_context[i]->error_count; | |
3141 } | |
1484 | 3142 if (slice_end(avctx, picture)) { |
1672 | 3143 if(s2->last_picture_ptr || s2->low_delay) //FIXME merge with the stuff in mpeg_decode_slice |
1484 | 3144 *data_size = sizeof(AVPicture); |
3145 } | |
1285 | 3146 } |
1220 | 3147 return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index); |
0 | 3148 } |
2967 | 3149 |
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
3150 input_size = buf_end - buf_ptr; |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
3151 |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
3152 if(avctx->debug & FF_DEBUG_STARTCODE){ |
1904 | 3153 av_log(avctx, AV_LOG_DEBUG, "%3X at %zd left %d\n", start_code, buf_ptr-buf, input_size); |
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
3154 } |
1211 | 3155 |
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3156 /* prepare data for next start code */ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3157 switch(start_code) { |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3158 case SEQ_START_CODE: |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3159 mpeg1_decode_sequence(avctx, buf_ptr, |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3160 input_size); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3161 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3162 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3163 case PICTURE_START_CODE: |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3164 /* we have a complete image : we try to decompress it */ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3165 mpeg1_decode_picture(avctx, |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3166 buf_ptr, input_size); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3167 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3168 case EXT_START_CODE: |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3169 mpeg_decode_extension(avctx, |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3170 buf_ptr, input_size); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3171 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3172 case USER_START_CODE: |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3173 mpeg_decode_user_data(avctx, |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3174 buf_ptr, input_size); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3175 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3176 case GOP_START_CODE: |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3177 s2->first_field=0; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3178 mpeg_decode_gop(avctx, |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3179 buf_ptr, input_size); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3180 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3181 default: |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3182 if (start_code >= SLICE_MIN_START_CODE && |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3183 start_code <= SLICE_MAX_START_CODE) { |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3184 int mb_y= start_code - SLICE_MIN_START_CODE; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3185 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3186 if(s2->last_picture_ptr==NULL){ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3187 /* skip b frames if we dont have reference frames */ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3188 if(s2->pict_type==B_TYPE) break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3189 /* skip P frames if we dont have reference frame no valid header */ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3190 // if(s2->pict_type==P_TYPE && s2->first_field && !s2->first_slice) break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3191 } |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3192 /* skip b frames if we are in a hurry */ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3193 if(avctx->hurry_up && s2->pict_type==B_TYPE) break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3194 if( (avctx->skip_frame >= AVDISCARD_NONREF && s2->pict_type==B_TYPE) |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3195 ||(avctx->skip_frame >= AVDISCARD_NONKEY && s2->pict_type!=I_TYPE) |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3196 || avctx->skip_frame >= AVDISCARD_ALL) |
0 | 3197 break; |
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3198 /* skip everything if we are in a hurry>=5 */ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3199 if(avctx->hurry_up>=5) break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3200 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3201 if (!s->mpeg_enc_ctx_allocated) break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3202 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3203 if(s2->codec_id == CODEC_ID_MPEG2VIDEO){ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3204 if(mb_y < avctx->skip_top || mb_y >= s2->mb_height - avctx->skip_bottom) |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3205 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3206 } |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3207 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3208 if(s2->first_slice){ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3209 s2->first_slice=0; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3210 if(mpeg_field_start(s2) < 0) |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3211 return -1; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3212 } |
4353
d9cd0e5255d7
fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.mpg and http://sam.zoy.org/zzuf/lol-ffplay.m2v
michael
parents:
4283
diff
changeset
|
3213 if(!s2->current_picture_ptr){ |
d9cd0e5255d7
fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.mpg and http://sam.zoy.org/zzuf/lol-ffplay.m2v
michael
parents:
4283
diff
changeset
|
3214 av_log(avctx, AV_LOG_ERROR, "current_picture not initalized\n"); |
d9cd0e5255d7
fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.mpg and http://sam.zoy.org/zzuf/lol-ffplay.m2v
michael
parents:
4283
diff
changeset
|
3215 return -1; |
d9cd0e5255d7
fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.mpg and http://sam.zoy.org/zzuf/lol-ffplay.m2v
michael
parents:
4283
diff
changeset
|
3216 } |
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3217 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3218 if(avctx->thread_count > 1){ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3219 int threshold= (s2->mb_height*s->slice_count + avctx->thread_count/2) / avctx->thread_count; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3220 if(threshold <= mb_y){ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3221 MpegEncContext *thread_context= s2->thread_context[s->slice_count]; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3222 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3223 thread_context->start_mb_y= mb_y; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3224 thread_context->end_mb_y = s2->mb_height; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3225 if(s->slice_count){ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3226 s2->thread_context[s->slice_count-1]->end_mb_y= mb_y; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3227 ff_update_duplicate_context(thread_context, s2); |
2786 | 3228 } |
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3229 init_get_bits(&thread_context->gb, buf_ptr, input_size*8); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3230 s->slice_count++; |
0 | 3231 } |
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3232 buf_ptr += 2; //FIXME add minimum num of bytes per slice |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3233 }else{ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3234 ret = mpeg_decode_slice(s, mb_y, &buf_ptr, input_size); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3235 emms_c(); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3236 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3237 if(ret < 0){ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3238 if(s2->resync_mb_x>=0 && s2->resync_mb_y>=0) |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3239 ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x, s2->mb_y, AC_ERROR|DC_ERROR|MV_ERROR); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3240 }else{ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3241 ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x-1, s2->mb_y, AC_END|DC_END|MV_END); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3242 } |
0 | 3243 } |
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3244 } |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3245 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
3246 } |
0 | 3247 } |
3248 } | |
3249 | |
3250 static int mpeg_decode_end(AVCodecContext *avctx) | |
3251 { | |
3252 Mpeg1Context *s = avctx->priv_data; | |
3253 | |
3254 if (s->mpeg_enc_ctx_allocated) | |
3255 MPV_common_end(&s->mpeg_enc_ctx); | |
3256 return 0; | |
3257 } | |
3258 | |
1423 | 3259 AVCodec mpeg1video_decoder = { |
3260 "mpeg1video", | |
0 | 3261 CODEC_TYPE_VIDEO, |
3262 CODEC_ID_MPEG1VIDEO, | |
3263 sizeof(Mpeg1Context), | |
3264 mpeg_decode_init, | |
3265 NULL, | |
3266 mpeg_decode_end, | |
3267 mpeg_decode_frame, | |
2453 | 3268 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
1368 | 3269 .flush= ff_mpeg_flush, |
0 | 3270 }; |
1381 | 3271 |
1423 | 3272 AVCodec mpeg2video_decoder = { |
3273 "mpeg2video", | |
3274 CODEC_TYPE_VIDEO, | |
3275 CODEC_ID_MPEG2VIDEO, | |
3276 sizeof(Mpeg1Context), | |
3277 mpeg_decode_init, | |
3278 NULL, | |
3279 mpeg_decode_end, | |
3280 mpeg_decode_frame, | |
2453 | 3281 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
1423 | 3282 .flush= ff_mpeg_flush, |
3283 }; | |
3284 | |
1615 | 3285 //legacy decoder |
3286 AVCodec mpegvideo_decoder = { | |
3287 "mpegvideo", | |
3288 CODEC_TYPE_VIDEO, | |
3289 CODEC_ID_MPEG2VIDEO, | |
3290 sizeof(Mpeg1Context), | |
3291 mpeg_decode_init, | |
3292 NULL, | |
3293 mpeg_decode_end, | |
3294 mpeg_decode_frame, | |
2453 | 3295 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
1615 | 3296 .flush= ff_mpeg_flush, |
3297 }; | |
3298 | |
1749
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3299 #ifdef CONFIG_ENCODERS |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3300 |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3301 AVCodec mpeg1video_encoder = { |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3302 "mpeg1video", |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3303 CODEC_TYPE_VIDEO, |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3304 CODEC_ID_MPEG1VIDEO, |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3305 sizeof(MpegEncContext), |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3306 encode_init, |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3307 MPV_encode_picture, |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3308 MPV_encode_end, |
3391
d60dc0a7dee6
staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)
michael
parents:
3309
diff
changeset
|
3309 .supported_framerates= ff_frame_rate_tab+1, |
2555 | 3310 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
2111 | 3311 .capabilities= CODEC_CAP_DELAY, |
1749
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3312 }; |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3313 |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3314 AVCodec mpeg2video_encoder = { |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3315 "mpeg2video", |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3316 CODEC_TYPE_VIDEO, |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3317 CODEC_ID_MPEG2VIDEO, |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3318 sizeof(MpegEncContext), |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3319 encode_init, |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3320 MPV_encode_picture, |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3321 MPV_encode_end, |
3391
d60dc0a7dee6
staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)
michael
parents:
3309
diff
changeset
|
3322 .supported_framerates= ff_frame_rate_tab+1, |
3309 | 3323 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, -1}, |
2111 | 3324 .capabilities= CODEC_CAP_DELAY, |
1749
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3325 }; |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3326 #endif |
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1739
diff
changeset
|
3327 |
1381 | 3328 #ifdef HAVE_XVMC |
3329 static int mpeg_mc_decode_init(AVCodecContext *avctx){ | |
3330 Mpeg1Context *s; | |
3331 | |
2967 | 3332 if( avctx->thread_count > 1) |
2076 | 3333 return -1; |
1381 | 3334 if( !(avctx->slice_flags & SLICE_FLAG_CODED_ORDER) ) |
3335 return -1; | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
3336 if( !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD) ){ |
1381 | 3337 dprintf("mpeg12.c: XvMC decoder will work better if SLICE_FLAG_ALLOW_FIELD is set\n"); |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
3338 } |
1381 | 3339 mpeg_decode_init(avctx); |
3340 s = avctx->priv_data; | |
3341 | |
3342 avctx->pix_fmt = PIX_FMT_XVMC_MPEG2_IDCT; | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
3343 avctx->xvmc_acceleration = 2;//2 - the blocks are packed! |
1381 | 3344 |
3345 return 0; | |
3346 } | |
3347 | |
3348 AVCodec mpeg_xvmc_decoder = { | |
3349 "mpegvideo_xvmc", | |
3350 CODEC_TYPE_VIDEO, | |
3351 CODEC_ID_MPEG2VIDEO_XVMC, | |
3352 sizeof(Mpeg1Context), | |
3353 mpeg_mc_decode_init, | |
3354 NULL, | |
3355 mpeg_decode_end, | |
3356 mpeg_decode_frame, | |
2453 | 3357 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED| CODEC_CAP_HWACCEL | CODEC_CAP_DELAY, |
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1841
diff
changeset
|
3358 .flush= ff_mpeg_flush, |
1381 | 3359 }; |
3360 | |
3361 #endif | |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
3362 |
4150
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3363 #ifdef CONFIG_MPEGVIDEO_PARSER |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3364 static void mpegvideo_extract_headers(AVCodecParserContext *s, |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3365 AVCodecContext *avctx, |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3366 const uint8_t *buf, int buf_size) |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3367 { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3368 ParseContext1 *pc = s->priv_data; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3369 const uint8_t *buf_end; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3370 uint32_t start_code; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3371 int frame_rate_index, ext_type, bytes_left; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3372 int frame_rate_ext_n, frame_rate_ext_d; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3373 int picture_structure, top_field_first, repeat_first_field, progressive_frame; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3374 int horiz_size_ext, vert_size_ext, bit_rate_ext; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3375 //FIXME replace the crap with get_bits() |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3376 s->repeat_pict = 0; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3377 buf_end = buf + buf_size; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3378 while (buf < buf_end) { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3379 start_code= -1; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3380 buf= ff_find_start_code(buf, buf_end, &start_code); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3381 bytes_left = buf_end - buf; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3382 switch(start_code) { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3383 case PICTURE_START_CODE: |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3384 if (bytes_left >= 2) { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3385 s->pict_type = (buf[1] >> 3) & 7; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3386 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3387 break; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3388 case SEQ_START_CODE: |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3389 if (bytes_left >= 7) { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3390 pc->width = (buf[0] << 4) | (buf[1] >> 4); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3391 pc->height = ((buf[1] & 0x0f) << 8) | buf[2]; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3392 avcodec_set_dimensions(avctx, pc->width, pc->height); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3393 frame_rate_index = buf[3] & 0xf; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3394 pc->frame_rate.den = avctx->time_base.den = ff_frame_rate_tab[frame_rate_index].num; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3395 pc->frame_rate.num = avctx->time_base.num = ff_frame_rate_tab[frame_rate_index].den; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3396 avctx->bit_rate = ((buf[4]<<10) | (buf[5]<<2) | (buf[6]>>6))*400; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3397 avctx->codec_id = CODEC_ID_MPEG1VIDEO; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3398 avctx->sub_id = 1; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3399 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3400 break; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3401 case EXT_START_CODE: |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3402 if (bytes_left >= 1) { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3403 ext_type = (buf[0] >> 4); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3404 switch(ext_type) { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3405 case 0x1: /* sequence extension */ |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3406 if (bytes_left >= 6) { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3407 horiz_size_ext = ((buf[1] & 1) << 1) | (buf[2] >> 7); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3408 vert_size_ext = (buf[2] >> 5) & 3; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3409 bit_rate_ext = ((buf[2] & 0x1F)<<7) | (buf[3]>>1); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3410 frame_rate_ext_n = (buf[5] >> 5) & 3; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3411 frame_rate_ext_d = (buf[5] & 0x1f); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3412 pc->progressive_sequence = buf[1] & (1 << 3); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3413 avctx->has_b_frames= !(buf[5] >> 7); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3414 |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3415 pc->width |=(horiz_size_ext << 12); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3416 pc->height |=( vert_size_ext << 12); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3417 avctx->bit_rate += (bit_rate_ext << 18) * 400; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3418 avcodec_set_dimensions(avctx, pc->width, pc->height); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3419 avctx->time_base.den = pc->frame_rate.den * (frame_rate_ext_n + 1); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3420 avctx->time_base.num = pc->frame_rate.num * (frame_rate_ext_d + 1); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3421 avctx->codec_id = CODEC_ID_MPEG2VIDEO; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3422 avctx->sub_id = 2; /* forces MPEG2 */ |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3423 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3424 break; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3425 case 0x8: /* picture coding extension */ |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3426 if (bytes_left >= 5) { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3427 picture_structure = buf[2]&3; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3428 top_field_first = buf[3] & (1 << 7); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3429 repeat_first_field = buf[3] & (1 << 1); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3430 progressive_frame = buf[4] & (1 << 7); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3431 |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3432 /* check if we must repeat the frame */ |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3433 if (repeat_first_field) { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3434 if (pc->progressive_sequence) { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3435 if (top_field_first) |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3436 s->repeat_pict = 4; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3437 else |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3438 s->repeat_pict = 2; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3439 } else if (progressive_frame) { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3440 s->repeat_pict = 1; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3441 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3442 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3443 |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3444 /* the packet only represents half a frame |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3445 XXX,FIXME maybe find a different solution */ |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3446 if(picture_structure != 3) |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3447 s->repeat_pict = -1; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3448 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3449 break; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3450 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3451 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3452 break; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3453 case -1: |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3454 goto the_end; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3455 default: |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3456 /* we stop parsing when we encounter a slice. It ensures |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3457 that this function takes a negligible amount of time */ |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3458 if (start_code >= SLICE_MIN_START_CODE && |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3459 start_code <= SLICE_MAX_START_CODE) |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3460 goto the_end; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3461 break; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3462 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3463 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3464 the_end: ; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3465 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3466 |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3467 static int mpegvideo_parse(AVCodecParserContext *s, |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3468 AVCodecContext *avctx, |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3469 uint8_t **poutbuf, int *poutbuf_size, |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3470 const uint8_t *buf, int buf_size) |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3471 { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3472 ParseContext1 *pc1 = s->priv_data; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3473 ParseContext *pc= &pc1->pc; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3474 int next; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3475 |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3476 if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){ |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3477 next= buf_size; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3478 }else{ |
4151
93baab5a86d2
rename ff_mpeg1_find_frame_end to mpeg1_find_frame_end and make it static
bcoudurier
parents:
4150
diff
changeset
|
3479 next= mpeg1_find_frame_end(pc, buf, buf_size); |
4150
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3480 |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3481 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3482 *poutbuf = NULL; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3483 *poutbuf_size = 0; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3484 return buf_size; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3485 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3486 |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3487 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3488 /* we have a full frame : we just parse the first few MPEG headers |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3489 to have the full timing information. The time take by this |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3490 function should be negligible for uncorrupted streams */ |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3491 mpegvideo_extract_headers(s, avctx, buf, buf_size); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3492 #if 0 |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3493 printf("pict_type=%d frame_rate=%0.3f repeat_pict=%d\n", |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3494 s->pict_type, (double)avctx->time_base.den / avctx->time_base.num, s->repeat_pict); |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3495 #endif |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3496 |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3497 *poutbuf = (uint8_t *)buf; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3498 *poutbuf_size = buf_size; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3499 return next; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3500 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3501 |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3502 static int mpegvideo_split(AVCodecContext *avctx, |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3503 const uint8_t *buf, int buf_size) |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3504 { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3505 int i; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3506 uint32_t state= -1; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3507 |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3508 for(i=0; i<buf_size; i++){ |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3509 state= (state<<8) | buf[i]; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3510 if(state != 0x1B3 && state != 0x1B5 && state < 0x200 && state >= 0x100) |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3511 return i-3; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3512 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3513 return 0; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3514 } |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3515 |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3516 AVCodecParser mpegvideo_parser = { |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3517 { CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO }, |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3518 sizeof(ParseContext1), |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3519 NULL, |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3520 mpegvideo_parse, |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3521 ff_parse1_close, |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3522 mpegvideo_split, |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3523 }; |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3524 #endif /* !CONFIG_MPEGVIDEO_PARSER */ |
2205aefb22b7
move AVCodecParser prototypes and definitions to parser.h, and move mpegvideo parser to mpeg12.c
bcoudurier
parents:
4119
diff
changeset
|
3525 |
4623
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3526 static int imx_dump_header(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args, |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3527 uint8_t **poutbuf, int *poutbuf_size, |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3528 const uint8_t *buf, int buf_size, int keyframe) |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3529 { |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3530 /* MXF essence element key */ |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3531 static const uint8_t imx_header[16] = { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x05,0x01,0x01,0x00 }; |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3532 uint8_t *poutbufp; |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3533 |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3534 if (avctx->codec_id != CODEC_ID_MPEG2VIDEO) { |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3535 av_log(avctx, AV_LOG_ERROR, "imx bitstream filter only applies to mpeg2video codec\n"); |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3536 return 0; |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3537 } |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3538 |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3539 *poutbuf = av_malloc(buf_size + 20 + FF_INPUT_BUFFER_PADDING_SIZE); |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3540 poutbufp = *poutbuf; |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3541 bytestream_put_buffer(&poutbufp, imx_header, 16); |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3542 bytestream_put_byte(&poutbufp, 0x83); /* KLV BER long form */ |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3543 bytestream_put_be24(&poutbufp, buf_size); |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3544 bytestream_put_buffer(&poutbufp, buf, buf_size); |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3545 *poutbuf_size = poutbufp - *poutbuf; |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3546 return 1; |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3547 } |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3548 |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3549 AVBitStreamFilter imx_dump_header_bsf = { |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3550 "imxdump", |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3551 0, |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3552 imx_dump_header, |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3553 }; |
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
3554 |
2967 | 3555 /* this is ugly i know, but the alternative is too make |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
3556 hundreds of vars global and prefix them with ff_mpeg1_ |
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
3557 which is far uglier. */ |
2967 | 3558 #include "mdec.c" |