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