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