Mercurial > libavcodec.hg
annotate mpeg12.c @ 5440:cfbb6ab18f89 libavcodec
merge another 2 if() to save a few cpu cycles
| author | michael |
|---|---|
| date | Wed, 01 Aug 2007 20:04:12 +0000 |
| parents | f1db308c277b |
| children | 7b8fd76dba47 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 5208 | 2 * MPEG1/2 decoder |
| 429 | 3 * Copyright (c) 2000,2001 Fabrice Bellard. |
| 2967 | 4 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> |
| 0 | 5 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3776
diff
changeset
|
6 * This file is part of FFmpeg. |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3776
diff
changeset
|
7 * |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3776
diff
changeset
|
8 * FFmpeg is free software; you can redistribute it and/or |
| 429 | 9 * modify it under the terms of the GNU Lesser General Public |
| 10 * License as published by the Free Software Foundation; either | |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3776
diff
changeset
|
11 * version 2.1 of the License, or (at your option) any later version. |
| 0 | 12 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3776
diff
changeset
|
13 * FFmpeg is distributed in the hope that it will be useful, |
| 0 | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 429 | 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 16 * Lesser General Public License for more details. | |
| 0 | 17 * |
| 429 | 18 * You should have received a copy of the GNU Lesser General Public |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3776
diff
changeset
|
19 * License along with FFmpeg; if not, write to the Free Software |
|
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2979
diff
changeset
|
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 21 */ |
| 2967 | 22 |
| 1106 | 23 /** |
| 24 * @file mpeg12.c | |
| 5208 | 25 * MPEG1/2 decoder |
| 1106 | 26 */ |
| 2967 | 27 |
| 76 | 28 //#define DEBUG |
| 0 | 29 #include "avcodec.h" |
| 30 #include "dsputil.h" | |
| 31 #include "mpegvideo.h" | |
| 32 | |
| 5208 | 33 #include "mpeg12.h" |
| 0 | 34 #include "mpeg12data.h" |
| 5208 | 35 #include "mpeg12decdata.h" |
|
4623
e541c0dd35dd
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder
bcoudurier
parents:
4621
diff
changeset
|
36 #include "bytestream.h" |
| 0 | 37 |
| 1708 | 38 //#undef NDEBUG |
| 39 //#include <assert.h> | |
| 40 | |
| 694 | 41 |
| 552 | 42 #define DC_VLC_BITS 9 |
| 43 #define MV_VLC_BITS 9 | |
| 44 #define MBINCR_VLC_BITS 9 | |
| 45 #define MB_PAT_VLC_BITS 9 | |
| 46 #define MB_PTYPE_VLC_BITS 6 | |
| 47 #define MB_BTYPE_VLC_BITS 6 | |
| 48 #define TEX_VLC_BITS 9 | |
| 49 | |
| 2967 | 50 static inline int mpeg1_decode_block_inter(MpegEncContext *s, |
| 51 DCTELEM *block, | |
| 711 | 52 int n); |
| 2967 | 53 static inline int mpeg1_decode_block_intra(MpegEncContext *s, |
| 54 DCTELEM *block, | |
| 0 | 55 int n); |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
56 static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n); |
| 2967 | 57 static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, |
| 58 DCTELEM *block, | |
| 0 | 59 int n); |
| 2967 | 60 static inline int mpeg2_decode_block_intra(MpegEncContext *s, |
| 61 DCTELEM *block, | |
| 0 | 62 int n); |
| 2201 | 63 static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n); |
| 2622 | 64 static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n); |
| 0 | 65 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred); |
| 1620 | 66 static void exchange_uv(MpegEncContext *s); |
| 0 | 67 |
| 1381 | 68 extern int XVMC_field_start(MpegEncContext *s, AVCodecContext *avctx); |
| 69 extern int XVMC_field_end(MpegEncContext *s); | |
|
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
70 extern void XVMC_pack_pblocks(MpegEncContext *s,int cbp); |
| 1620 | 71 extern void XVMC_init_block(MpegEncContext *s);//set s->block |
| 1381 | 72 |
| 4180 | 73 static const enum PixelFormat pixfmt_yuv_420[]= {PIX_FMT_YUV420P,-1}; |
| 74 static const enum PixelFormat pixfmt_yuv_422[]= {PIX_FMT_YUV422P,-1}; | |
| 75 static const enum PixelFormat pixfmt_yuv_444[]= {PIX_FMT_YUV444P,-1}; | |
| 76 static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = { | |
| 1821 | 77 PIX_FMT_XVMC_MPEG2_IDCT, |
| 78 PIX_FMT_XVMC_MPEG2_MC, | |
| 2979 | 79 -1}; |
|
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
80 |
| 5210 | 81 uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; |
| 4668 | 82 |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
83 static void init_2d_vlc_rl(RLTable *rl, int use_static) |
| 552 | 84 { |
|
620
a5aa53b6e648
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michaelni
parents:
617
diff
changeset
|
85 int i; |
| 2967 | 86 |
| 87 init_vlc(&rl->vlc, TEX_VLC_BITS, rl->n + 2, | |
| 552 | 88 &rl->table_vlc[0][1], 4, 2, |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
89 &rl->table_vlc[0][0], 4, 2, use_static); |
| 552 | 90 |
| 2967 | 91 if(use_static) |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
92 rl->rl_vlc[0]= av_mallocz_static(rl->vlc.table_size*sizeof(RL_VLC_ELEM)); |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
93 else |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
94 rl->rl_vlc[0]= av_malloc(rl->vlc.table_size*sizeof(RL_VLC_ELEM)); |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
95 |
| 552 | 96 for(i=0; i<rl->vlc.table_size; i++){ |
| 97 int code= rl->vlc.table[i][0]; | |
| 98 int len = rl->vlc.table[i][1]; | |
| 99 int level, run; | |
| 2967 | 100 |
| 552 | 101 if(len==0){ // illegal code |
| 102 run= 65; | |
| 103 level= MAX_LEVEL; | |
| 104 }else if(len<0){ //more bits needed | |
| 105 run= 0; | |
| 106 level= code; | |
| 107 }else{ | |
| 108 if(code==rl->n){ //esc | |
| 109 run= 65; | |
| 110 level= 0; | |
| 111 }else if(code==rl->n+1){ //eob | |
| 711 | 112 run= 0; |
| 113 level= 127; | |
| 552 | 114 }else{ |
| 115 run= rl->table_run [code] + 1; | |
| 116 level= rl->table_level[code]; | |
| 117 } | |
| 118 } | |
| 119 rl->rl_vlc[0][i].len= len; | |
| 120 rl->rl_vlc[0][i].level= level; | |
| 121 rl->rl_vlc[0][i].run= run; | |
| 122 } | |
| 123 } | |
| 124 | |
| 5210 | 125 void ff_mpeg12_common_init(MpegEncContext *s) |
| 498 | 126 { |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
127 |
| 498 | 128 s->y_dc_scale_table= |
| 1992 | 129 s->c_dc_scale_table= mpeg2_dc_scale_table[s->intra_dc_precision]; |
| 1903 | 130 |
| 498 | 131 } |
| 132 | |
| 1325 | 133 void ff_mpeg1_clean_buffers(MpegEncContext *s){ |
| 134 s->last_dc[0] = 1 << (7 + s->intra_dc_precision); | |
| 135 s->last_dc[1] = s->last_dc[0]; | |
| 136 s->last_dc[2] = s->last_dc[0]; | |
| 137 memset(s->last_mv, 0, sizeof(s->last_mv)); | |
| 138 } | |
| 139 | |
| 0 | 140 |
| 141 /******************************************/ | |
| 142 /* decoding */ | |
| 143 | |
| 144 static VLC dc_lum_vlc; | |
| 145 static VLC dc_chroma_vlc; | |
| 146 static VLC mv_vlc; | |
| 147 static VLC mbincr_vlc; | |
| 148 static VLC mb_ptype_vlc; | |
| 149 static VLC mb_btype_vlc; | |
| 150 static VLC mb_pat_vlc; | |
| 151 | |
| 1904 | 152 static void init_vlcs(void) |
| 0 | 153 { |
| 154 static int done = 0; | |
| 155 | |
| 156 if (!done) { | |
| 494 | 157 done = 1; |
| 0 | 158 |
| 2967 | 159 init_vlc(&dc_lum_vlc, DC_VLC_BITS, 12, |
| 5210 | 160 ff_mpeg12_vlc_dc_lum_bits, 1, 1, |
| 161 ff_mpeg12_vlc_dc_lum_code, 2, 2, 1); | |
| 2967 | 162 init_vlc(&dc_chroma_vlc, DC_VLC_BITS, 12, |
| 5210 | 163 ff_mpeg12_vlc_dc_chroma_bits, 1, 1, |
| 164 ff_mpeg12_vlc_dc_chroma_code, 2, 2, 1); | |
| 2967 | 165 init_vlc(&mv_vlc, MV_VLC_BITS, 17, |
| 5210 | 166 &ff_mpeg12_mbMotionVectorTable[0][1], 2, 1, |
| 167 &ff_mpeg12_mbMotionVectorTable[0][0], 2, 1, 1); | |
| 2967 | 168 init_vlc(&mbincr_vlc, MBINCR_VLC_BITS, 36, |
| 5210 | 169 &ff_mpeg12_mbAddrIncrTable[0][1], 2, 1, |
| 170 &ff_mpeg12_mbAddrIncrTable[0][0], 2, 1, 1); | |
| 1853 | 171 init_vlc(&mb_pat_vlc, MB_PAT_VLC_BITS, 64, |
| 5210 | 172 &ff_mpeg12_mbPatTable[0][1], 2, 1, |
| 173 &ff_mpeg12_mbPatTable[0][0], 2, 1, 1); | |
| 2967 | 174 |
| 175 init_vlc(&mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7, | |
| 0 | 176 &table_mb_ptype[0][1], 2, 1, |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
177 &table_mb_ptype[0][0], 2, 1, 1); |
| 2967 | 178 init_vlc(&mb_btype_vlc, MB_BTYPE_VLC_BITS, 11, |
| 0 | 179 &table_mb_btype[0][1], 2, 1, |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2302
diff
changeset
|
180 &table_mb_btype[0][0], 2, 1, 1); |
| 5210 | 181 init_rl(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]); |
| 182 init_rl(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]); | |
| 552 | 183 |
| 5210 | 184 init_2d_vlc_rl(&ff_rl_mpeg1, 1); |
| 185 init_2d_vlc_rl(&ff_rl_mpeg2, 1); | |
| 0 | 186 } |
| 187 } | |
| 188 | |
| 189 static inline int get_dmv(MpegEncContext *s) | |
| 190 { | |
| 2967 | 191 if(get_bits1(&s->gb)) |
| 21 | 192 return 1 - (get_bits1(&s->gb) << 1); |
| 0 | 193 else |
| 194 return 0; | |
| 195 } | |
| 196 | |
| 54 | 197 static inline int get_qscale(MpegEncContext *s) |
| 198 { | |
|
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
|
199 int qscale = get_bits(&s->gb, 5); |
| 1728 | 200 if (s->q_scale_type) { |
| 201 return non_linear_qscale[qscale]; | |
| 202 } else { | |
| 203 return qscale << 1; | |
| 54 | 204 } |
| 205 } | |
| 206 | |
| 0 | 207 /* motion type (for mpeg2) */ |
| 208 #define MT_FIELD 1 | |
| 209 #define MT_FRAME 2 | |
| 210 #define MT_16X8 2 | |
| 211 #define MT_DMV 3 | |
| 212 | |
| 213 static int mpeg_decode_mb(MpegEncContext *s, | |
|
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1841
diff
changeset
|
214 DCTELEM block[12][64]) |
| 0 | 215 { |
| 751 | 216 int i, j, k, cbp, val, mb_type, motion_type; |
|
2591
65874d96c2da
Typo errors patch by (QuickTime | ffmpeg gmail com>
michael
parents:
2590
diff
changeset
|
217 const int mb_block_count = 4 + (1<< s->chroma_format); |
| 2076 | 218 |
| 4652 | 219 dprintf(s->avctx, "decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y); |
| 0 | 220 |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2624
diff
changeset
|
221 assert(s->mb_skipped==0); |
|
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
947
diff
changeset
|
222 |
| 1160 | 223 if (s->mb_skip_run-- != 0) { |
| 0 | 224 if (s->pict_type == P_TYPE) { |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2624
diff
changeset
|
225 s->mb_skipped = 1; |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
226 s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16; |
| 0 | 227 } else { |
| 2575 | 228 int mb_type; |
| 2967 | 229 |
| 2575 | 230 if(s->mb_x) |
| 231 mb_type= s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride - 1]; | |
| 232 else | |
| 2967 | 233 mb_type= s->current_picture.mb_type[ s->mb_width + (s->mb_y-1)*s->mb_stride - 1]; // FIXME not sure if this is allowed in mpeg at all, |
| 2575 | 234 if(IS_INTRA(mb_type)) |
| 235 return -1; | |
| 2967 | 236 |
| 237 s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= | |
| 2575 | 238 mb_type | MB_TYPE_SKIP; |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
239 // 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
|
240 |
| 2967 | 241 if((s->mv[0][0][0]|s->mv[0][0][1]|s->mv[1][0][0]|s->mv[1][0][1])==0) |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2624
diff
changeset
|
242 s->mb_skipped = 1; |
| 0 | 243 } |
| 930 | 244 |
| 0 | 245 return 0; |
| 246 } | |
| 247 | |
| 248 switch(s->pict_type) { | |
| 249 default: | |
| 250 case I_TYPE: | |
| 21 | 251 if (get_bits1(&s->gb) == 0) { |
| 1376 | 252 if (get_bits1(&s->gb) == 0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
253 av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in I Frame at %d %d\n", s->mb_x, s->mb_y); |
| 0 | 254 return -1; |
| 1376 | 255 } |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
256 mb_type = MB_TYPE_QUANT | MB_TYPE_INTRA; |
| 0 | 257 } 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
|
258 mb_type = MB_TYPE_INTRA; |
| 0 | 259 } |
| 260 break; | |
| 261 case P_TYPE: | |
| 545 | 262 mb_type = get_vlc2(&s->gb, mb_ptype_vlc.table, MB_PTYPE_VLC_BITS, 1); |
| 568 | 263 if (mb_type < 0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
264 av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in P Frame at %d %d\n", s->mb_x, s->mb_y); |
| 0 | 265 return -1; |
| 568 | 266 } |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
267 mb_type = ptype2mb_type[ mb_type ]; |
| 0 | 268 break; |
| 269 case B_TYPE: | |
| 545 | 270 mb_type = get_vlc2(&s->gb, mb_btype_vlc.table, MB_BTYPE_VLC_BITS, 1); |
| 568 | 271 if (mb_type < 0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
272 av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in B Frame at %d %d\n", s->mb_x, s->mb_y); |
| 0 | 273 return -1; |
| 568 | 274 } |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
275 mb_type = btype2mb_type[ mb_type ]; |
| 0 | 276 break; |
| 277 } | |
| 4652 | 278 dprintf(s->avctx, "mb_type=%x\n", mb_type); |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
279 // 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
|
280 if (IS_INTRA(mb_type)) { |
| 2624 | 281 s->dsp.clear_blocks(s->block[0]); |
| 2967 | 282 |
| 2624 | 283 if(!s->chroma_y_shift){ |
| 284 s->dsp.clear_blocks(s->block[6]); | |
| 285 } | |
| 2967 | 286 |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
287 /* 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
|
288 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
|
289 !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
|
290 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
|
291 } |
| 0 | 292 |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
293 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
|
294 s->qscale = get_qscale(s); |
| 2967 | 295 |
| 0 | 296 if (s->concealment_motion_vectors) { |
| 297 /* just parse them */ | |
| 2967 | 298 if (s->picture_structure != PICT_FRAME) |
| 21 | 299 skip_bits1(&s->gb); /* field select */ |
| 2967 | 300 |
| 301 s->mv[0][0][0]= s->last_mv[0][0][0]= s->last_mv[0][1][0] = | |
| 1323 | 302 mpeg_decode_motion(s, s->mpeg_f_code[0][0], s->last_mv[0][0][0]); |
| 2967 | 303 s->mv[0][0][1]= s->last_mv[0][0][1]= s->last_mv[0][1][1] = |
| 1323 | 304 mpeg_decode_motion(s, s->mpeg_f_code[0][1], s->last_mv[0][0][1]); |
| 305 | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
306 skip_bits1(&s->gb); /* marker */ |
| 1323 | 307 }else |
| 308 memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */ | |
| 0 | 309 s->mb_intra = 1; |
|
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
310 #ifdef HAVE_XVMC |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
311 //one 1 we memcpy blocks in xvmcvideo |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
312 if(s->avctx->xvmc_acceleration > 1){ |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
313 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
|
314 if(s->swap_uv){ |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
315 exchange_uv(s); |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
316 } |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
317 } |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
318 #endif |
| 0 | 319 |
| 1421 | 320 if (s->codec_id == CODEC_ID_MPEG2VIDEO) { |
| 2622 | 321 if(s->flags2 & CODEC_FLAG2_FAST){ |
| 322 for(i=0;i<6;i++) { | |
| 323 mpeg2_fast_decode_block_intra(s, s->pblocks[i], i); | |
| 324 } | |
| 325 }else{ | |
| 326 for(i=0;i<mb_block_count;i++) { | |
| 327 if (mpeg2_decode_block_intra(s, s->pblocks[i], i) < 0) | |
| 328 return -1; | |
| 329 } | |
| 0 | 330 } |
| 331 } else { | |
| 332 for(i=0;i<6;i++) { | |
|
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
333 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
|
334 return -1; |
| 0 | 335 } |
| 336 } | |
| 337 } 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
|
338 if (mb_type & MB_TYPE_ZERO_MV){ |
| 1655 | 339 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
|
340 |
| 5437 | 341 s->mv_dir = MV_DIR_FORWARD; |
| 342 if(s->picture_structure == PICT_FRAME){ | |
| 343 if(!s->frame_pred_frame_dct) | |
| 344 s->interlaced_dct = get_bits1(&s->gb); | |
| 345 s->mv_type = MV_TYPE_16X16; | |
| 346 }else{ | |
| 347 s->mv_type = MV_TYPE_FIELD; | |
| 348 mb_type |= MB_TYPE_INTERLACED; | |
| 349 s->field_select[0][0]= s->picture_structure - 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
|
350 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
351 |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
352 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
|
353 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
|
354 |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
355 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
|
356 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
|
357 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
|
358 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
|
359 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
|
360 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
|
361 }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
|
362 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
|
363 //FIXME decide if MBs in field pictures are MB_TYPE_INTERLACED |
| 4795 | 364 /* get additional motion vector type */ |
| 2967 | 365 if (s->frame_pred_frame_dct) |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
366 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
|
367 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
|
368 motion_type = get_bits(&s->gb, 2); |
| 5438 | 369 if (s->picture_structure == PICT_FRAME && HAS_CBP(mb_type)) |
| 370 s->interlaced_dct = get_bits1(&s->gb); | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
371 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
372 |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
373 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
|
374 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
|
375 |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
376 /* 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
|
377 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
|
378 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
|
379 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
|
380 s->mv_dir |= (MV_DIR_FORWARD >> i); |
| 4652 | 381 dprintf(s->avctx, "motion_type=%d\n", motion_type); |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
382 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
|
383 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
|
384 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
|
385 /* MT_FRAME */ |
| 2967 | 386 mb_type |= MB_TYPE_16x16; |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
387 s->mv_type = MV_TYPE_16X16; |
| 2967 | 388 s->mv[i][0][0]= s->last_mv[i][0][0]= s->last_mv[i][1][0] = |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
389 mpeg_decode_motion(s, s->mpeg_f_code[i][0], s->last_mv[i][0][0]); |
| 2967 | 390 s->mv[i][0][1]= s->last_mv[i][0][1]= s->last_mv[i][1][1] = |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
391 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
|
392 /* 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
|
393 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
|
394 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
|
395 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
|
396 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
397 } 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
|
398 /* MT_16X8 */ |
| 2967 | 399 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
|
400 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
|
401 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
|
402 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
|
403 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
|
404 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
|
405 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
|
406 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
|
407 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
|
408 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
409 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
410 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
411 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
|
412 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
|
413 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
|
414 if (s->picture_structure == PICT_FRAME) { |
| 2967 | 415 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
|
416 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
|
417 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
|
418 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
|
419 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
|
420 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
|
421 s->mv[i][j][0] = val; |
| 4652 | 422 dprintf(s->avctx, "fmx=%d\n", val); |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
423 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
|
424 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
|
425 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
|
426 s->mv[i][j][1] = val; |
| 4652 | 427 dprintf(s->avctx, "fmy=%d\n", val); |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
428 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
429 } else { |
| 2967 | 430 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
|
431 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
|
432 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
|
433 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
|
434 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
|
435 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
|
436 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
|
437 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
|
438 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
439 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
440 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
|
441 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
|
442 { |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
443 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
|
444 |
| 2967 | 445 mx = mpeg_decode_motion(s, s->mpeg_f_code[i][0], |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
446 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
|
447 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
|
448 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
|
449 dmx = get_dmv(s); |
| 2967 | 450 my = mpeg_decode_motion(s, s->mpeg_f_code[i][1], |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
451 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
|
452 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
|
453 s->mv_type = MV_TYPE_DMV; |
|
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
454 |
|
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
455 |
|
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
456 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
|
457 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
|
458 |
|
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
459 s->mv[i][0][0] = mx; |
|
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
460 s->mv[i][0][1] = my; |
|
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
461 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
|
462 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
|
463 |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
464 if (s->picture_structure == PICT_FRAME) { |
| 2967 | 465 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
|
466 |
|
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
467 //m = 1 + 2 * s->top_field_first; |
|
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
468 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
|
469 |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
470 /* top -> top pred */ |
|
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
471 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
|
472 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
|
473 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
|
474 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
|
475 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
|
476 } 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
|
477 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
|
478 |
|
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
479 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
|
480 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
|
481 if(s->picture_structure == PICT_TOP_FIELD) |
|
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
482 s->mv[i][2][1]--; |
| 2967 | 483 else |
|
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
484 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
|
485 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
486 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
487 break; |
| 1673 | 488 default: |
| 489 av_log(s->avctx, AV_LOG_ERROR, "00 motion_type at %d %d\n", s->mb_x, s->mb_y); | |
| 490 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
|
491 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
492 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
493 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
494 } |
| 2967 | 495 |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
496 s->mb_intra = 0; |
| 2624 | 497 if (HAS_CBP(mb_type)) { |
| 498 s->dsp.clear_blocks(s->block[0]); | |
| 2967 | 499 |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
500 cbp = get_vlc2(&s->gb, mb_pat_vlc.table, MB_PAT_VLC_BITS, 1); |
| 2076 | 501 if(mb_block_count > 6){ |
| 2979 | 502 cbp<<= mb_block_count-6; |
| 503 cbp |= get_bits(&s->gb, mb_block_count-6); | |
| 5440 | 504 s->dsp.clear_blocks(s->block[6]); |
|
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1841
diff
changeset
|
505 } |
|
5439
f1db308c277b
reorder if() so that the condition can be simplified
michael
parents:
5438
diff
changeset
|
506 if (cbp <= 0){ |
|
f1db308c277b
reorder if() so that the condition can be simplified
michael
parents:
5438
diff
changeset
|
507 av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y); |
|
f1db308c277b
reorder if() so that the condition can be simplified
michael
parents:
5438
diff
changeset
|
508 return -1; |
|
f1db308c277b
reorder if() so that the condition can be simplified
michael
parents:
5438
diff
changeset
|
509 } |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
510 |
|
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
511 #ifdef HAVE_XVMC |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
512 //on 1 we memcpy blocks in xvmcvideo |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
513 if(s->avctx->xvmc_acceleration > 1){ |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
514 XVMC_pack_pblocks(s,cbp); |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
515 if(s->swap_uv){ |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
516 exchange_uv(s); |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
517 } |
| 2967 | 518 } |
|
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
519 #endif |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
520 |
| 1421 | 521 if (s->codec_id == CODEC_ID_MPEG2VIDEO) { |
| 2201 | 522 if(s->flags2 & CODEC_FLAG2_FAST){ |
| 523 for(i=0;i<6;i++) { | |
| 524 if(cbp & 32) { | |
| 525 mpeg2_fast_decode_block_non_intra(s, s->pblocks[i], i); | |
| 526 } else { | |
| 527 s->block_last_index[i] = -1; | |
| 528 } | |
| 529 cbp+=cbp; | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
530 } |
| 2201 | 531 }else{ |
| 532 cbp<<= 12-mb_block_count; | |
| 2967 | 533 |
| 2201 | 534 for(i=0;i<mb_block_count;i++) { |
| 535 if ( cbp & (1<<11) ) { | |
| 536 if (mpeg2_decode_block_non_intra(s, s->pblocks[i], i) < 0) | |
| 537 return -1; | |
| 538 } else { | |
| 539 s->block_last_index[i] = -1; | |
| 540 } | |
| 541 cbp+=cbp; | |
| 542 } | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
543 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
544 } else { |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
545 if(s->flags2 & CODEC_FLAG2_FAST){ |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
546 for(i=0;i<6;i++) { |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
547 if (cbp & 32) { |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
548 mpeg1_fast_decode_block_inter(s, s->pblocks[i], i); |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
549 } else { |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
550 s->block_last_index[i] = -1; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
551 } |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
552 cbp+=cbp; |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
553 } |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
554 }else{ |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
555 for(i=0;i<6;i++) { |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
556 if (cbp & 32) { |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
557 if (mpeg1_decode_block_inter(s, s->pblocks[i], i) < 0) |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
558 return -1; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
559 } else { |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
560 s->block_last_index[i] = -1; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
561 } |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
562 cbp+=cbp; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
563 } |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
564 } |
| 711 | 565 } |
| 566 }else{ | |
|
2947
18d47c6673f7
Mark all 12 block unused when there are no coded blocks
iive
parents:
2834
diff
changeset
|
567 for(i=0;i<12;i++) |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
568 s->block_last_index[i] = -1; |
| 0 | 569 } |
| 570 } | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
571 |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
572 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
|
573 |
| 0 | 574 return 0; |
| 575 } | |
| 576 | |
| 577 /* as h263, but only 17 codes */ | |
| 578 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred) | |
| 579 { | |
|
1255
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
580 int code, sign, val, l, shift; |
| 0 | 581 |
| 545 | 582 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
|
583 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
|
584 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
|
585 } |
| 0 | 586 if (code < 0) { |
| 587 return 0xffff; | |
| 588 } | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
589 |
| 21 | 590 sign = get_bits1(&s->gb); |
| 0 | 591 shift = fcode - 1; |
|
1255
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
592 val = code; |
|
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
593 if (shift) { |
|
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
594 val = (val - 1) << shift; |
| 0 | 595 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
|
596 val++; |
|
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
597 } |
| 0 | 598 if (sign) |
| 599 val = -val; | |
| 600 val += pred; | |
| 2967 | 601 |
| 0 | 602 /* modulo decoding */ |
| 2093 | 603 l= INT_BIT - 5 - shift; |
| 604 val = (val<<l)>>l; | |
| 0 | 605 return val; |
| 606 } | |
| 607 | |
|
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
608 static inline int decode_dc(GetBitContext *gb, int component) |
| 0 | 609 { |
| 610 int code, diff; | |
| 611 | |
| 612 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
|
613 code = get_vlc2(gb, dc_lum_vlc.table, DC_VLC_BITS, 2); |
| 0 | 614 } 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
|
615 code = get_vlc2(gb, dc_chroma_vlc.table, DC_VLC_BITS, 2); |
| 0 | 616 } |
| 568 | 617 if (code < 0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
618 av_log(NULL, AV_LOG_ERROR, "invalid dc code at\n"); |
| 0 | 619 return 0xffff; |
| 568 | 620 } |
| 0 | 621 if (code == 0) { |
| 622 diff = 0; | |
| 623 } 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
|
624 diff = get_xbits(gb, code); |
| 0 | 625 } |
| 626 return diff; | |
| 627 } | |
| 628 | |
| 2967 | 629 static inline int mpeg1_decode_block_intra(MpegEncContext *s, |
| 630 DCTELEM *block, | |
| 0 | 631 int n) |
| 632 { | |
| 633 int level, dc, diff, i, j, run; | |
| 711 | 634 int component; |
| 5210 | 635 RLTable *rl = &ff_rl_mpeg1; |
| 1064 | 636 uint8_t * const scantable= s->intra_scantable.permutated; |
| 637 const uint16_t *quant_matrix= s->intra_matrix; | |
| 711 | 638 const int qscale= s->qscale; |
| 0 | 639 |
| 711 | 640 /* DC coef */ |
| 641 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
|
642 diff = decode_dc(&s->gb, component); |
| 711 | 643 if (diff >= 0xffff) |
| 644 return -1; | |
| 645 dc = s->last_dc[component]; | |
| 646 dc += diff; | |
| 647 s->last_dc[component] = dc; | |
| 648 block[0] = dc<<3; | |
| 4652 | 649 dprintf(s->avctx, "dc=%d diff=%d\n", dc, diff); |
| 711 | 650 i = 0; |
| 651 { | |
| 2967 | 652 OPEN_READER(re, &s->gb); |
| 711 | 653 /* now quantify & encode AC coefs */ |
| 654 for(;;) { | |
| 655 UPDATE_CACHE(re, &s->gb); | |
|
2615
0d88e3f89379
avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents:
2591
diff
changeset
|
656 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); |
| 2967 | 657 |
| 711 | 658 if(level == 127){ |
| 659 break; | |
| 660 } else if(level != 0) { | |
| 661 i += run; | |
| 662 j = scantable[i]; | |
| 1728 | 663 level= (level*qscale*quant_matrix[j])>>4; |
| 711 | 664 level= (level-1)|1; |
| 665 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
| 666 LAST_SKIP_BITS(re, &s->gb, 1); | |
| 667 } else { | |
| 668 /* escape */ | |
| 669 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
| 670 UPDATE_CACHE(re, &s->gb); | |
| 671 level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8); | |
| 672 if (level == -128) { | |
| 673 level = SHOW_UBITS(re, &s->gb, 8) - 256; LAST_SKIP_BITS(re, &s->gb, 8); | |
| 674 } else if (level == 0) { | |
| 675 level = SHOW_UBITS(re, &s->gb, 8) ; LAST_SKIP_BITS(re, &s->gb, 8); | |
| 676 } | |
| 677 i += run; | |
| 678 j = scantable[i]; | |
| 679 if(level<0){ | |
| 680 level= -level; | |
| 1728 | 681 level= (level*qscale*quant_matrix[j])>>4; |
| 711 | 682 level= (level-1)|1; |
| 683 level= -level; | |
| 684 }else{ | |
| 1728 | 685 level= (level*qscale*quant_matrix[j])>>4; |
| 711 | 686 level= (level-1)|1; |
| 687 } | |
| 688 } | |
| 689 if (i > 63){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
690 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
| 711 | 691 return -1; |
| 692 } | |
| 693 | |
| 694 block[j] = level; | |
| 695 } | |
| 696 CLOSE_READER(re, &s->gb); | |
| 697 } | |
| 698 s->block_last_index[n] = i; | |
| 699 return 0; | |
| 700 } | |
| 701 | |
| 2967 | 702 static inline int mpeg1_decode_block_inter(MpegEncContext *s, |
| 703 DCTELEM *block, | |
| 711 | 704 int n) |
| 705 { | |
| 706 int level, i, j, run; | |
| 5210 | 707 RLTable *rl = &ff_rl_mpeg1; |
| 1064 | 708 uint8_t * const scantable= s->intra_scantable.permutated; |
| 709 const uint16_t *quant_matrix= s->inter_matrix; | |
| 711 | 710 const int qscale= s->qscale; |
| 711 | |
| 712 { | |
|
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
|
713 OPEN_READER(re, &s->gb); |
| 711 | 714 i = -1; |
| 0 | 715 /* 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
|
716 UPDATE_CACHE(re, &s->gb); |
| 2617 | 717 if (((int32_t)GET_CACHE(re, &s->gb)) < 0) { |
| 1728 | 718 level= (3*qscale*quant_matrix[0])>>5; |
| 711 | 719 level= (level-1)|1; |
| 2617 | 720 if(GET_CACHE(re, &s->gb)&0x40000000) |
| 711 | 721 level= -level; |
| 714 | 722 block[0] = level; |
| 711 | 723 i++; |
| 2617 | 724 SKIP_BITS(re, &s->gb, 2); |
| 725 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) | |
| 726 goto end; | |
| 0 | 727 } |
| 714 | 728 |
| 711 | 729 /* now quantify & encode AC coefs */ |
| 730 for(;;) { | |
|
2615
0d88e3f89379
avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents:
2591
diff
changeset
|
731 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); |
| 2967 | 732 |
| 2617 | 733 if(level != 0) { |
| 711 | 734 i += run; |
| 735 j = scantable[i]; | |
| 1728 | 736 level= ((level*2+1)*qscale*quant_matrix[j])>>5; |
| 711 | 737 level= (level-1)|1; |
| 738 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
| 2617 | 739 SKIP_BITS(re, &s->gb, 1); |
| 711 | 740 } else { |
| 741 /* escape */ | |
| 742 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
| 743 UPDATE_CACHE(re, &s->gb); | |
| 744 level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8); | |
| 745 if (level == -128) { | |
| 2617 | 746 level = SHOW_UBITS(re, &s->gb, 8) - 256; SKIP_BITS(re, &s->gb, 8); |
| 711 | 747 } else if (level == 0) { |
| 2617 | 748 level = SHOW_UBITS(re, &s->gb, 8) ; SKIP_BITS(re, &s->gb, 8); |
| 711 | 749 } |
| 750 i += run; | |
| 751 j = scantable[i]; | |
| 752 if(level<0){ | |
| 753 level= -level; | |
| 1728 | 754 level= ((level*2+1)*qscale*quant_matrix[j])>>5; |
| 711 | 755 level= (level-1)|1; |
| 756 level= -level; | |
| 757 }else{ | |
| 1728 | 758 level= ((level*2+1)*qscale*quant_matrix[j])>>5; |
| 711 | 759 level= (level-1)|1; |
| 760 } | |
| 761 } | |
| 762 if (i > 63){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
763 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
| 711 | 764 return -1; |
| 765 } | |
| 0 | 766 |
| 711 | 767 block[j] = level; |
| 2617 | 768 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) |
| 769 break; | |
| 770 UPDATE_CACHE(re, &s->gb); | |
| 0 | 771 } |
| 2617 | 772 end: |
| 773 LAST_SKIP_BITS(re, &s->gb, 2); | |
| 711 | 774 CLOSE_READER(re, &s->gb); |
| 0 | 775 } |
| 711 | 776 s->block_last_index[n] = i; |
| 0 | 777 return 0; |
| 778 } | |
| 779 | |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
780 static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n) |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
781 { |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
782 int level, i, j, run; |
| 5210 | 783 RLTable *rl = &ff_rl_mpeg1; |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
784 uint8_t * const scantable= s->intra_scantable.permutated; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
785 const int qscale= s->qscale; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
786 |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
787 { |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
788 OPEN_READER(re, &s->gb); |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
789 i = -1; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
790 /* special case for the first coef. no need to add a second vlc table */ |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
791 UPDATE_CACHE(re, &s->gb); |
| 2617 | 792 if (((int32_t)GET_CACHE(re, &s->gb)) < 0) { |
| 2203 | 793 level= (3*qscale)>>1; |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
794 level= (level-1)|1; |
| 2617 | 795 if(GET_CACHE(re, &s->gb)&0x40000000) |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
796 level= -level; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
797 block[0] = level; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
798 i++; |
| 2617 | 799 SKIP_BITS(re, &s->gb, 2); |
| 800 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) | |
| 801 goto end; | |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
802 } |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
803 |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
804 /* now quantify & encode AC coefs */ |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
805 for(;;) { |
|
2615
0d88e3f89379
avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents:
2591
diff
changeset
|
806 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); |
| 2967 | 807 |
| 2617 | 808 if(level != 0) { |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
809 i += run; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
810 j = scantable[i]; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
811 level= ((level*2+1)*qscale)>>1; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
812 level= (level-1)|1; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
813 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); |
| 2617 | 814 SKIP_BITS(re, &s->gb, 1); |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
815 } else { |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
816 /* escape */ |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
817 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
818 UPDATE_CACHE(re, &s->gb); |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
819 level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8); |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
820 if (level == -128) { |
| 2617 | 821 level = SHOW_UBITS(re, &s->gb, 8) - 256; SKIP_BITS(re, &s->gb, 8); |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
822 } else if (level == 0) { |
| 2617 | 823 level = SHOW_UBITS(re, &s->gb, 8) ; SKIP_BITS(re, &s->gb, 8); |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
824 } |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
825 i += run; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
826 j = scantable[i]; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
827 if(level<0){ |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
828 level= -level; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
829 level= ((level*2+1)*qscale)>>1; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
830 level= (level-1)|1; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
831 level= -level; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
832 }else{ |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
833 level= ((level*2+1)*qscale)>>1; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
834 level= (level-1)|1; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
835 } |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
836 } |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
837 |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
838 block[j] = level; |
| 2617 | 839 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) |
| 840 break; | |
| 841 UPDATE_CACHE(re, &s->gb); | |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
842 } |
| 2617 | 843 end: |
| 844 LAST_SKIP_BITS(re, &s->gb, 2); | |
|
2202
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
845 CLOSE_READER(re, &s->gb); |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
846 } |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
847 s->block_last_index[n] = i; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
848 return 0; |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
849 } |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
850 |
|
8079b177ff5c
optional non spec compliant optimizations for mpeg1
michael
parents:
2201
diff
changeset
|
851 |
| 2967 | 852 static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, |
| 853 DCTELEM *block, | |
| 714 | 854 int n) |
| 0 | 855 { |
| 856 int level, i, j, run; | |
| 5210 | 857 RLTable *rl = &ff_rl_mpeg1; |
| 1064 | 858 uint8_t * const scantable= s->intra_scantable.permutated; |
| 859 const uint16_t *quant_matrix; | |
| 714 | 860 const int qscale= s->qscale; |
| 0 | 861 int mismatch; |
| 862 | |
| 863 mismatch = 1; | |
| 864 | |
| 865 { | |
|
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
|
866 OPEN_READER(re, &s->gb); |
| 714 | 867 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
|
868 if (n < 4) |
| 714 | 869 quant_matrix = s->inter_matrix; |
| 0 | 870 else |
| 714 | 871 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
|
872 |
| 0 | 873 /* 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
|
874 UPDATE_CACHE(re, &s->gb); |
| 2617 | 875 if (((int32_t)GET_CACHE(re, &s->gb)) < 0) { |
| 714 | 876 level= (3*qscale*quant_matrix[0])>>5; |
| 2617 | 877 if(GET_CACHE(re, &s->gb)&0x40000000) |
| 714 | 878 level= -level; |
| 879 block[0] = level; | |
| 880 mismatch ^= level; | |
| 881 i++; | |
| 2617 | 882 SKIP_BITS(re, &s->gb, 2); |
| 883 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) | |
| 884 goto end; | |
| 714 | 885 } |
| 886 | |
| 887 /* now quantify & encode AC coefs */ | |
| 888 for(;;) { | |
|
2615
0d88e3f89379
avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents:
2591
diff
changeset
|
889 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); |
| 2967 | 890 |
| 2617 | 891 if(level != 0) { |
| 714 | 892 i += run; |
| 893 j = scantable[i]; | |
| 894 level= ((level*2+1)*qscale*quant_matrix[j])>>5; | |
| 895 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
| 2617 | 896 SKIP_BITS(re, &s->gb, 1); |
| 714 | 897 } else { |
| 898 /* escape */ | |
| 899 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
| 900 UPDATE_CACHE(re, &s->gb); | |
| 901 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); | |
| 902 | |
| 903 i += run; | |
| 904 j = scantable[i]; | |
| 905 if(level<0){ | |
| 906 level= ((-level*2+1)*qscale*quant_matrix[j])>>5; | |
| 907 level= -level; | |
| 908 }else{ | |
| 909 level= ((level*2+1)*qscale*quant_matrix[j])>>5; | |
| 910 } | |
| 911 } | |
| 912 if (i > 63){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
913 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
| 714 | 914 return -1; |
| 915 } | |
| 2967 | 916 |
| 714 | 917 mismatch ^= level; |
| 918 block[j] = level; | |
| 2617 | 919 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) |
| 920 break; | |
| 921 UPDATE_CACHE(re, &s->gb); | |
| 0 | 922 } |
| 2617 | 923 end: |
| 924 LAST_SKIP_BITS(re, &s->gb, 2); | |
|
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
925 CLOSE_READER(re, &s->gb); |
| 0 | 926 } |
| 927 block[63] ^= (mismatch & 1); | |
| 2967 | 928 |
| 0 | 929 s->block_last_index[n] = i; |
| 930 return 0; | |
| 931 } | |
| 932 | |
| 2967 | 933 static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, |
| 934 DCTELEM *block, | |
| 2201 | 935 int n) |
| 936 { | |
| 937 int level, i, j, run; | |
| 5210 | 938 RLTable *rl = &ff_rl_mpeg1; |
| 2201 | 939 uint8_t * const scantable= s->intra_scantable.permutated; |
| 940 const int qscale= s->qscale; | |
| 941 OPEN_READER(re, &s->gb); | |
| 942 i = -1; | |
| 943 | |
| 944 /* special case for the first coef. no need to add a second vlc table */ | |
| 945 UPDATE_CACHE(re, &s->gb); | |
| 2617 | 946 if (((int32_t)GET_CACHE(re, &s->gb)) < 0) { |
| 2201 | 947 level= (3*qscale)>>1; |
| 2617 | 948 if(GET_CACHE(re, &s->gb)&0x40000000) |
| 2201 | 949 level= -level; |
| 950 block[0] = level; | |
| 951 i++; | |
| 2617 | 952 SKIP_BITS(re, &s->gb, 2); |
| 953 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) | |
| 954 goto end; | |
| 2201 | 955 } |
| 956 | |
| 957 /* now quantify & encode AC coefs */ | |
| 958 for(;;) { | |
|
2615
0d88e3f89379
avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents:
2591
diff
changeset
|
959 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); |
| 2967 | 960 |
| 2617 | 961 if(level != 0) { |
| 2201 | 962 i += run; |
| 963 j = scantable[i]; | |
| 964 level= ((level*2+1)*qscale)>>1; | |
| 965 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
| 2617 | 966 SKIP_BITS(re, &s->gb, 1); |
| 2201 | 967 } else { |
| 968 /* escape */ | |
| 969 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
| 970 UPDATE_CACHE(re, &s->gb); | |
| 971 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); | |
| 972 | |
| 973 i += run; | |
| 974 j = scantable[i]; | |
| 975 if(level<0){ | |
| 976 level= ((-level*2+1)*qscale)>>1; | |
| 977 level= -level; | |
| 978 }else{ | |
| 979 level= ((level*2+1)*qscale)>>1; | |
| 980 } | |
| 981 } | |
| 2967 | 982 |
| 2201 | 983 block[j] = level; |
| 2617 | 984 if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) |
| 985 break; | |
| 986 UPDATE_CACHE(re, &s->gb); | |
| 2201 | 987 } |
| 2617 | 988 end: |
| 2967 | 989 LAST_SKIP_BITS(re, &s->gb, 2); |
| 2201 | 990 CLOSE_READER(re, &s->gb); |
| 991 s->block_last_index[n] = i; | |
| 992 return 0; | |
| 993 } | |
| 994 | |
| 995 | |
| 2967 | 996 static inline int mpeg2_decode_block_intra(MpegEncContext *s, |
| 997 DCTELEM *block, | |
| 714 | 998 int n) |
| 0 | 999 { |
| 1000 int level, dc, diff, i, j, run; | |
| 714 | 1001 int component; |
| 0 | 1002 RLTable *rl; |
| 1064 | 1003 uint8_t * const scantable= s->intra_scantable.permutated; |
| 1004 const uint16_t *quant_matrix; | |
| 714 | 1005 const int qscale= s->qscale; |
| 0 | 1006 int mismatch; |
| 1007 | |
| 1008 /* DC coef */ | |
| 714 | 1009 if (n < 4){ |
| 1010 quant_matrix = s->intra_matrix; | |
| 2967 | 1011 component = 0; |
| 714 | 1012 }else{ |
| 1013 quant_matrix = s->chroma_intra_matrix; | |
|
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1841
diff
changeset
|
1014 component = (n&1) + 1; |
| 714 | 1015 } |
|
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1016 diff = decode_dc(&s->gb, component); |
| 0 | 1017 if (diff >= 0xffff) |
| 1018 return -1; | |
| 1019 dc = s->last_dc[component]; | |
| 1020 dc += diff; | |
| 1021 s->last_dc[component] = dc; | |
| 1022 block[0] = dc << (3 - s->intra_dc_precision); | |
| 4652 | 1023 dprintf(s->avctx, "dc=%d\n", block[0]); |
|
58
0e0a24def67a
fixed last zero mv for field - fixed mismatch handling for intra coefs
glantau
parents:
54
diff
changeset
|
1024 mismatch = block[0] ^ 1; |
| 714 | 1025 i = 0; |
| 0 | 1026 if (s->intra_vlc_format) |
| 5210 | 1027 rl = &ff_rl_mpeg2; |
| 0 | 1028 else |
| 5210 | 1029 rl = &ff_rl_mpeg1; |
|
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1030 |
| 714 | 1031 { |
| 2967 | 1032 OPEN_READER(re, &s->gb); |
| 714 | 1033 /* now quantify & encode AC coefs */ |
| 1034 for(;;) { | |
| 1035 UPDATE_CACHE(re, &s->gb); | |
|
2615
0d88e3f89379
avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents:
2591
diff
changeset
|
1036 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); |
| 2967 | 1037 |
| 714 | 1038 if(level == 127){ |
| 1039 break; | |
| 1040 } else if(level != 0) { | |
| 1041 i += run; | |
| 1042 j = scantable[i]; | |
| 1043 level= (level*qscale*quant_matrix[j])>>4; | |
| 1044 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
| 1045 LAST_SKIP_BITS(re, &s->gb, 1); | |
| 1046 } else { | |
| 1047 /* escape */ | |
| 1048 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
| 1049 UPDATE_CACHE(re, &s->gb); | |
| 1050 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); | |
| 1051 i += run; | |
| 1052 j = scantable[i]; | |
| 1053 if(level<0){ | |
| 1054 level= (-level*qscale*quant_matrix[j])>>4; | |
| 1055 level= -level; | |
| 1056 }else{ | |
| 1057 level= (level*qscale*quant_matrix[j])>>4; | |
| 1058 } | |
| 1059 } | |
| 1060 if (i > 63){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1061 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
| 714 | 1062 return -1; |
| 1063 } | |
| 2967 | 1064 |
| 714 | 1065 mismatch^= level; |
| 1066 block[j] = level; | |
| 568 | 1067 } |
| 714 | 1068 CLOSE_READER(re, &s->gb); |
| 0 | 1069 } |
| 714 | 1070 block[63]^= mismatch&1; |
| 2967 | 1071 |
| 0 | 1072 s->block_last_index[n] = i; |
| 1073 return 0; | |
| 1074 } | |
| 1075 | |
| 2967 | 1076 static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, |
| 1077 DCTELEM *block, | |
| 2622 | 1078 int n) |
| 1079 { | |
| 1080 int level, dc, diff, j, run; | |
| 1081 int component; | |
| 1082 RLTable *rl; | |
| 1083 uint8_t * scantable= s->intra_scantable.permutated; | |
| 1084 const uint16_t *quant_matrix; | |
| 1085 const int qscale= s->qscale; | |
| 1086 | |
| 1087 /* DC coef */ | |
| 1088 if (n < 4){ | |
| 1089 quant_matrix = s->intra_matrix; | |
| 2967 | 1090 component = 0; |
| 2622 | 1091 }else{ |
| 1092 quant_matrix = s->chroma_intra_matrix; | |
| 1093 component = (n&1) + 1; | |
| 1094 } | |
| 1095 diff = decode_dc(&s->gb, component); | |
| 1096 if (diff >= 0xffff) | |
| 1097 return -1; | |
| 1098 dc = s->last_dc[component]; | |
| 1099 dc += diff; | |
| 1100 s->last_dc[component] = dc; | |
| 1101 block[0] = dc << (3 - s->intra_dc_precision); | |
| 1102 if (s->intra_vlc_format) | |
| 5210 | 1103 rl = &ff_rl_mpeg2; |
| 2622 | 1104 else |
| 5210 | 1105 rl = &ff_rl_mpeg1; |
| 2622 | 1106 |
| 1107 { | |
| 2967 | 1108 OPEN_READER(re, &s->gb); |
| 2622 | 1109 /* now quantify & encode AC coefs */ |
| 1110 for(;;) { | |
| 1111 UPDATE_CACHE(re, &s->gb); | |
| 1112 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); | |
| 2967 | 1113 |
| 2622 | 1114 if(level == 127){ |
| 1115 break; | |
| 1116 } else if(level != 0) { | |
| 1117 scantable += run; | |
| 1118 j = *scantable; | |
| 1119 level= (level*qscale*quant_matrix[j])>>4; | |
| 1120 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
| 1121 LAST_SKIP_BITS(re, &s->gb, 1); | |
| 1122 } else { | |
| 1123 /* escape */ | |
| 1124 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
| 1125 UPDATE_CACHE(re, &s->gb); | |
| 1126 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); | |
| 1127 scantable += run; | |
| 1128 j = *scantable; | |
| 1129 if(level<0){ | |
| 1130 level= (-level*qscale*quant_matrix[j])>>4; | |
| 1131 level= -level; | |
| 1132 }else{ | |
| 1133 level= (level*qscale*quant_matrix[j])>>4; | |
| 1134 } | |
| 1135 } | |
| 2967 | 1136 |
| 2622 | 1137 block[j] = level; |
| 1138 } | |
| 1139 CLOSE_READER(re, &s->gb); | |
| 1140 } | |
| 2967 | 1141 |
| 2622 | 1142 s->block_last_index[n] = scantable - s->intra_scantable.permutated; |
| 1143 return 0; | |
| 1144 } | |
| 1145 | |
| 0 | 1146 typedef struct Mpeg1Context { |
| 1147 MpegEncContext mpeg_enc_ctx; | |
| 1148 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
|
1149 int repeat_field; /* true if we must repeat the field */ |
| 1546 | 1150 AVPanScan pan_scan; /** some temporary storage for the panscan */ |
| 1827 | 1151 int slice_count; |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1152 int swap_uv;//indicate VCR2 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1153 int save_aspect_info; |
|
4888
185f5e4feb72
make mpeg decoder handle mid-stream changes in resolution
benoit
parents:
4795
diff
changeset
|
1154 int save_width, save_height; |
| 2219 | 1155 AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1156 |
| 0 | 1157 } Mpeg1Context; |
| 1158 | |
| 1159 static int mpeg_decode_init(AVCodecContext *avctx) | |
| 1160 { | |
| 1161 Mpeg1Context *s = avctx->priv_data; | |
| 1892 | 1162 MpegEncContext *s2 = &s->mpeg_enc_ctx; |
| 1990 | 1163 int i; |
| 2967 | 1164 |
| 1990 | 1165 //we need some parmutation to store |
| 1166 //matrixes, until MPV_common_init() | |
| 2967 | 1167 //set the real permutatuon |
| 1990 | 1168 for(i=0;i<64;i++) |
| 1169 s2->dsp.idct_permutation[i]=i; | |
| 1170 | |
| 1892 | 1171 MPV_decode_defaults(s2); |
| 2967 | 1172 |
|
1732
f716b8f47d98
uninitalized variables fix by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
1728
diff
changeset
|
1173 s->mpeg_enc_ctx.avctx= avctx; |
| 558 | 1174 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
|
1175 s->mpeg_enc_ctx.flags2= avctx->flags2; |
| 5210 | 1176 ff_mpeg12_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
|
1177 init_vlcs(); |
| 0 | 1178 |
| 1179 s->mpeg_enc_ctx_allocated = 0; | |
| 1180 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
|
1181 s->repeat_field = 0; |
| 344 | 1182 s->mpeg_enc_ctx.codec_id= avctx->codec->id; |
| 0 | 1183 return 0; |
| 1184 } | |
| 1185 | |
| 2967 | 1186 static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm, |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1187 const uint8_t *new_perm){ |
| 2219 | 1188 uint16_t temp_matrix[64]; |
| 1189 int i; | |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1190 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1191 memcpy(temp_matrix,matrix,64*sizeof(uint16_t)); |
| 2967 | 1192 |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1193 for(i=0;i<64;i++){ |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1194 matrix[new_perm[i]] = temp_matrix[old_perm[i]]; |
| 2967 | 1195 } |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1196 } |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1197 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1198 //Call this function when we know all parameters |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1199 //it may be called in different places for mpeg1 and mpeg2 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1200 static int mpeg_decode_postinit(AVCodecContext *avctx){ |
| 2219 | 1201 Mpeg1Context *s1 = avctx->priv_data; |
| 1202 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
| 1203 uint8_t old_permutation[64]; | |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1204 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1205 if ( |
| 2979 | 1206 (s1->mpeg_enc_ctx_allocated == 0)|| |
| 2270 | 1207 avctx->coded_width != s->width || |
| 1208 avctx->coded_height != s->height|| | |
|
4888
185f5e4feb72
make mpeg decoder handle mid-stream changes in resolution
benoit
parents:
4795
diff
changeset
|
1209 s1->save_width != s->width || |
|
185f5e4feb72
make mpeg decoder handle mid-stream changes in resolution
benoit
parents:
4795
diff
changeset
|
1210 s1->save_height != s->height || |
| 2590 | 1211 s1->save_aspect_info != s->aspect_ratio_info|| |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1212 0) |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1213 { |
| 2967 | 1214 |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1215 if (s1->mpeg_enc_ctx_allocated) { |
| 2681 | 1216 ParseContext pc= s->parse_context; |
| 1217 s->parse_context.buffer=0; | |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1218 MPV_common_end(s); |
| 2681 | 1219 s->parse_context= pc; |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1220 } |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1221 |
| 2979 | 1222 if( (s->width == 0 )||(s->height == 0)) |
| 1223 return -2; | |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1224 |
| 2270 | 1225 avcodec_set_dimensions(avctx, s->width, s->height); |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1226 avctx->bit_rate = s->bit_rate; |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1227 s1->save_aspect_info = s->aspect_ratio_info; |
|
4888
185f5e4feb72
make mpeg decoder handle mid-stream changes in resolution
benoit
parents:
4795
diff
changeset
|
1228 s1->save_width = s->width; |
|
185f5e4feb72
make mpeg decoder handle mid-stream changes in resolution
benoit
parents:
4795
diff
changeset
|
1229 s1->save_height = s->height; |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1230 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1231 //low_delay may be forced, in this case we will have B frames |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1232 //that behave like P frames |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1233 avctx->has_b_frames = !(s->low_delay); |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1234 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1235 if(avctx->sub_id==1){//s->codec_id==avctx->codec_id==CODEC_ID |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1236 //mpeg1 fps |
|
3391
d60dc0a7dee6
staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)
michael
parents:
3309
diff
changeset
|
1237 avctx->time_base.den= ff_frame_rate_tab[s->frame_rate_index].num; |
|
d60dc0a7dee6
staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)
michael
parents:
3309
diff
changeset
|
1238 avctx->time_base.num= ff_frame_rate_tab[s->frame_rate_index].den; |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1239 //mpeg1 aspect |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1240 avctx->sample_aspect_ratio= av_d2q( |
| 5210 | 1241 1.0/ff_mpeg1_aspect[s->aspect_ratio_info], 255); |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1242 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1243 }else{//mpeg2 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1244 //mpeg2 fps |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1245 av_reduce( |
| 2967 | 1246 &s->avctx->time_base.den, |
| 1247 &s->avctx->time_base.num, | |
|
3391
d60dc0a7dee6
staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)
michael
parents:
3309
diff
changeset
|
1248 ff_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num, |
|
d60dc0a7dee6
staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)
michael
parents:
3309
diff
changeset
|
1249 ff_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den, |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1250 1<<30); |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1251 //mpeg2 aspect |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1252 if(s->aspect_ratio_info > 1){ |
|
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1253 if( (s1->pan_scan.width == 0 )||(s1->pan_scan.height == 0) ){ |
| 2967 | 1254 s->avctx->sample_aspect_ratio= |
|
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
1255 av_div_q( |
| 5210 | 1256 ff_mpeg2_aspect[s->aspect_ratio_info], |
|
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
1257 (AVRational){s->width, s->height} |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
1258 ); |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1259 }else{ |
| 2967 | 1260 s->avctx->sample_aspect_ratio= |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1261 av_div_q( |
| 5210 | 1262 ff_mpeg2_aspect[s->aspect_ratio_info], |
|
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1263 (AVRational){s1->pan_scan.width, s1->pan_scan.height} |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1264 ); |
| 2979 | 1265 } |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1266 }else{ |
| 2967 | 1267 s->avctx->sample_aspect_ratio= |
| 5210 | 1268 ff_mpeg2_aspect[s->aspect_ratio_info]; |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1269 } |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1270 }//mpeg2 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1271 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1272 if(avctx->xvmc_acceleration){ |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1273 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_xvmc_mpg2_420); |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1274 }else{ |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1275 if(s->chroma_format < 2){ |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1276 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_420); |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1277 }else |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1278 if(s->chroma_format == 2){ |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1279 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_422); |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1280 }else |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1281 if(s->chroma_format > 2){ |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1282 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_444); |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1283 } |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1284 } |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1285 //until then pix_fmt may be changed right after codec init |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1286 if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT ) |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1287 if( avctx->idct_algo == FF_IDCT_AUTO ) |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1288 avctx->idct_algo = FF_IDCT_SIMPLE; |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1289 |
| 2967 | 1290 //quantization matrixes may need reordering |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1291 //if dct permutation is changed |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1292 memcpy(old_permutation,s->dsp.idct_permutation,64*sizeof(uint8_t)); |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1293 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1294 if (MPV_common_init(s) < 0) |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1295 return -2; |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1296 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1297 quant_matrix_rebuild(s->intra_matrix, old_permutation,s->dsp.idct_permutation); |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1298 quant_matrix_rebuild(s->inter_matrix, old_permutation,s->dsp.idct_permutation); |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1299 quant_matrix_rebuild(s->chroma_intra_matrix,old_permutation,s->dsp.idct_permutation); |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1300 quant_matrix_rebuild(s->chroma_inter_matrix,old_permutation,s->dsp.idct_permutation); |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1301 |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1302 s1->mpeg_enc_ctx_allocated = 1; |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1303 } |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1304 return 0; |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1305 } |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1306 |
| 2967 | 1307 static int mpeg1_decode_picture(AVCodecContext *avctx, |
| 1862 | 1308 const uint8_t *buf, int buf_size) |
| 0 | 1309 { |
| 1310 Mpeg1Context *s1 = avctx->priv_data; | |
| 1311 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
| 1697 | 1312 int ref, f_code, vbv_delay; |
| 0 | 1313 |
| 2967 | 1314 if(mpeg_decode_postinit(s->avctx) < 0) |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1315 return -2; |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1316 |
|
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
|
1317 init_get_bits(&s->gb, buf, buf_size*8); |
| 0 | 1318 |
| 1319 ref = get_bits(&s->gb, 10); /* temporal ref */ | |
| 1320 s->pict_type = get_bits(&s->gb, 3); | |
| 2575 | 1321 if(s->pict_type == 0 || s->pict_type > 3) |
| 1322 return -1; | |
| 872 | 1323 |
| 1697 | 1324 vbv_delay= get_bits(&s->gb, 16); |
| 0 | 1325 if (s->pict_type == P_TYPE || s->pict_type == B_TYPE) { |
| 21 | 1326 s->full_pel[0] = get_bits1(&s->gb); |
| 0 | 1327 f_code = get_bits(&s->gb, 3); |
| 2786 | 1328 if (f_code == 0 && avctx->error_resilience >= FF_ER_COMPLIANT) |
| 0 | 1329 return -1; |
| 1330 s->mpeg_f_code[0][0] = f_code; | |
| 1331 s->mpeg_f_code[0][1] = f_code; | |
| 1332 } | |
| 1333 if (s->pict_type == B_TYPE) { | |
| 21 | 1334 s->full_pel[1] = get_bits1(&s->gb); |
| 0 | 1335 f_code = get_bits(&s->gb, 3); |
| 2786 | 1336 if (f_code == 0 && avctx->error_resilience >= FF_ER_COMPLIANT) |
| 0 | 1337 return -1; |
| 1338 s->mpeg_f_code[1][0] = f_code; | |
| 1339 s->mpeg_f_code[1][1] = f_code; | |
| 1340 } | |
| 903 | 1341 s->current_picture.pict_type= s->pict_type; |
| 1342 s->current_picture.key_frame= s->pict_type == I_TYPE; | |
| 2967 | 1343 |
| 2575 | 1344 if(avctx->debug & FF_DEBUG_PICT_INFO) |
| 1345 av_log(avctx, AV_LOG_DEBUG, "vbv_delay %d, ref %d type:%d\n", vbv_delay, ref, s->pict_type); | |
| 2967 | 1346 |
| 0 | 1347 s->y_dc_scale = 8; |
| 1348 s->c_dc_scale = 8; | |
| 1349 s->first_slice = 1; | |
| 1350 return 0; | |
| 1351 } | |
| 1352 | |
| 2219 | 1353 static void mpeg_decode_sequence_extension(Mpeg1Context *s1) |
| 0 | 1354 { |
| 2219 | 1355 MpegEncContext *s= &s1->mpeg_enc_ctx; |
| 0 | 1356 int horiz_size_ext, vert_size_ext; |
| 1721 | 1357 int bit_rate_ext; |
| 0 | 1358 |
| 1421 | 1359 skip_bits(&s->gb, 1); /* profil and level esc*/ |
| 2167 | 1360 s->avctx->profile= get_bits(&s->gb, 3); |
| 1361 s->avctx->level= get_bits(&s->gb, 4); | |
|
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
1362 s->progressive_sequence = get_bits1(&s->gb); /* progressive_sequence */ |
|
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1841
diff
changeset
|
1363 s->chroma_format = get_bits(&s->gb, 2); /* chroma_format 1=420, 2=422, 3=444 */ |
| 0 | 1364 horiz_size_ext = get_bits(&s->gb, 2); |
| 1365 vert_size_ext = get_bits(&s->gb, 2); | |
| 1366 s->width |= (horiz_size_ext << 12); | |
| 1367 s->height |= (vert_size_ext << 12); | |
| 1368 bit_rate_ext = get_bits(&s->gb, 12); /* XXX: handle it */ | |
| 2540 | 1369 s->bit_rate += (bit_rate_ext << 18) * 400; |
| 21 | 1370 skip_bits1(&s->gb); /* marker */ |
|
1710
4a68b20eeb2c
print vbv buffer size & bitrate when decoding with -debug 1
michael
parents:
1708
diff
changeset
|
1371 s->avctx->rc_buffer_size += get_bits(&s->gb, 8)*1024*16<<10; |
| 1346 | 1372 |
| 917 | 1373 s->low_delay = get_bits1(&s->gb); |
| 1346 | 1374 if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1; |
| 1375 | |
| 2219 | 1376 s1->frame_rate_ext.num = get_bits(&s->gb, 2)+1; |
| 1377 s1->frame_rate_ext.den = get_bits(&s->gb, 5)+1; | |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
1378 |
| 4652 | 1379 dprintf(s->avctx, "sequence extension\n"); |
| 1421 | 1380 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
|
1381 s->avctx->sub_id = 2; /* indicates mpeg2 found */ |
| 917 | 1382 |
| 1421 | 1383 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
| 2967 | 1384 av_log(s->avctx, AV_LOG_DEBUG, "profile: %d, level: %d vbv buffer: %d, bitrate:%d\n", |
| 2167 | 1385 s->avctx->profile, s->avctx->level, s->avctx->rc_buffer_size, s->bit_rate); |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1386 |
| 0 | 1387 } |
| 1388 | |
| 1546 | 1389 static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) |
| 1390 { | |
| 1391 MpegEncContext *s= &s1->mpeg_enc_ctx; | |
| 1392 int color_description, w, h; | |
| 1393 | |
| 1394 skip_bits(&s->gb, 3); /* video format */ | |
| 1395 color_description= get_bits1(&s->gb); | |
| 1396 if(color_description){ | |
| 1397 skip_bits(&s->gb, 8); /* color primaries */ | |
| 1398 skip_bits(&s->gb, 8); /* transfer_characteristics */ | |
| 1399 skip_bits(&s->gb, 8); /* matrix_coefficients */ | |
| 1400 } | |
| 1401 w= get_bits(&s->gb, 14); | |
| 1402 skip_bits(&s->gb, 1); //marker | |
| 1403 h= get_bits(&s->gb, 14); | |
| 1404 skip_bits(&s->gb, 1); //marker | |
| 2967 | 1405 |
| 1546 | 1406 s1->pan_scan.width= 16*w; |
| 1407 s1->pan_scan.height=16*h; | |
| 2967 | 1408 |
| 1546 | 1409 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
|
1410 av_log(s->avctx, AV_LOG_DEBUG, "sde w:%d, h:%d\n", w, h); |
| 1546 | 1411 } |
| 1412 | |
| 1413 static void mpeg_decode_picture_display_extension(Mpeg1Context *s1) | |
| 1414 { | |
| 1415 MpegEncContext *s= &s1->mpeg_enc_ctx; | |
|
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1416 int i,nofco; |
| 1546 | 1417 |
|
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1418 nofco = 1; |
|
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1419 if(s->progressive_sequence){ |
|
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1420 if(s->repeat_first_field){ |
| 2979 | 1421 nofco++; |
| 1422 if(s->top_field_first) | |
| 1423 nofco++; | |
| 1424 } | |
|
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1425 }else{ |
|
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1426 if(s->picture_structure == PICT_FRAME){ |
|
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1427 nofco++; |
| 2979 | 1428 if(s->repeat_first_field) |
| 1429 nofco++; | |
| 1430 } | |
|
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1431 } |
|
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1432 for(i=0; i<nofco; i++){ |
| 1546 | 1433 s1->pan_scan.position[i][0]= get_sbits(&s->gb, 16); |
| 1434 skip_bits(&s->gb, 1); //marker | |
| 1435 s1->pan_scan.position[i][1]= get_sbits(&s->gb, 16); | |
| 1436 skip_bits(&s->gb, 1); //marker | |
| 1437 } | |
| 2967 | 1438 |
| 1546 | 1439 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
| 2967 | 1440 av_log(s->avctx, AV_LOG_DEBUG, "pde (%d,%d) (%d,%d) (%d,%d)\n", |
| 1441 s1->pan_scan.position[0][0], s1->pan_scan.position[0][1], | |
| 1442 s1->pan_scan.position[1][0], s1->pan_scan.position[1][1], | |
| 1546 | 1443 s1->pan_scan.position[2][0], s1->pan_scan.position[2][1] |
| 1444 ); | |
| 1445 } | |
| 1446 | |
| 0 | 1447 static void mpeg_decode_quant_matrix_extension(MpegEncContext *s) |
| 1448 { | |
|
38
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
1449 int i, v, j; |
| 0 | 1450 |
| 4652 | 1451 dprintf(s->avctx, "matrix extension\n"); |
|
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1452 |
| 21 | 1453 if (get_bits1(&s->gb)) { |
| 0 | 1454 for(i=0;i<64;i++) { |
| 1455 v = get_bits(&s->gb, 8); | |
| 1092 | 1456 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
|
1457 s->intra_matrix[j] = v; |
|
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
1458 s->chroma_intra_matrix[j] = v; |
| 0 | 1459 } |
| 1460 } | |
| 21 | 1461 if (get_bits1(&s->gb)) { |
| 0 | 1462 for(i=0;i<64;i++) { |
| 1463 v = get_bits(&s->gb, 8); | |
| 1092 | 1464 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
| 344 | 1465 s->inter_matrix[j] = v; |
| 1466 s->chroma_inter_matrix[j] = v; | |
| 0 | 1467 } |
| 1468 } | |
| 21 | 1469 if (get_bits1(&s->gb)) { |
| 0 | 1470 for(i=0;i<64;i++) { |
| 1471 v = get_bits(&s->gb, 8); | |
| 1092 | 1472 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
|
1473 s->chroma_intra_matrix[j] = v; |
| 0 | 1474 } |
| 1475 } | |
| 21 | 1476 if (get_bits1(&s->gb)) { |
| 0 | 1477 for(i=0;i<64;i++) { |
| 1478 v = get_bits(&s->gb, 8); | |
| 1092 | 1479 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
| 344 | 1480 s->chroma_inter_matrix[j] = v; |
| 0 | 1481 } |
| 1482 } | |
| 1483 } | |
| 1484 | |
| 1485 static void mpeg_decode_picture_coding_extension(MpegEncContext *s) | |
| 1486 { | |
| 1487 s->full_pel[0] = s->full_pel[1] = 0; | |
| 1488 s->mpeg_f_code[0][0] = get_bits(&s->gb, 4); | |
| 1489 s->mpeg_f_code[0][1] = get_bits(&s->gb, 4); | |
| 1490 s->mpeg_f_code[1][0] = get_bits(&s->gb, 4); | |
| 1491 s->mpeg_f_code[1][1] = get_bits(&s->gb, 4); | |
| 1492 s->intra_dc_precision = get_bits(&s->gb, 2); | |
| 1493 s->picture_structure = get_bits(&s->gb, 2); | |
| 21 | 1494 s->top_field_first = get_bits1(&s->gb); |
| 1495 s->frame_pred_frame_dct = get_bits1(&s->gb); | |
| 1496 s->concealment_motion_vectors = get_bits1(&s->gb); | |
| 1497 s->q_scale_type = get_bits1(&s->gb); | |
| 1498 s->intra_vlc_format = get_bits1(&s->gb); | |
| 1499 s->alternate_scan = get_bits1(&s->gb); | |
| 1500 s->repeat_first_field = get_bits1(&s->gb); | |
| 1501 s->chroma_420_type = get_bits1(&s->gb); | |
| 1502 s->progressive_frame = get_bits1(&s->gb); | |
| 1708 | 1503 |
| 4070 | 1504 if(s->picture_structure == PICT_FRAME){ |
|
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
1505 s->first_field=0; |
| 4070 | 1506 s->v_edge_pos= 16*s->mb_height; |
| 1507 }else{ | |
|
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
1508 s->first_field ^= 1; |
| 4070 | 1509 s->v_edge_pos= 8*s->mb_height; |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1510 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
|
1511 } |
| 2967 | 1512 |
|
715
8b3ccabfce4a
move scantable init from block-decode to header parser
michaelni
parents:
714
diff
changeset
|
1513 if(s->alternate_scan){ |
| 1273 | 1514 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan); |
| 1515 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
|
1516 }else{ |
| 1273 | 1517 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct); |
| 1518 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
|
1519 } |
| 2967 | 1520 |
| 0 | 1521 /* composite display not parsed */ |
| 4652 | 1522 dprintf(s->avctx, "intra_dc_precision=%d\n", s->intra_dc_precision); |
| 1523 dprintf(s->avctx, "picture_structure=%d\n", s->picture_structure); | |
| 1524 dprintf(s->avctx, "top field first=%d\n", s->top_field_first); | |
| 1525 dprintf(s->avctx, "repeat first field=%d\n", s->repeat_first_field); | |
| 1526 dprintf(s->avctx, "conceal=%d\n", s->concealment_motion_vectors); | |
| 1527 dprintf(s->avctx, "intra_vlc_format=%d\n", s->intra_vlc_format); | |
| 1528 dprintf(s->avctx, "alternate_scan=%d\n", s->alternate_scan); | |
| 1529 dprintf(s->avctx, "frame_pred_frame_dct=%d\n", s->frame_pred_frame_dct); | |
| 1530 dprintf(s->avctx, "progressive_frame=%d\n", s->progressive_frame); | |
| 0 | 1531 } |
| 1532 | |
| 2967 | 1533 static void mpeg_decode_extension(AVCodecContext *avctx, |
| 1862 | 1534 const uint8_t *buf, int buf_size) |
| 0 | 1535 { |
| 1536 Mpeg1Context *s1 = avctx->priv_data; | |
| 1537 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
| 1538 int ext_type; | |
| 1539 | |
|
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
|
1540 init_get_bits(&s->gb, buf, buf_size*8); |
| 2967 | 1541 |
| 0 | 1542 ext_type = get_bits(&s->gb, 4); |
| 1543 switch(ext_type) { | |
| 1544 case 0x1: | |
| 2219 | 1545 mpeg_decode_sequence_extension(s1); |
| 0 | 1546 break; |
| 1546 | 1547 case 0x2: |
| 1548 mpeg_decode_sequence_display_extension(s1); | |
| 1549 break; | |
| 0 | 1550 case 0x3: |
| 1551 mpeg_decode_quant_matrix_extension(s); | |
| 1552 break; | |
| 1546 | 1553 case 0x7: |
| 1554 mpeg_decode_picture_display_extension(s1); | |
| 1555 break; | |
| 0 | 1556 case 0x8: |
| 1557 mpeg_decode_picture_coding_extension(s); | |
| 1558 break; | |
| 1559 } | |
| 1560 } | |
| 1561 | |
|
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1562 static void exchange_uv(MpegEncContext *s){ |
| 2219 | 1563 short * tmp = s->pblocks[4]; |
|
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1564 s->pblocks[4] = s->pblocks[5]; |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1565 s->pblocks[5] = tmp; |
| 1380 | 1566 } |
| 1567 | |
| 1827 | 1568 static int mpeg_field_start(MpegEncContext *s){ |
| 1569 AVCodecContext *avctx= s->avctx; | |
| 1570 Mpeg1Context *s1 = (Mpeg1Context*)s; | |
| 826 | 1571 |
| 0 | 1572 /* start frame decoding */ |
| 1827 | 1573 if(s->first_field || s->picture_structure==PICT_FRAME){ |
|
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
751
diff
changeset
|
1574 if(MPV_frame_start(s, avctx) < 0) |
| 1827 | 1575 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
|
1576 |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1577 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
|
1578 |
|
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1579 /* first check if we must repeat the frame */ |
| 1409 | 1580 s->current_picture_ptr->repeat_pict = 0; |
|
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1581 if (s->repeat_first_field) { |
|
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1582 if (s->progressive_sequence) { |
|
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1583 if (s->top_field_first) |
| 1409 | 1584 s->current_picture_ptr->repeat_pict = 4; |
|
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1585 else |
| 1409 | 1586 s->current_picture_ptr->repeat_pict = 2; |
|
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1587 } else if (s->progressive_frame) { |
| 1409 | 1588 s->current_picture_ptr->repeat_pict = 1; |
|
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1589 } |
| 2967 | 1590 } |
| 1546 | 1591 |
| 1592 *s->current_picture_ptr->pan_scan= s1->pan_scan; | |
| 1827 | 1593 }else{ //second field |
| 1138 | 1594 int i; |
| 2967 | 1595 |
|
1182
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
1596 if(!s->current_picture_ptr){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1597 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
|
1598 return -1; |
|
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
1599 } |
| 2967 | 1600 |
| 1138 | 1601 for(i=0; i<4; i++){ |
| 1602 s->current_picture.data[i] = s->current_picture_ptr->data[i]; | |
| 1603 if(s->picture_structure == PICT_BOTTOM_FIELD){ | |
| 1604 s->current_picture.data[i] += s->current_picture_ptr->linesize[i]; | |
| 2967 | 1605 } |
| 1138 | 1606 } |
| 1827 | 1607 } |
| 1381 | 1608 #ifdef HAVE_XVMC |
| 1609 // MPV_frame_start will call this function too, | |
| 1610 // but we need to call it on every field | |
| 1827 | 1611 if(s->avctx->xvmc_acceleration) |
| 1381 | 1612 XVMC_field_start(s,avctx); |
| 1613 #endif | |
| 1827 | 1614 |
| 1615 return 0; | |
| 1616 } | |
| 1617 | |
| 1618 #define DECODE_SLICE_ERROR -1 | |
| 1619 #define DECODE_SLICE_OK 0 | |
| 0 | 1620 |
| 1827 | 1621 /** |
| 1622 * decodes a slice. MpegEncContext.mb_y must be set to the MB row from the startcode | |
| 1623 * @return DECODE_SLICE_ERROR if the slice is damaged<br> | |
| 1624 * DECODE_SLICE_OK if this slice is ok<br> | |
| 1625 */ | |
| 1626 static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, | |
| 1862 | 1627 const uint8_t **buf, int buf_size) |
| 1827 | 1628 { |
| 1629 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
| 1630 AVCodecContext *avctx= s->avctx; | |
| 1631 const int field_pic= s->picture_structure != PICT_FRAME; | |
| 2256 | 1632 const int lowres= s->avctx->lowres; |
| 1827 | 1633 |
| 1634 s->resync_mb_x= | |
| 1635 s->resync_mb_y= -1; | |
| 1636 | |
| 1953 | 1637 if (mb_y<<field_pic >= s->mb_height){ |
| 1638 av_log(s->avctx, AV_LOG_ERROR, "slice below image (%d >= %d)\n", mb_y, s->mb_height); | |
| 1827 | 1639 return -1; |
| 1640 } | |
| 2967 | 1641 |
| 1211 | 1642 init_get_bits(&s->gb, *buf, buf_size*8); |
| 0 | 1643 |
| 1827 | 1644 ff_mpeg1_clean_buffers(s); |
| 1645 s->interlaced_dct = 0; | |
| 1646 | |
| 54 | 1647 s->qscale = get_qscale(s); |
| 1690 | 1648 |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1649 if(s->qscale == 0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1650 av_log(s->avctx, AV_LOG_ERROR, "qscale == 0\n"); |
| 1285 | 1651 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
|
1652 } |
| 2967 | 1653 |
| 0 | 1654 /* extra slice info */ |
| 21 | 1655 while (get_bits1(&s->gb) != 0) { |
| 1656 skip_bits(&s->gb, 8); | |
| 0 | 1657 } |
| 2967 | 1658 |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1659 s->mb_x=0; |
| 0 | 1660 |
| 716 | 1661 for(;;) { |
| 1662 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
|
1663 if (code < 0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1664 av_log(s->avctx, AV_LOG_ERROR, "first mb_incr damaged\n"); |
| 1285 | 1665 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
|
1666 } |
| 716 | 1667 if (code >= 33) { |
| 1668 if (code == 33) { | |
| 1669 s->mb_x += 33; | |
| 1670 } | |
| 1671 /* otherwise, stuffing, nothing to do */ | |
| 1672 } else { | |
| 1673 s->mb_x += code; | |
| 1674 break; | |
| 1675 } | |
| 1676 } | |
|
4502
ff5472c81ab8
fix segfault with lol-ffplay2.mpg (dunno if this is exploitable, probably not easily)
michael
parents:
4454
diff
changeset
|
1677 if(s->mb_x >= (unsigned)s->mb_width){ |
|
ff5472c81ab8
fix segfault with lol-ffplay2.mpg (dunno if this is exploitable, probably not easily)
michael
parents:
4454
diff
changeset
|
1678 av_log(s->avctx, AV_LOG_ERROR, "initial skip overflow\n"); |
|
ff5472c81ab8
fix segfault with lol-ffplay2.mpg (dunno if this is exploitable, probably not easily)
michael
parents:
4454
diff
changeset
|
1679 return -1; |
|
ff5472c81ab8
fix segfault with lol-ffplay2.mpg (dunno if this is exploitable, probably not easily)
michael
parents:
4454
diff
changeset
|
1680 } |
| 1827 | 1681 |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1682 s->resync_mb_x= s->mb_x; |
| 1827 | 1683 s->resync_mb_y= s->mb_y= mb_y; |
| 1160 | 1684 s->mb_skip_run= 0; |
| 1389 | 1685 ff_init_block_index(s); |
| 716 | 1686 |
| 1827 | 1687 if (s->mb_y==0 && s->mb_x==0 && (s->first_field || s->picture_structure==PICT_FRAME)) { |
| 1688 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
| 2967 | 1689 av_log(s->avctx, AV_LOG_DEBUG, "qp:%d fc:%2d%2d%2d%2d %s %s %s %s %s dc:%d pstruct:%d fdct:%d cmv:%d qtype:%d ivlc:%d rff:%d %s\n", |
| 1827 | 1690 s->qscale, s->mpeg_f_code[0][0],s->mpeg_f_code[0][1],s->mpeg_f_code[1][0],s->mpeg_f_code[1][1], |
| 2967 | 1691 s->pict_type == I_TYPE ? "I" : (s->pict_type == P_TYPE ? "P" : (s->pict_type == B_TYPE ? "B" : "S")), |
| 1692 s->progressive_sequence ? "ps" :"", s->progressive_frame ? "pf" : "", s->alternate_scan ? "alt" :"", s->top_field_first ? "top" :"", | |
| 1827 | 1693 s->intra_dc_precision, s->picture_structure, s->frame_pred_frame_dct, s->concealment_motion_vectors, |
| 1694 s->q_scale_type, s->intra_vlc_format, s->repeat_first_field, s->chroma_420_type ? "420" :""); | |
| 1695 } | |
| 2967 | 1696 } |
| 1697 | |
| 0 | 1698 for(;;) { |
|
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1699 #ifdef HAVE_XVMC |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1700 //one 1 we memcpy blocks in xvmcvideo |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1701 if(s->avctx->xvmc_acceleration > 1) |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1702 XVMC_init_block(s);//set s->block |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1703 #endif |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1704 |
| 5431 | 1705 if(mpeg_decode_mb(s, s->block) < 0) |
| 0 | 1706 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
|
1707 |
| 1692 | 1708 if(s->current_picture.motion_val[0] && !s->encoding){ //note motion_val is normally NULL unless we want to extract the MVs |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1915
diff
changeset
|
1709 const int wrap = field_pic ? 2*s->b8_stride : s->b8_stride; |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1915
diff
changeset
|
1710 int xy = s->mb_x*2 + s->mb_y*2*wrap; |
| 1841 | 1711 int motion_x, motion_y, dir, i; |
| 1692 | 1712 if(field_pic && !s->first_field) |
| 1713 xy += wrap/2; | |
| 1714 | |
| 1852 | 1715 for(i=0; i<2; i++){ |
| 1716 for(dir=0; dir<2; dir++){ | |
| 1841 | 1717 if (s->mb_intra || (dir==1 && s->pict_type != B_TYPE)) { |
| 1718 motion_x = motion_y = 0; | |
| 1946 | 1719 }else if (s->mv_type == MV_TYPE_16X16 || (s->mv_type == MV_TYPE_FIELD && field_pic)){ |
| 1841 | 1720 motion_x = s->mv[dir][0][0]; |
| 1721 motion_y = s->mv[dir][0][1]; | |
| 1722 } else /*if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8))*/ { | |
| 1723 motion_x = s->mv[dir][i][0]; | |
| 1724 motion_y = s->mv[dir][i][1]; | |
| 1725 } | |
| 1948 | 1726 |
| 1841 | 1727 s->current_picture.motion_val[dir][xy ][0] = motion_x; |
| 1728 s->current_picture.motion_val[dir][xy ][1] = motion_y; | |
| 1729 s->current_picture.motion_val[dir][xy + 1][0] = motion_x; | |
| 1730 s->current_picture.motion_val[dir][xy + 1][1] = motion_y; | |
| 1948 | 1731 s->current_picture.ref_index [dir][xy ]= |
| 1732 s->current_picture.ref_index [dir][xy + 1]= s->field_select[dir][i]; | |
| 2670 | 1733 assert(s->field_select[dir][i]==0 || s->field_select[dir][i]==1); |
| 1841 | 1734 } |
| 1852 | 1735 xy += wrap; |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1736 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1737 } |
|
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
1738 |
| 2256 | 1739 s->dest[0] += 16 >> lowres; |
| 5430 | 1740 s->dest[1] +=(16 >> lowres) >> s->chroma_x_shift; |
| 1741 s->dest[2] +=(16 >> lowres) >> s->chroma_x_shift; | |
| 1389 | 1742 |
| 716 | 1743 MPV_decode_mb(s, s->block); |
| 2967 | 1744 |
| 716 | 1745 if (++s->mb_x >= s->mb_width) { |
| 2261 | 1746 const int mb_size= 16>>s->avctx->lowres; |
| 1380 | 1747 |
| 2261 | 1748 ff_draw_horiz_band(s, mb_size*s->mb_y, mb_size); |
| 716 | 1749 |
| 1750 s->mb_x = 0; | |
| 1751 s->mb_y++; | |
|
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
1752 |
|
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
1753 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
|
1754 int left= s->gb.size_in_bits - get_bits_count(&s->gb); |
| 3287 | 1755 int is_d10= s->chroma_format==2 && s->pict_type==I_TYPE && avctx->profile==0 && avctx->level==5 |
| 1756 && s->intra_dc_precision == 2 && s->q_scale_type == 1 && s->alternate_scan == 0 | |
| 1757 && s->progressive_frame == 0 /* vbv_delay == 0xBBB || 0xE10*/; | |
| 1758 | |
| 1759 if(left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)) && !is_d10) | |
|
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
1760 || (avctx->error_resilience >= FF_ER_AGGRESSIVE && left>8)){ |
| 3287 | 1761 av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n", left, show_bits(&s->gb, FFMIN(left, 23))); |
|
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
1762 return -1; |
|
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
1763 }else |
|
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
1764 goto eos; |
|
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
1765 } |
| 2967 | 1766 |
| 1389 | 1767 ff_init_block_index(s); |
| 716 | 1768 } |
| 1769 | |
| 1770 /* skip mb handling */ | |
| 1160 | 1771 if (s->mb_skip_run == -1) { |
| 716 | 1772 /* read again increment */ |
| 1160 | 1773 s->mb_skip_run = 0; |
| 716 | 1774 for(;;) { |
| 1775 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
|
1776 if (code < 0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1777 av_log(s->avctx, AV_LOG_ERROR, "mb incr damaged\n"); |
| 1181 | 1778 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
|
1779 } |
| 716 | 1780 if (code >= 33) { |
| 1781 if (code == 33) { | |
| 1160 | 1782 s->mb_skip_run += 33; |
| 1181 | 1783 }else if(code == 35){ |
| 1784 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
|
1785 av_log(s->avctx, AV_LOG_ERROR, "slice mismatch\n"); |
| 1181 | 1786 return -1; |
| 1787 } | |
| 1788 goto eos; /* end of slice */ | |
| 716 | 1789 } |
| 1790 /* otherwise, stuffing, nothing to do */ | |
| 1791 } else { | |
| 1160 | 1792 s->mb_skip_run += code; |
| 716 | 1793 break; |
| 1794 } | |
| 1795 } | |
|
5432
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1796 if(s->mb_skip_run){ |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1797 int i; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1798 if(s->pict_type == I_TYPE){ |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1799 av_log(s->avctx, AV_LOG_ERROR, "skipped MB in I frame at %d %d\n", s->mb_x, s->mb_y); |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1800 return -1; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1801 } |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1802 |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1803 /* skip mb */ |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1804 s->mb_intra = 0; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1805 for(i=0;i<12;i++) |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1806 s->block_last_index[i] = -1; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1807 if(s->picture_structure == PICT_FRAME) |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1808 s->mv_type = MV_TYPE_16X16; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1809 else |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1810 s->mv_type = MV_TYPE_FIELD; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1811 if (s->pict_type == P_TYPE) { |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1812 /* if P type, zero motion vector is implied */ |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1813 s->mv_dir = MV_DIR_FORWARD; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1814 s->mv[0][0][0] = s->mv[0][0][1] = 0; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1815 s->last_mv[0][0][0] = s->last_mv[0][0][1] = 0; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1816 s->last_mv[0][1][0] = s->last_mv[0][1][1] = 0; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1817 s->field_select[0][0]= s->picture_structure - 1; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1818 } else { |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1819 /* if B type, reuse previous vectors and directions */ |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1820 s->mv[0][0][0] = s->last_mv[0][0][0]; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1821 s->mv[0][0][1] = s->last_mv[0][0][1]; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1822 s->mv[1][0][0] = s->last_mv[1][0][0]; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1823 s->mv[1][0][1] = s->last_mv[1][0][1]; |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1824 } |
|
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1825 } |
| 716 | 1826 } |
| 0 | 1827 } |
| 1285 | 1828 eos: // end of slice |
| 1829 *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
|
1830 //printf("y %d %d %d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y); |
| 1285 | 1831 return 0; |
| 1832 } | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1833 |
| 1827 | 1834 static int slice_decode_thread(AVCodecContext *c, void *arg){ |
| 1835 MpegEncContext *s= arg; | |
| 1861 | 1836 const uint8_t *buf= s->gb.buffer; |
| 1827 | 1837 int mb_y= s->start_mb_y; |
| 1838 | |
| 1839 s->error_count= 3*(s->end_mb_y - s->start_mb_y)*s->mb_width; | |
| 1840 | |
| 1841 for(;;){ | |
| 3776 | 1842 uint32_t start_code; |
| 1843 int ret; | |
| 1827 | 1844 |
| 1845 ret= mpeg_decode_slice((Mpeg1Context*)s, mb_y, &buf, s->gb.buffer_end - buf); | |
| 1846 emms_c(); | |
| 2967 | 1847 //av_log(c, AV_LOG_DEBUG, "ret:%d resync:%d/%d mb:%d/%d ts:%d/%d ec:%d\n", |
| 1827 | 1848 //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); |
| 1849 if(ret < 0){ | |
| 1850 if(s->resync_mb_x>=0 && s->resync_mb_y>=0) | |
| 1851 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); | |
| 1852 }else{ | |
| 1853 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); | |
| 1854 } | |
| 2967 | 1855 |
| 1827 | 1856 if(s->mb_y == s->end_mb_y) |
| 1857 return 0; | |
| 2967 | 1858 |
| 3086 | 1859 start_code= -1; |
| 1860 buf = ff_find_start_code(buf, s->gb.buffer_end, &start_code); | |
| 1827 | 1861 mb_y= start_code - SLICE_MIN_START_CODE; |
| 1862 if(mb_y < 0 || mb_y >= s->end_mb_y) | |
| 1863 return -1; | |
| 1864 } | |
| 2967 | 1865 |
| 1827 | 1866 return 0; //not reached |
| 1867 } | |
| 1868 | |
| 1285 | 1869 /** |
| 1870 * handles slice ends. | |
| 2967 | 1871 * @return 1 if it seems to be the last slice of |
| 1285 | 1872 */ |
| 1873 static int slice_end(AVCodecContext *avctx, AVFrame *pict) | |
| 1874 { | |
| 1875 Mpeg1Context *s1 = avctx->priv_data; | |
| 1876 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
| 2967 | 1877 |
|
1402
f662e9c86cf2
* fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents:
1389
diff
changeset
|
1878 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
|
1879 return 0; |
|
fc858abf6b10
fixed segfault if sequence header has not been found before slice decoding
bellard
parents:
1289
diff
changeset
|
1880 |
| 1381 | 1881 #ifdef HAVE_XVMC |
| 1882 if(s->avctx->xvmc_acceleration) | |
| 1883 XVMC_field_end(s); | |
| 1884 #endif | |
| 0 | 1885 /* end of slice reached */ |
| 1285 | 1886 if (/*s->mb_y<<field_pic == s->mb_height &&*/ !s->first_field) { |
| 0 | 1887 /* end of image */ |
| 903 | 1888 |
| 1728 | 1889 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_MPEG2; |
| 1196 | 1890 |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1891 ff_er_frame_end(s); |
| 0 | 1892 |
| 1893 MPV_frame_end(s); | |
| 1894 | |
| 924 | 1895 if (s->pict_type == B_TYPE || s->low_delay) { |
| 1328 | 1896 *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
|
1897 ff_print_debug_info(s, pict); |
| 0 | 1898 } else { |
| 903 | 1899 s->picture_number++; |
| 0 | 1900 /* latency of 1 frame for I and P frames */ |
| 1901 /* XXX: use another variable than picture_number */ | |
| 1211 | 1902 if (s->last_picture_ptr != NULL) { |
| 1328 | 1903 *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
|
1904 ff_print_debug_info(s, pict); |
| 0 | 1905 } |
| 1906 } | |
| 1380 | 1907 |
| 1285 | 1908 return 1; |
| 0 | 1909 } else { |
| 1285 | 1910 return 0; |
| 0 | 1911 } |
| 1912 } | |
| 1913 | |
| 2967 | 1914 static int mpeg1_decode_sequence(AVCodecContext *avctx, |
| 1862 | 1915 const uint8_t *buf, int buf_size) |
| 0 | 1916 { |
| 1917 Mpeg1Context *s1 = avctx->priv_data; | |
| 1918 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
|
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
1919 int width,height; |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1920 int i, v, j; |
|
401
e20655449d4a
mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents:
391
diff
changeset
|
1921 |
|
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
|
1922 init_get_bits(&s->gb, buf, buf_size*8); |
| 0 | 1923 |
|
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
1924 width = get_bits(&s->gb, 12); |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
1925 height = get_bits(&s->gb, 12); |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
1926 if (width <= 0 || height <= 0 || |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
1927 (width % 2) != 0 || (height % 2) != 0) |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
1928 return -1; |
| 917 | 1929 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
|
1930 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
|
1931 return -1; |
| 0 | 1932 s->frame_rate_index = get_bits(&s->gb, 4); |
| 1837 | 1933 if (s->frame_rate_index == 0 || s->frame_rate_index > 13) |
| 0 | 1934 return -1; |
| 1935 s->bit_rate = get_bits(&s->gb, 18) * 400; | |
| 21 | 1936 if (get_bits1(&s->gb) == 0) /* marker */ |
| 0 | 1937 return -1; |
|
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
1938 s->width = width; |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
1939 s->height = height; |
| 0 | 1940 |
|
1710
4a68b20eeb2c
print vbv buffer size & bitrate when decoding with -debug 1
michael
parents:
1708
diff
changeset
|
1941 s->avctx->rc_buffer_size= get_bits(&s->gb, 10) * 1024*16; |
| 21 | 1942 skip_bits(&s->gb, 1); |
| 0 | 1943 |
| 1944 /* get matrix */ | |
| 21 | 1945 if (get_bits1(&s->gb)) { |
| 0 | 1946 for(i=0;i<64;i++) { |
| 1947 v = get_bits(&s->gb, 8); | |
| 1809 | 1948 if(v==0){ |
| 1949 av_log(s->avctx, AV_LOG_ERROR, "intra matrix damaged\n"); | |
| 1950 return -1; | |
| 1951 } | |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1952 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
|
1953 s->intra_matrix[j] = v; |
|
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
1954 s->chroma_intra_matrix[j] = v; |
| 0 | 1955 } |
|
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1956 #ifdef DEBUG |
| 4652 | 1957 dprintf(s->avctx, "intra matrix present\n"); |
|
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1958 for(i=0;i<64;i++) |
| 4652 | 1959 dprintf(s->avctx, " %d", s->intra_matrix[s->dsp.idct_permutation[i]]); |
| 1960 dprintf(s->avctx, "\n"); | |
|
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1961 #endif |
| 0 | 1962 } else { |
| 1963 for(i=0;i<64;i++) { | |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1964 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
|
1965 v = ff_mpeg1_default_intra_matrix[i]; |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
1966 s->intra_matrix[j] = v; |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
1967 s->chroma_intra_matrix[j] = v; |
| 0 | 1968 } |
| 1969 } | |
| 21 | 1970 if (get_bits1(&s->gb)) { |
| 0 | 1971 for(i=0;i<64;i++) { |
| 1972 v = get_bits(&s->gb, 8); | |
| 1809 | 1973 if(v==0){ |
| 1974 av_log(s->avctx, AV_LOG_ERROR, "inter matrix damaged\n"); | |
| 1975 return -1; | |
| 1976 } | |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1977 j = s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
| 344 | 1978 s->inter_matrix[j] = v; |
| 1979 s->chroma_inter_matrix[j] = v; | |
| 0 | 1980 } |
|
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1981 #ifdef DEBUG |
| 4652 | 1982 dprintf(s->avctx, "non intra matrix present\n"); |
|
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1983 for(i=0;i<64;i++) |
| 4652 | 1984 dprintf(s->avctx, " %d", s->inter_matrix[s->dsp.idct_permutation[i]]); |
| 1985 dprintf(s->avctx, "\n"); | |
|
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1986 #endif |
| 0 | 1987 } else { |
| 1988 for(i=0;i<64;i++) { | |
| 1092 | 1989 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
|
1990 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
|
1991 s->inter_matrix[j] = v; |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
1992 s->chroma_inter_matrix[j] = v; |
| 0 | 1993 } |
| 1994 } | |
| 2967 | 1995 |
| 1809 | 1996 if(show_bits(&s->gb, 23) != 0){ |
| 1997 av_log(s->avctx, AV_LOG_ERROR, "sequence header damaged\n"); | |
| 1998 return -1; | |
| 1999 } | |
| 0 | 2000 |
| 2001 /* we set mpeg2 parameters so that it emulates mpeg1 */ | |
| 2002 s->progressive_sequence = 1; | |
| 2003 s->progressive_frame = 1; | |
| 2004 s->picture_structure = PICT_FRAME; | |
| 2005 s->frame_pred_frame_dct = 1; | |
| 1850 | 2006 s->chroma_format = 1; |
| 1421 | 2007 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
|
2008 avctx->sub_id = 1; /* indicates mpeg1 */ |
|
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2009 s->out_format = FMT_MPEG1; |
|
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2010 s->swap_uv = 0;//AFAIK VCR2 don't have SEQ_HEADER |
| 1672 | 2011 if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1; |
| 2967 | 2012 |
|
1710
4a68b20eeb2c
print vbv buffer size & bitrate when decoding with -debug 1
michael
parents:
1708
diff
changeset
|
2013 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
| 2967 | 2014 av_log(s->avctx, AV_LOG_DEBUG, "vbv buffer: %d, bitrate:%d\n", |
|
1710
4a68b20eeb2c
print vbv buffer size & bitrate when decoding with -debug 1
michael
parents:
1708
diff
changeset
|
2015 s->avctx->rc_buffer_size, s->bit_rate); |
| 2967 | 2016 |
| 0 | 2017 return 0; |
| 2018 } | |
| 2019 | |
| 1376 | 2020 static int vcr2_init_sequence(AVCodecContext *avctx) |
| 2021 { | |
| 2022 Mpeg1Context *s1 = avctx->priv_data; | |
| 2023 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
| 1377 | 2024 int i, v; |
| 1376 | 2025 |
| 2026 /* start new mpeg1 context decoding */ | |
| 2027 s->out_format = FMT_MPEG1; | |
| 2028 if (s1->mpeg_enc_ctx_allocated) { | |
| 2029 MPV_common_end(s); | |
| 2030 } | |
| 2270 | 2031 s->width = avctx->coded_width; |
| 2032 s->height = avctx->coded_height; | |
| 1376 | 2033 avctx->has_b_frames= 0; //true? |
| 1380 | 2034 s->low_delay= 1; |
| 1381 | 2035 |
| 1821 | 2036 if(avctx->xvmc_acceleration){ |
| 2037 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_xvmc_mpg2_420); | |
| 2038 }else{ | |
| 2039 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_420); | |
| 2040 } | |
| 2041 | |
| 1381 | 2042 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
|
2043 if( avctx->idct_algo == FF_IDCT_AUTO ) |
|
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2044 avctx->idct_algo = FF_IDCT_SIMPLE; |
| 2967 | 2045 |
| 1376 | 2046 if (MPV_common_init(s) < 0) |
| 2047 return -1; | |
|
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2048 exchange_uv(s);//common init reset pblocks, so we swap them here |
| 2967 | 2049 s->swap_uv = 1;// in case of xvmc we need to swap uv for each MB |
| 1376 | 2050 s1->mpeg_enc_ctx_allocated = 1; |
| 2051 | |
| 2052 for(i=0;i<64;i++) { | |
| 2053 int j= s->dsp.idct_permutation[i]; | |
| 2054 v = ff_mpeg1_default_intra_matrix[i]; | |
| 2055 s->intra_matrix[j] = v; | |
| 2056 s->chroma_intra_matrix[j] = v; | |
| 2057 | |
| 2058 v = ff_mpeg1_default_non_intra_matrix[i]; | |
| 2059 s->inter_matrix[j] = v; | |
| 2060 s->chroma_inter_matrix[j] = v; | |
| 2061 } | |
| 2062 | |
| 2063 s->progressive_sequence = 1; | |
| 2064 s->progressive_frame = 1; | |
| 2065 s->picture_structure = PICT_FRAME; | |
| 2066 s->frame_pred_frame_dct = 1; | |
| 1850 | 2067 s->chroma_format = 1; |
| 1421 | 2068 s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO; |
| 1377 | 2069 avctx->sub_id = 2; /* indicates mpeg2 */ |
| 1376 | 2070 return 0; |
| 2071 } | |
| 2072 | |
| 2073 | |
| 2967 | 2074 static void mpeg_decode_user_data(AVCodecContext *avctx, |
| 1084 | 2075 const uint8_t *buf, int buf_size) |
| 2076 { | |
| 2077 const uint8_t *p; | |
| 2078 int len, flags; | |
| 2079 p = buf; | |
| 2080 len = buf_size; | |
| 2081 | |
| 2082 /* we parse the DTG active format information */ | |
| 2083 if (len >= 5 && | |
| 2084 p[0] == 'D' && p[1] == 'T' && p[2] == 'G' && p[3] == '1') { | |
| 2085 flags = p[4]; | |
| 2086 p += 5; | |
| 2087 len -= 5; | |
| 2088 if (flags & 0x80) { | |
| 2089 /* skip event id */ | |
| 2090 if (len < 2) | |
| 2091 return; | |
| 2092 p += 2; | |
| 2093 len -= 2; | |
| 2094 } | |
| 2095 if (flags & 0x40) { | |
| 2096 if (len < 1) | |
| 2097 return; | |
| 2098 avctx->dtg_active_format = p[0] & 0x0f; | |
| 2099 } | |
| 2100 } | |
| 2101 } | |
| 2102 | |
| 2967 | 2103 static void mpeg_decode_gop(AVCodecContext *avctx, |
|
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2104 const uint8_t *buf, int buf_size){ |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2105 Mpeg1Context *s1 = avctx->priv_data; |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2106 MpegEncContext *s = &s1->mpeg_enc_ctx; |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2107 |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2108 int drop_frame_flag; |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2109 int time_code_hours, time_code_minutes; |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2110 int time_code_seconds, time_code_pictures; |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2111 int broken_link; |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2112 |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2113 init_get_bits(&s->gb, buf, buf_size*8); |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2114 |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2115 drop_frame_flag = get_bits1(&s->gb); |
| 2967 | 2116 |
|
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2117 time_code_hours=get_bits(&s->gb,5); |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2118 time_code_minutes = get_bits(&s->gb,6); |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2119 skip_bits1(&s->gb);//marker bit |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2120 time_code_seconds = get_bits(&s->gb,6); |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2121 time_code_pictures = get_bits(&s->gb,6); |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2122 |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2123 /*broken_link indicate that after editing the |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2124 reference frames of the first B-Frames after GOP I-Frame |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2125 are missing (open gop)*/ |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2126 broken_link = get_bits1(&s->gb); |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2127 |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2128 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
|
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2129 av_log(s->avctx, AV_LOG_DEBUG, "GOP (%2d:%02d:%02d.[%02d]) broken_link=%d\n", |
| 2979 | 2130 time_code_hours, time_code_minutes, time_code_seconds, |
| 2131 time_code_pictures, broken_link); | |
|
1890
a07406ac4725
mpeg12 fix 10l of aspect calucalations, return gop perser to print debug info, and make mpeg1_seq_header hot overwrite height/width
iive
parents:
1888
diff
changeset
|
2132 } |
| 1211 | 2133 /** |
| 2134 * finds the end of the current frame in the bitstream. | |
| 2135 * @return the position of the first byte of the next frame, or -1 | |
| 2136 */ | |
|
4916
13ef168891b0
add a ff_ prefix to the now exported mpeg1_find_frame_end() function
aurel
parents:
4915
diff
changeset
|
2137 int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size) |
| 1988 | 2138 { |
| 1211 | 2139 int i; |
| 3086 | 2140 uint32_t state= pc->state; |
| 2967 | 2141 |
| 1211 | 2142 i=0; |
| 2143 if(!pc->frame_start_found){ | |
| 2144 for(i=0; i<buf_size; i++){ | |
| 3086 | 2145 i= ff_find_start_code(buf+i, buf+buf_size, &state) - buf - 1; |
| 1211 | 2146 if(state >= SLICE_MIN_START_CODE && state <= SLICE_MAX_START_CODE){ |
| 2147 i++; | |
| 2148 pc->frame_start_found=1; | |
| 2149 break; | |
| 2150 } | |
| 2151 } | |
| 2152 } | |
| 2967 | 2153 |
| 1211 | 2154 if(pc->frame_start_found){ |
| 1988 | 2155 /* EOF considered as end of frame */ |
| 2156 if (buf_size == 0) | |
| 2157 return 0; | |
| 1211 | 2158 for(; i<buf_size; i++){ |
| 3086 | 2159 i= ff_find_start_code(buf+i, buf+buf_size, &state) - buf - 1; |
| 1211 | 2160 if((state&0xFFFFFF00) == 0x100){ |
| 2161 if(state < SLICE_MIN_START_CODE || state > SLICE_MAX_START_CODE){ | |
| 2162 pc->frame_start_found=0; | |
| 2967 | 2163 pc->state=-1; |
| 1211 | 2164 return i-3; |
| 2165 } | |
| 2166 } | |
| 2167 } | |
| 2967 | 2168 } |
| 1211 | 2169 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
|
2170 return END_NOT_FOUND; |
| 1211 | 2171 } |
| 2172 | |
| 0 | 2173 /* handle buffering and image synchronisation */ |
| 2967 | 2174 static int mpeg_decode_frame(AVCodecContext *avctx, |
| 0 | 2175 void *data, int *data_size, |
| 1064 | 2176 uint8_t *buf, int buf_size) |
| 0 | 2177 { |
| 2178 Mpeg1Context *s = avctx->priv_data; | |
| 1862 | 2179 const uint8_t *buf_end; |
| 2180 const uint8_t *buf_ptr; | |
| 3776 | 2181 uint32_t start_code; |
| 2182 int ret, input_size; | |
| 925 | 2183 AVFrame *picture = data; |
|
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2184 MpegEncContext *s2 = &s->mpeg_enc_ctx; |
| 4652 | 2185 dprintf(avctx, "fill_buffer\n"); |
| 0 | 2186 |
|
2130
50779a18844c
Avoid segfault on ffmpeg "buffer flush" in mpeg12.c patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
michael
parents:
2111
diff
changeset
|
2187 if (buf_size == 0) { |
| 2979 | 2188 /* special case for last picture */ |
| 2189 if (s2->low_delay==0 && s2->next_picture_ptr) { | |
| 2190 *picture= *(AVFrame*)s2->next_picture_ptr; | |
| 2191 s2->next_picture_ptr= NULL; | |
| 2192 | |
| 2193 *data_size = sizeof(AVFrame); | |
| 2194 } | |
| 0 | 2195 return 0; |
| 2196 } | |
| 2197 | |
| 1211 | 2198 if(s2->flags&CODEC_FLAG_TRUNCATED){ |
|
4916
13ef168891b0
add a ff_ prefix to the now exported mpeg1_find_frame_end() function
aurel
parents:
4915
diff
changeset
|
2199 int next= ff_mpeg1_find_frame_end(&s2->parse_context, buf, buf_size); |
| 2967 | 2200 |
|
4931
0d1cc37d9430
make some parser parameters const to avoid casting const to non-const
aurel
parents:
4916
diff
changeset
|
2201 if( ff_combine_frame(&s2->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0 ) |
| 1211 | 2202 return buf_size; |
| 2967 | 2203 } |
| 2204 | |
| 0 | 2205 buf_ptr = buf; |
| 2206 buf_end = buf + buf_size; | |
|
383
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2207 |
| 2967 | 2208 #if 0 |
| 2209 if (s->repeat_field % 2 == 1) { | |
|
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2210 s->repeat_field++; |
|
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2211 //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
|
2212 // s2->picture_number, s->repeat_field); |
|
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2213 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
|
2214 *data_size = sizeof(AVPicture); |
|
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2215 goto the_end; |
|
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2216 } |
|
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2217 } |
|
383
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2218 #endif |
| 1376 | 2219 |
| 2220 if(s->mpeg_enc_ctx_allocated==0 && avctx->codec_tag == ff_get_fourcc("VCR2")) | |
| 2221 vcr2_init_sequence(avctx); | |
| 2967 | 2222 |
| 1827 | 2223 s->slice_count= 0; |
| 2967 | 2224 |
| 1211 | 2225 for(;;) { |
| 0 | 2226 /* find start next code */ |
| 3086 | 2227 start_code = -1; |
| 2228 buf_ptr = ff_find_start_code(buf_ptr,buf_end, &start_code); | |
| 3776 | 2229 if (start_code > 0x1ff){ |
| 2792 | 2230 if(s2->pict_type != B_TYPE || avctx->skip_frame <= AVDISCARD_DEFAULT){ |
| 1827 | 2231 if(avctx->thread_count > 1){ |
| 2232 int i; | |
| 2233 | |
| 2234 avctx->execute(avctx, slice_decode_thread, (void**)&(s2->thread_context[0]), NULL, s->slice_count); | |
| 2235 for(i=0; i<s->slice_count; i++) | |
| 2236 s2->error_count += s2->thread_context[i]->error_count; | |
| 2237 } | |
| 1484 | 2238 if (slice_end(avctx, picture)) { |
| 1672 | 2239 if(s2->last_picture_ptr || s2->low_delay) //FIXME merge with the stuff in mpeg_decode_slice |
| 1484 | 2240 *data_size = sizeof(AVPicture); |
| 2241 } | |
| 1285 | 2242 } |
| 1220 | 2243 return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index); |
| 0 | 2244 } |
| 2967 | 2245 |
|
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2246 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
|
2247 |
|
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2248 if(avctx->debug & FF_DEBUG_STARTCODE){ |
| 1904 | 2249 av_log(avctx, AV_LOG_DEBUG, "%3X at %zd left %d\n", start_code, buf_ptr-buf, input_size); |
|
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2250 } |
| 1211 | 2251 |
|
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2252 /* prepare data for next start code */ |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2253 switch(start_code) { |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2254 case SEQ_START_CODE: |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2255 mpeg1_decode_sequence(avctx, buf_ptr, |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2256 input_size); |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2257 break; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2258 |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2259 case PICTURE_START_CODE: |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2260 /* we have a complete image : we try to decompress it */ |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2261 mpeg1_decode_picture(avctx, |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2262 buf_ptr, input_size); |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2263 break; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2264 case EXT_START_CODE: |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2265 mpeg_decode_extension(avctx, |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2266 buf_ptr, input_size); |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2267 break; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2268 case USER_START_CODE: |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2269 mpeg_decode_user_data(avctx, |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2270 buf_ptr, input_size); |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2271 break; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2272 case GOP_START_CODE: |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2273 s2->first_field=0; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2274 mpeg_decode_gop(avctx, |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2275 buf_ptr, input_size); |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2276 break; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2277 default: |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2278 if (start_code >= SLICE_MIN_START_CODE && |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2279 start_code <= SLICE_MAX_START_CODE) { |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2280 int mb_y= start_code - SLICE_MIN_START_CODE; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2281 |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2282 if(s2->last_picture_ptr==NULL){ |
| 5127 | 2283 /* Skip B-frames if we do not have reference frames. */ |
|
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2284 if(s2->pict_type==B_TYPE) break; |
| 5127 | 2285 /* Skip P-frames if we do not have reference frame no valid header. */ |
|
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2286 // if(s2->pict_type==P_TYPE && s2->first_field && !s2->first_slice) break; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2287 } |
| 5127 | 2288 /* Skip B-frames if we are in a hurry. */ |
|
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2289 if(avctx->hurry_up && s2->pict_type==B_TYPE) break; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2290 if( (avctx->skip_frame >= AVDISCARD_NONREF && s2->pict_type==B_TYPE) |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2291 ||(avctx->skip_frame >= AVDISCARD_NONKEY && s2->pict_type!=I_TYPE) |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2292 || avctx->skip_frame >= AVDISCARD_ALL) |
| 0 | 2293 break; |
| 5127 | 2294 /* Skip everything if we are in a hurry>=5. */ |
|
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2295 if(avctx->hurry_up>=5) break; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2296 |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2297 if (!s->mpeg_enc_ctx_allocated) break; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2298 |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2299 if(s2->codec_id == CODEC_ID_MPEG2VIDEO){ |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2300 if(mb_y < avctx->skip_top || mb_y >= s2->mb_height - avctx->skip_bottom) |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2301 break; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2302 } |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2303 |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2304 if(s2->first_slice){ |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2305 s2->first_slice=0; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2306 if(mpeg_field_start(s2) < 0) |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2307 return -1; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2308 } |
|
4353
d9cd0e5255d7
fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.mpg and http://sam.zoy.org/zzuf/lol-ffplay.m2v
michael
parents:
4283
diff
changeset
|
2309 if(!s2->current_picture_ptr){ |
| 5129 | 2310 av_log(avctx, AV_LOG_ERROR, "current_picture not initialized\n"); |
|
4353
d9cd0e5255d7
fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.mpg and http://sam.zoy.org/zzuf/lol-ffplay.m2v
michael
parents:
4283
diff
changeset
|
2311 return -1; |
|
d9cd0e5255d7
fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.mpg and http://sam.zoy.org/zzuf/lol-ffplay.m2v
michael
parents:
4283
diff
changeset
|
2312 } |
|
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2313 |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2314 if(avctx->thread_count > 1){ |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2315 int threshold= (s2->mb_height*s->slice_count + avctx->thread_count/2) / avctx->thread_count; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2316 if(threshold <= mb_y){ |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2317 MpegEncContext *thread_context= s2->thread_context[s->slice_count]; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2318 |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2319 thread_context->start_mb_y= mb_y; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2320 thread_context->end_mb_y = s2->mb_height; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2321 if(s->slice_count){ |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2322 s2->thread_context[s->slice_count-1]->end_mb_y= mb_y; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2323 ff_update_duplicate_context(thread_context, s2); |
| 2786 | 2324 } |
|
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2325 init_get_bits(&thread_context->gb, buf_ptr, input_size*8); |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2326 s->slice_count++; |
| 0 | 2327 } |
|
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2328 buf_ptr += 2; //FIXME add minimum num of bytes per slice |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2329 }else{ |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2330 ret = mpeg_decode_slice(s, mb_y, &buf_ptr, input_size); |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2331 emms_c(); |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2332 |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2333 if(ret < 0){ |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2334 if(s2->resync_mb_x>=0 && s2->resync_mb_y>=0) |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2335 ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x, s2->mb_y, AC_ERROR|DC_ERROR|MV_ERROR); |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2336 }else{ |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2337 ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x-1, s2->mb_y, AC_END|DC_END|MV_END); |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2338 } |
| 0 | 2339 } |
|
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2340 } |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2341 break; |
|
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2342 } |
| 0 | 2343 } |
| 2344 } | |
| 2345 | |
| 2346 static int mpeg_decode_end(AVCodecContext *avctx) | |
| 2347 { | |
| 2348 Mpeg1Context *s = avctx->priv_data; | |
| 2349 | |
| 2350 if (s->mpeg_enc_ctx_allocated) | |
| 2351 MPV_common_end(&s->mpeg_enc_ctx); | |
| 2352 return 0; | |
| 2353 } | |
| 2354 | |
| 1423 | 2355 AVCodec mpeg1video_decoder = { |
| 2356 "mpeg1video", | |
| 0 | 2357 CODEC_TYPE_VIDEO, |
| 2358 CODEC_ID_MPEG1VIDEO, | |
| 2359 sizeof(Mpeg1Context), | |
| 2360 mpeg_decode_init, | |
| 2361 NULL, | |
| 2362 mpeg_decode_end, | |
| 2363 mpeg_decode_frame, | |
| 2453 | 2364 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
| 1368 | 2365 .flush= ff_mpeg_flush, |
| 0 | 2366 }; |
| 1381 | 2367 |
| 1423 | 2368 AVCodec mpeg2video_decoder = { |
| 2369 "mpeg2video", | |
| 2370 CODEC_TYPE_VIDEO, | |
| 2371 CODEC_ID_MPEG2VIDEO, | |
| 2372 sizeof(Mpeg1Context), | |
| 2373 mpeg_decode_init, | |
| 2374 NULL, | |
| 2375 mpeg_decode_end, | |
| 2376 mpeg_decode_frame, | |
| 2453 | 2377 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
| 1423 | 2378 .flush= ff_mpeg_flush, |
| 2379 }; | |
| 2380 | |
| 1615 | 2381 //legacy decoder |
| 2382 AVCodec mpegvideo_decoder = { | |
| 2383 "mpegvideo", | |
| 2384 CODEC_TYPE_VIDEO, | |
| 2385 CODEC_ID_MPEG2VIDEO, | |
| 2386 sizeof(Mpeg1Context), | |
| 2387 mpeg_decode_init, | |
| 2388 NULL, | |
| 2389 mpeg_decode_end, | |
| 2390 mpeg_decode_frame, | |
| 2453 | 2391 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
| 1615 | 2392 .flush= ff_mpeg_flush, |
| 2393 }; | |
| 2394 | |
| 1381 | 2395 #ifdef HAVE_XVMC |
| 2396 static int mpeg_mc_decode_init(AVCodecContext *avctx){ | |
| 2397 Mpeg1Context *s; | |
| 2398 | |
| 2967 | 2399 if( avctx->thread_count > 1) |
| 2076 | 2400 return -1; |
| 1381 | 2401 if( !(avctx->slice_flags & SLICE_FLAG_CODED_ORDER) ) |
| 2402 return -1; | |
|
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2403 if( !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD) ){ |
| 4652 | 2404 dprintf(avctx, "mpeg12.c: XvMC decoder will work better if SLICE_FLAG_ALLOW_FIELD is set\n"); |
|
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2405 } |
| 1381 | 2406 mpeg_decode_init(avctx); |
| 2407 s = avctx->priv_data; | |
| 2408 | |
| 2409 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
|
2410 avctx->xvmc_acceleration = 2;//2 - the blocks are packed! |
| 1381 | 2411 |
| 2412 return 0; | |
| 2413 } | |
| 2414 | |
| 2415 AVCodec mpeg_xvmc_decoder = { | |
| 2416 "mpegvideo_xvmc", | |
| 2417 CODEC_TYPE_VIDEO, | |
| 2418 CODEC_ID_MPEG2VIDEO_XVMC, | |
| 2419 sizeof(Mpeg1Context), | |
| 2420 mpeg_mc_decode_init, | |
| 2421 NULL, | |
| 2422 mpeg_decode_end, | |
| 2423 mpeg_decode_frame, | |
| 2453 | 2424 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED| CODEC_CAP_HWACCEL | CODEC_CAP_DELAY, |
|
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1841
diff
changeset
|
2425 .flush= ff_mpeg_flush, |
| 1381 | 2426 }; |
| 2427 | |
| 2428 #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
|
2429 |
| 2967 | 2430 /* this is ugly i know, but the alternative is too make |
|
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
2431 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
|
2432 which is far uglier. */ |
| 2967 | 2433 #include "mdec.c" |
