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