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