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