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