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