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