Mercurial > libavcodec.hg
annotate mpeg12.c @ 7654:999b818c33cc libavcodec
Mention cut-off freq of ff_acelp_high_pass_filter() instead of some
meaningless input dependent value.
author | michael |
---|---|
date | Thu, 21 Aug 2008 23:39:52 +0000 |
parents | d6390123201d |
children | 53fb5eb360d5 |
rev | line source |
---|---|
0 | 1 /* |
7629 | 2 * MPEG-1/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 | |
7629 | 25 * MPEG-1/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 | |
7630
d6390123201d
Rename ff_init_vlcs function to the more descriptive name ff_mpeg12_init_vlcs.
diego
parents:
7629
diff
changeset
|
151 av_cold void ff_mpeg12_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 | |
7629 | 206 /* motion type (for MPEG-2) */ |
0 | 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 | |
7629 | 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 |
7629 | 286 /* compute DCT type */ |
287 if (s->picture_structure == PICT_FRAME && //FIXME add an interlaced_dct coded var? | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead 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 |
7629 | 310 //if 1, we memcpy blocks in xvmcvideo |
1580
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]); |
7629 | 390 /* full_pel: only for MPEG-1 */ |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
391 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 |
7629 | 523 //if 1, we memcpy blocks in xvmcvideo |
1580
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 | |
7629 | 588 /* as H.263, but only 17 codes */ |
0 | 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 |
7629 | 630 /* DC coefficient */ |
711 | 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); |
7629 | 643 /* now quantify & encode AC coefficients */ |
711 | 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; |
7629 | 705 // special case for first coefficient, no need to add 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 |
7629 | 721 /* now quantify & encode AC coefficients */ |
711 | 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; |
7629 | 787 // special case for first coefficient, no need to add second VLC table |
2202
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 |
7629 | 804 /* now quantify & encode AC coefficients */ |
2202
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 |
7629 | 878 // special case for first coefficient, no need to add 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 |
7629 | 895 /* now quantify & encode AC coefficients */ |
714 | 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 | |
7629 | 957 // special case for first coefficient, no need to add second VLC table |
2201 | 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 |
7629 | 973 /* now quantify & encode AC coefficients */ |
2201 | 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 | |
7629 | 1029 /* DC coefficient */ |
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); |
7629 | 1054 /* now quantify & encode AC coefficients */ |
714 | 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 | |
7629 | 1108 /* DC coefficient */ |
2622 | 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); |
7629 | 1130 /* now quantify & encode AC coefficients */ |
2622 | 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 |
7629 | 1186 /* we need some permutation to store matrices, |
1187 * until MPV_common_init() sets the real permutation. */ | |
1990 | 1188 for(i=0;i<64;i++) |
1189 s2->dsp.idct_permutation[i]=i; | |
1190 | |
1892 | 1191 MPV_decode_defaults(s2); |
2967 | 1192 |
1732
f716b8f47d98
uninitalized variables fix by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
1728
diff
changeset
|
1193 s->mpeg_enc_ctx.avctx= avctx; |
558 | 1194 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
|
1195 s->mpeg_enc_ctx.flags2= avctx->flags2; |
5210 | 1196 ff_mpeg12_common_init(&s->mpeg_enc_ctx); |
7630
d6390123201d
Rename ff_init_vlcs function to the more descriptive name ff_mpeg12_init_vlcs.
diego
parents:
7629
diff
changeset
|
1197 ff_mpeg12_init_vlcs(); |
0 | 1198 |
1199 s->mpeg_enc_ctx_allocated = 0; | |
1200 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
|
1201 s->repeat_field = 0; |
344 | 1202 s->mpeg_enc_ctx.codec_id= avctx->codec->id; |
0 | 1203 return 0; |
1204 } | |
1205 | |
2967 | 1206 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
|
1207 const uint8_t *new_perm){ |
2219 | 1208 uint16_t temp_matrix[64]; |
1209 int i; | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1210 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1211 memcpy(temp_matrix,matrix,64*sizeof(uint16_t)); |
2967 | 1212 |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1213 for(i=0;i<64;i++){ |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1214 matrix[new_perm[i]] = temp_matrix[old_perm[i]]; |
2967 | 1215 } |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1216 } |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1217 |
7629 | 1218 /* Call this function when we know all parameters. |
1219 * It may be called in different places for MPEG-1 and MPEG-2. */ | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1220 static int mpeg_decode_postinit(AVCodecContext *avctx){ |
2219 | 1221 Mpeg1Context *s1 = avctx->priv_data; |
1222 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
1223 uint8_t old_permutation[64]; | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1224 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1225 if ( |
2979 | 1226 (s1->mpeg_enc_ctx_allocated == 0)|| |
2270 | 1227 avctx->coded_width != s->width || |
1228 avctx->coded_height != s->height|| | |
4888
185f5e4feb72
make mpeg decoder handle mid-stream changes in resolution
benoit
parents:
4795
diff
changeset
|
1229 s1->save_width != s->width || |
185f5e4feb72
make mpeg decoder handle mid-stream changes in resolution
benoit
parents:
4795
diff
changeset
|
1230 s1->save_height != s->height || |
2590 | 1231 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
|
1232 0) |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1233 { |
2967 | 1234 |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1235 if (s1->mpeg_enc_ctx_allocated) { |
2681 | 1236 ParseContext pc= s->parse_context; |
1237 s->parse_context.buffer=0; | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1238 MPV_common_end(s); |
2681 | 1239 s->parse_context= pc; |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1240 } |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1241 |
2979 | 1242 if( (s->width == 0 )||(s->height == 0)) |
1243 return -2; | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1244 |
2270 | 1245 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
|
1246 avctx->bit_rate = s->bit_rate; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1247 s1->save_aspect_info = s->aspect_ratio_info; |
4888
185f5e4feb72
make mpeg decoder handle mid-stream changes in resolution
benoit
parents:
4795
diff
changeset
|
1248 s1->save_width = s->width; |
185f5e4feb72
make mpeg decoder handle mid-stream changes in resolution
benoit
parents:
4795
diff
changeset
|
1249 s1->save_height = s->height; |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1250 |
7629 | 1251 /* low_delay may be forced, in this case we will have B-frames |
1252 * that behave like P-frames. */ | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1253 avctx->has_b_frames = !(s->low_delay); |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1254 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1255 if(avctx->sub_id==1){//s->codec_id==avctx->codec_id==CODEC_ID |
7629 | 1256 //MPEG-1 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
|
1257 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
|
1258 avctx->time_base.num= ff_frame_rate_tab[s->frame_rate_index].den; |
7629 | 1259 //MPEG-1 aspect |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1260 avctx->sample_aspect_ratio= av_d2q( |
5210 | 1261 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
|
1262 |
7629 | 1263 }else{//MPEG-2 |
1264 //MPEG-2 fps | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1265 av_reduce( |
2967 | 1266 &s->avctx->time_base.den, |
1267 &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
|
1268 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
|
1269 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
|
1270 1<<30); |
7629 | 1271 //MPEG-2 aspect |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1272 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
|
1273 if( (s1->pan_scan.width == 0 )||(s1->pan_scan.height == 0) ){ |
2967 | 1274 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
|
1275 av_div_q( |
5210 | 1276 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
|
1277 (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
|
1278 ); |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1279 }else{ |
2967 | 1280 s->avctx->sample_aspect_ratio= |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1281 av_div_q( |
5210 | 1282 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
|
1283 (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
|
1284 ); |
2979 | 1285 } |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1286 }else{ |
2967 | 1287 s->avctx->sample_aspect_ratio= |
5210 | 1288 ff_mpeg2_aspect[s->aspect_ratio_info]; |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1289 } |
7629 | 1290 }//MPEG-2 |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1291 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1292 if(avctx->xvmc_acceleration){ |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1293 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
|
1294 }else{ |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1295 if(s->chroma_format < 2){ |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1296 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
|
1297 }else |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1298 if(s->chroma_format == 2){ |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1299 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
|
1300 }else |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1301 if(s->chroma_format > 2){ |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1302 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
|
1303 } |
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 //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
|
1306 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
|
1307 if( avctx->idct_algo == FF_IDCT_AUTO ) |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1308 avctx->idct_algo = FF_IDCT_SIMPLE; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1309 |
7629 | 1310 /* Quantization matrices may need reordering |
1311 * if DCT permutation is changed. */ | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1312 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
|
1313 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1314 if (MPV_common_init(s) < 0) |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1315 return -2; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1316 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1317 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
|
1318 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
|
1319 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
|
1320 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
|
1321 |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1322 s1->mpeg_enc_ctx_allocated = 1; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1323 } |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1324 return 0; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1325 } |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1326 |
2967 | 1327 static int mpeg1_decode_picture(AVCodecContext *avctx, |
1862 | 1328 const uint8_t *buf, int buf_size) |
0 | 1329 { |
1330 Mpeg1Context *s1 = avctx->priv_data; | |
1331 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
1697 | 1332 int ref, f_code, vbv_delay; |
0 | 1333 |
2967 | 1334 if(mpeg_decode_postinit(s->avctx) < 0) |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1335 return -2; |
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1336 |
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
|
1337 init_get_bits(&s->gb, buf, buf_size*8); |
0 | 1338 |
1339 ref = get_bits(&s->gb, 10); /* temporal ref */ | |
1340 s->pict_type = get_bits(&s->gb, 3); | |
2575 | 1341 if(s->pict_type == 0 || s->pict_type > 3) |
1342 return -1; | |
872 | 1343 |
1697 | 1344 vbv_delay= get_bits(&s->gb, 16); |
6481 | 1345 if (s->pict_type == FF_P_TYPE || s->pict_type == FF_B_TYPE) { |
21 | 1346 s->full_pel[0] = get_bits1(&s->gb); |
0 | 1347 f_code = get_bits(&s->gb, 3); |
2786 | 1348 if (f_code == 0 && avctx->error_resilience >= FF_ER_COMPLIANT) |
0 | 1349 return -1; |
1350 s->mpeg_f_code[0][0] = f_code; | |
1351 s->mpeg_f_code[0][1] = f_code; | |
1352 } | |
6481 | 1353 if (s->pict_type == FF_B_TYPE) { |
21 | 1354 s->full_pel[1] = get_bits1(&s->gb); |
0 | 1355 f_code = get_bits(&s->gb, 3); |
2786 | 1356 if (f_code == 0 && avctx->error_resilience >= FF_ER_COMPLIANT) |
0 | 1357 return -1; |
1358 s->mpeg_f_code[1][0] = f_code; | |
1359 s->mpeg_f_code[1][1] = f_code; | |
1360 } | |
903 | 1361 s->current_picture.pict_type= s->pict_type; |
6481 | 1362 s->current_picture.key_frame= s->pict_type == FF_I_TYPE; |
2967 | 1363 |
2575 | 1364 if(avctx->debug & FF_DEBUG_PICT_INFO) |
1365 av_log(avctx, AV_LOG_DEBUG, "vbv_delay %d, ref %d type:%d\n", vbv_delay, ref, s->pict_type); | |
2967 | 1366 |
0 | 1367 s->y_dc_scale = 8; |
1368 s->c_dc_scale = 8; | |
1369 s->first_slice = 1; | |
1370 return 0; | |
1371 } | |
1372 | |
2219 | 1373 static void mpeg_decode_sequence_extension(Mpeg1Context *s1) |
0 | 1374 { |
2219 | 1375 MpegEncContext *s= &s1->mpeg_enc_ctx; |
0 | 1376 int horiz_size_ext, vert_size_ext; |
1721 | 1377 int bit_rate_ext; |
0 | 1378 |
7629 | 1379 skip_bits(&s->gb, 1); /* profile and level esc*/ |
2167 | 1380 s->avctx->profile= get_bits(&s->gb, 3); |
1381 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
|
1382 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
|
1383 s->chroma_format = get_bits(&s->gb, 2); /* chroma_format 1=420, 2=422, 3=444 */ |
0 | 1384 horiz_size_ext = get_bits(&s->gb, 2); |
1385 vert_size_ext = get_bits(&s->gb, 2); | |
1386 s->width |= (horiz_size_ext << 12); | |
1387 s->height |= (vert_size_ext << 12); | |
1388 bit_rate_ext = get_bits(&s->gb, 12); /* XXX: handle it */ | |
2540 | 1389 s->bit_rate += (bit_rate_ext << 18) * 400; |
21 | 1390 skip_bits1(&s->gb); /* marker */ |
1710
4a68b20eeb2c
print vbv buffer size & bitrate when decoding with -debug 1
michael
parents:
1708
diff
changeset
|
1391 s->avctx->rc_buffer_size += get_bits(&s->gb, 8)*1024*16<<10; |
1346 | 1392 |
917 | 1393 s->low_delay = get_bits1(&s->gb); |
1346 | 1394 if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1; |
1395 | |
2219 | 1396 s1->frame_rate_ext.num = get_bits(&s->gb, 2)+1; |
1397 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
|
1398 |
4652 | 1399 dprintf(s->avctx, "sequence extension\n"); |
1421 | 1400 s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO; |
7629 | 1401 s->avctx->sub_id = 2; /* indicates MPEG-2 found */ |
917 | 1402 |
1421 | 1403 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
2967 | 1404 av_log(s->avctx, AV_LOG_DEBUG, "profile: %d, level: %d vbv buffer: %d, bitrate:%d\n", |
2167 | 1405 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
|
1406 |
0 | 1407 } |
1408 | |
1546 | 1409 static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) |
1410 { | |
1411 MpegEncContext *s= &s1->mpeg_enc_ctx; | |
1412 int color_description, w, h; | |
1413 | |
1414 skip_bits(&s->gb, 3); /* video format */ | |
1415 color_description= get_bits1(&s->gb); | |
1416 if(color_description){ | |
1417 skip_bits(&s->gb, 8); /* color primaries */ | |
1418 skip_bits(&s->gb, 8); /* transfer_characteristics */ | |
1419 skip_bits(&s->gb, 8); /* matrix_coefficients */ | |
1420 } | |
1421 w= get_bits(&s->gb, 14); | |
1422 skip_bits(&s->gb, 1); //marker | |
1423 h= get_bits(&s->gb, 14); | |
1424 skip_bits(&s->gb, 1); //marker | |
2967 | 1425 |
1546 | 1426 s1->pan_scan.width= 16*w; |
1427 s1->pan_scan.height=16*h; | |
2967 | 1428 |
1546 | 1429 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
|
1430 av_log(s->avctx, AV_LOG_DEBUG, "sde w:%d, h:%d\n", w, h); |
1546 | 1431 } |
1432 | |
1433 static void mpeg_decode_picture_display_extension(Mpeg1Context *s1) | |
1434 { | |
1435 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
|
1436 int i,nofco; |
1546 | 1437 |
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1438 nofco = 1; |
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1439 if(s->progressive_sequence){ |
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1440 if(s->repeat_first_field){ |
2979 | 1441 nofco++; |
1442 if(s->top_field_first) | |
1443 nofco++; | |
1444 } | |
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1445 }else{ |
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1446 if(s->picture_structure == PICT_FRAME){ |
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1447 nofco++; |
2979 | 1448 if(s->repeat_first_field) |
1449 nofco++; | |
1450 } | |
1891
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1451 } |
f403b3e286b3
use pan_scan to remove some weight, proper pan_scan offset reading
iive
parents:
1890
diff
changeset
|
1452 for(i=0; i<nofco; i++){ |
1546 | 1453 s1->pan_scan.position[i][0]= get_sbits(&s->gb, 16); |
1454 skip_bits(&s->gb, 1); //marker | |
1455 s1->pan_scan.position[i][1]= get_sbits(&s->gb, 16); | |
1456 skip_bits(&s->gb, 1); //marker | |
1457 } | |
2967 | 1458 |
1546 | 1459 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
2967 | 1460 av_log(s->avctx, AV_LOG_DEBUG, "pde (%d,%d) (%d,%d) (%d,%d)\n", |
1461 s1->pan_scan.position[0][0], s1->pan_scan.position[0][1], | |
1462 s1->pan_scan.position[1][0], s1->pan_scan.position[1][1], | |
1546 | 1463 s1->pan_scan.position[2][0], s1->pan_scan.position[2][1] |
1464 ); | |
1465 } | |
1466 | |
0 | 1467 static void mpeg_decode_quant_matrix_extension(MpegEncContext *s) |
1468 { | |
38
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
1469 int i, v, j; |
0 | 1470 |
4652 | 1471 dprintf(s->avctx, "matrix extension\n"); |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1472 |
21 | 1473 if (get_bits1(&s->gb)) { |
0 | 1474 for(i=0;i<64;i++) { |
1475 v = get_bits(&s->gb, 8); | |
1092 | 1476 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
|
1477 s->intra_matrix[j] = v; |
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
1478 s->chroma_intra_matrix[j] = v; |
0 | 1479 } |
1480 } | |
21 | 1481 if (get_bits1(&s->gb)) { |
0 | 1482 for(i=0;i<64;i++) { |
1483 v = get_bits(&s->gb, 8); | |
1092 | 1484 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
344 | 1485 s->inter_matrix[j] = v; |
1486 s->chroma_inter_matrix[j] = v; | |
0 | 1487 } |
1488 } | |
21 | 1489 if (get_bits1(&s->gb)) { |
0 | 1490 for(i=0;i<64;i++) { |
1491 v = get_bits(&s->gb, 8); | |
1092 | 1492 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
|
1493 s->chroma_intra_matrix[j] = v; |
0 | 1494 } |
1495 } | |
21 | 1496 if (get_bits1(&s->gb)) { |
0 | 1497 for(i=0;i<64;i++) { |
1498 v = get_bits(&s->gb, 8); | |
1092 | 1499 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
344 | 1500 s->chroma_inter_matrix[j] = v; |
0 | 1501 } |
1502 } | |
1503 } | |
1504 | |
1505 static void mpeg_decode_picture_coding_extension(MpegEncContext *s) | |
1506 { | |
1507 s->full_pel[0] = s->full_pel[1] = 0; | |
1508 s->mpeg_f_code[0][0] = get_bits(&s->gb, 4); | |
1509 s->mpeg_f_code[0][1] = get_bits(&s->gb, 4); | |
1510 s->mpeg_f_code[1][0] = get_bits(&s->gb, 4); | |
1511 s->mpeg_f_code[1][1] = get_bits(&s->gb, 4); | |
1512 s->intra_dc_precision = get_bits(&s->gb, 2); | |
1513 s->picture_structure = get_bits(&s->gb, 2); | |
21 | 1514 s->top_field_first = get_bits1(&s->gb); |
1515 s->frame_pred_frame_dct = get_bits1(&s->gb); | |
1516 s->concealment_motion_vectors = get_bits1(&s->gb); | |
1517 s->q_scale_type = get_bits1(&s->gb); | |
1518 s->intra_vlc_format = get_bits1(&s->gb); | |
1519 s->alternate_scan = get_bits1(&s->gb); | |
1520 s->repeat_first_field = get_bits1(&s->gb); | |
1521 s->chroma_420_type = get_bits1(&s->gb); | |
1522 s->progressive_frame = get_bits1(&s->gb); | |
1708 | 1523 |
4070 | 1524 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
|
1525 s->first_field=0; |
4070 | 1526 s->v_edge_pos= 16*s->mb_height; |
1527 }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
|
1528 s->first_field ^= 1; |
4070 | 1529 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
|
1530 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
|
1531 } |
2967 | 1532 |
715
8b3ccabfce4a
move scantable init from block-decode to header parser
michaelni
parents:
714
diff
changeset
|
1533 if(s->alternate_scan){ |
1273 | 1534 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan); |
1535 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
|
1536 }else{ |
1273 | 1537 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct); |
1538 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
|
1539 } |
2967 | 1540 |
0 | 1541 /* composite display not parsed */ |
4652 | 1542 dprintf(s->avctx, "intra_dc_precision=%d\n", s->intra_dc_precision); |
1543 dprintf(s->avctx, "picture_structure=%d\n", s->picture_structure); | |
1544 dprintf(s->avctx, "top field first=%d\n", s->top_field_first); | |
1545 dprintf(s->avctx, "repeat first field=%d\n", s->repeat_first_field); | |
1546 dprintf(s->avctx, "conceal=%d\n", s->concealment_motion_vectors); | |
1547 dprintf(s->avctx, "intra_vlc_format=%d\n", s->intra_vlc_format); | |
1548 dprintf(s->avctx, "alternate_scan=%d\n", s->alternate_scan); | |
1549 dprintf(s->avctx, "frame_pred_frame_dct=%d\n", s->frame_pred_frame_dct); | |
1550 dprintf(s->avctx, "progressive_frame=%d\n", s->progressive_frame); | |
0 | 1551 } |
1552 | |
2967 | 1553 static void mpeg_decode_extension(AVCodecContext *avctx, |
1862 | 1554 const uint8_t *buf, int buf_size) |
0 | 1555 { |
1556 Mpeg1Context *s1 = avctx->priv_data; | |
1557 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
1558 int ext_type; | |
1559 | |
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
|
1560 init_get_bits(&s->gb, buf, buf_size*8); |
2967 | 1561 |
0 | 1562 ext_type = get_bits(&s->gb, 4); |
1563 switch(ext_type) { | |
1564 case 0x1: | |
2219 | 1565 mpeg_decode_sequence_extension(s1); |
0 | 1566 break; |
1546 | 1567 case 0x2: |
1568 mpeg_decode_sequence_display_extension(s1); | |
1569 break; | |
0 | 1570 case 0x3: |
1571 mpeg_decode_quant_matrix_extension(s); | |
1572 break; | |
1546 | 1573 case 0x7: |
1574 mpeg_decode_picture_display_extension(s1); | |
1575 break; | |
0 | 1576 case 0x8: |
1577 mpeg_decode_picture_coding_extension(s); | |
1578 break; | |
1579 } | |
1580 } | |
1581 | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1582 static void exchange_uv(MpegEncContext *s){ |
2219 | 1583 short * tmp = s->pblocks[4]; |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1584 s->pblocks[4] = s->pblocks[5]; |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1585 s->pblocks[5] = tmp; |
1380 | 1586 } |
1587 | |
1827 | 1588 static int mpeg_field_start(MpegEncContext *s){ |
1589 AVCodecContext *avctx= s->avctx; | |
1590 Mpeg1Context *s1 = (Mpeg1Context*)s; | |
826 | 1591 |
0 | 1592 /* start frame decoding */ |
1827 | 1593 if(s->first_field || s->picture_structure==PICT_FRAME){ |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
751
diff
changeset
|
1594 if(MPV_frame_start(s, avctx) < 0) |
1827 | 1595 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
|
1596 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead 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 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
|
1598 |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1599 /* first check if we must repeat the frame */ |
1409 | 1600 s->current_picture_ptr->repeat_pict = 0; |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1601 if (s->repeat_first_field) { |
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1602 if (s->progressive_sequence) { |
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1603 if (s->top_field_first) |
1409 | 1604 s->current_picture_ptr->repeat_pict = 4; |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1605 else |
1409 | 1606 s->current_picture_ptr->repeat_pict = 2; |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1607 } else if (s->progressive_frame) { |
1409 | 1608 s->current_picture_ptr->repeat_pict = 1; |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
1609 } |
2967 | 1610 } |
1546 | 1611 |
1612 *s->current_picture_ptr->pan_scan= s1->pan_scan; | |
1827 | 1613 }else{ //second field |
1138 | 1614 int i; |
2967 | 1615 |
1182
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
1616 if(!s->current_picture_ptr){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1617 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
|
1618 return -1; |
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
1619 } |
2967 | 1620 |
1138 | 1621 for(i=0; i<4; i++){ |
1622 s->current_picture.data[i] = s->current_picture_ptr->data[i]; | |
1623 if(s->picture_structure == PICT_BOTTOM_FIELD){ | |
1624 s->current_picture.data[i] += s->current_picture_ptr->linesize[i]; | |
2967 | 1625 } |
1138 | 1626 } |
1827 | 1627 } |
1381 | 1628 #ifdef HAVE_XVMC |
1629 // MPV_frame_start will call this function too, | |
1630 // but we need to call it on every field | |
1827 | 1631 if(s->avctx->xvmc_acceleration) |
1381 | 1632 XVMC_field_start(s,avctx); |
1633 #endif | |
1827 | 1634 |
1635 return 0; | |
1636 } | |
1637 | |
1638 #define DECODE_SLICE_ERROR -1 | |
1639 #define DECODE_SLICE_OK 0 | |
0 | 1640 |
1827 | 1641 /** |
1642 * decodes a slice. MpegEncContext.mb_y must be set to the MB row from the startcode | |
1643 * @return DECODE_SLICE_ERROR if the slice is damaged<br> | |
1644 * DECODE_SLICE_OK if this slice is ok<br> | |
1645 */ | |
1646 static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, | |
1862 | 1647 const uint8_t **buf, int buf_size) |
1827 | 1648 { |
1649 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
1650 AVCodecContext *avctx= s->avctx; | |
1651 const int field_pic= s->picture_structure != PICT_FRAME; | |
2256 | 1652 const int lowres= s->avctx->lowres; |
1827 | 1653 |
1654 s->resync_mb_x= | |
1655 s->resync_mb_y= -1; | |
1656 | |
1953 | 1657 if (mb_y<<field_pic >= s->mb_height){ |
1658 av_log(s->avctx, AV_LOG_ERROR, "slice below image (%d >= %d)\n", mb_y, s->mb_height); | |
1827 | 1659 return -1; |
1660 } | |
2967 | 1661 |
1211 | 1662 init_get_bits(&s->gb, *buf, buf_size*8); |
0 | 1663 |
1827 | 1664 ff_mpeg1_clean_buffers(s); |
1665 s->interlaced_dct = 0; | |
1666 | |
54 | 1667 s->qscale = get_qscale(s); |
1690 | 1668 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1669 if(s->qscale == 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1670 av_log(s->avctx, AV_LOG_ERROR, "qscale == 0\n"); |
1285 | 1671 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
|
1672 } |
2967 | 1673 |
0 | 1674 /* extra slice info */ |
21 | 1675 while (get_bits1(&s->gb) != 0) { |
1676 skip_bits(&s->gb, 8); | |
0 | 1677 } |
2967 | 1678 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1679 s->mb_x=0; |
0 | 1680 |
716 | 1681 for(;;) { |
1682 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
|
1683 if (code < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1684 av_log(s->avctx, AV_LOG_ERROR, "first mb_incr damaged\n"); |
1285 | 1685 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
|
1686 } |
716 | 1687 if (code >= 33) { |
1688 if (code == 33) { | |
1689 s->mb_x += 33; | |
1690 } | |
1691 /* otherwise, stuffing, nothing to do */ | |
1692 } else { | |
1693 s->mb_x += code; | |
1694 break; | |
1695 } | |
1696 } | |
4502
ff5472c81ab8
fix segfault with lol-ffplay2.mpg (dunno if this is exploitable, probably not easily)
michael
parents:
4454
diff
changeset
|
1697 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
|
1698 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
|
1699 return -1; |
ff5472c81ab8
fix segfault with lol-ffplay2.mpg (dunno if this is exploitable, probably not easily)
michael
parents:
4454
diff
changeset
|
1700 } |
1827 | 1701 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1702 s->resync_mb_x= s->mb_x; |
1827 | 1703 s->resync_mb_y= s->mb_y= mb_y; |
1160 | 1704 s->mb_skip_run= 0; |
1389 | 1705 ff_init_block_index(s); |
716 | 1706 |
1827 | 1707 if (s->mb_y==0 && s->mb_x==0 && (s->first_field || s->picture_structure==PICT_FRAME)) { |
1708 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
2967 | 1709 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 | 1710 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 | 1711 s->pict_type == FF_I_TYPE ? "I" : (s->pict_type == FF_P_TYPE ? "P" : (s->pict_type == FF_B_TYPE ? "B" : "S")), |
2967 | 1712 s->progressive_sequence ? "ps" :"", s->progressive_frame ? "pf" : "", s->alternate_scan ? "alt" :"", s->top_field_first ? "top" :"", |
1827 | 1713 s->intra_dc_precision, s->picture_structure, s->frame_pred_frame_dct, s->concealment_motion_vectors, |
1714 s->q_scale_type, s->intra_vlc_format, s->repeat_first_field, s->chroma_420_type ? "420" :""); | |
1715 } | |
2967 | 1716 } |
1717 | |
0 | 1718 for(;;) { |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1719 #ifdef HAVE_XVMC |
7629 | 1720 //If 1, we memcpy blocks in xvmcvideo. |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1721 if(s->avctx->xvmc_acceleration > 1) |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1722 XVMC_init_block(s);//set s->block |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1723 #endif |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1724 |
5431 | 1725 if(mpeg_decode_mb(s, s->block) < 0) |
0 | 1726 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
|
1727 |
1692 | 1728 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
|
1729 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
|
1730 int xy = s->mb_x*2 + s->mb_y*2*wrap; |
1841 | 1731 int motion_x, motion_y, dir, i; |
1692 | 1732 if(field_pic && !s->first_field) |
1733 xy += wrap/2; | |
1734 | |
1852 | 1735 for(i=0; i<2; i++){ |
1736 for(dir=0; dir<2; dir++){ | |
6481 | 1737 if (s->mb_intra || (dir==1 && s->pict_type != FF_B_TYPE)) { |
1841 | 1738 motion_x = motion_y = 0; |
1946 | 1739 }else if (s->mv_type == MV_TYPE_16X16 || (s->mv_type == MV_TYPE_FIELD && field_pic)){ |
1841 | 1740 motion_x = s->mv[dir][0][0]; |
1741 motion_y = s->mv[dir][0][1]; | |
1742 } else /*if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8))*/ { | |
1743 motion_x = s->mv[dir][i][0]; | |
1744 motion_y = s->mv[dir][i][1]; | |
1745 } | |
1948 | 1746 |
1841 | 1747 s->current_picture.motion_val[dir][xy ][0] = motion_x; |
1748 s->current_picture.motion_val[dir][xy ][1] = motion_y; | |
1749 s->current_picture.motion_val[dir][xy + 1][0] = motion_x; | |
1750 s->current_picture.motion_val[dir][xy + 1][1] = motion_y; | |
1948 | 1751 s->current_picture.ref_index [dir][xy ]= |
1752 s->current_picture.ref_index [dir][xy + 1]= s->field_select[dir][i]; | |
2670 | 1753 assert(s->field_select[dir][i]==0 || s->field_select[dir][i]==1); |
1841 | 1754 } |
1852 | 1755 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
|
1756 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead 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 } |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
1758 |
2256 | 1759 s->dest[0] += 16 >> lowres; |
5430 | 1760 s->dest[1] +=(16 >> lowres) >> s->chroma_x_shift; |
1761 s->dest[2] +=(16 >> lowres) >> s->chroma_x_shift; | |
1389 | 1762 |
716 | 1763 MPV_decode_mb(s, s->block); |
2967 | 1764 |
716 | 1765 if (++s->mb_x >= s->mb_width) { |
2261 | 1766 const int mb_size= 16>>s->avctx->lowres; |
1380 | 1767 |
2261 | 1768 ff_draw_horiz_band(s, mb_size*s->mb_y, mb_size); |
716 | 1769 |
1770 s->mb_x = 0; | |
1771 s->mb_y++; | |
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
1772 |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
1773 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
|
1774 int left= s->gb.size_in_bits - get_bits_count(&s->gb); |
6481 | 1775 int is_d10= s->chroma_format==2 && s->pict_type==FF_I_TYPE && avctx->profile==0 && avctx->level==5 |
3287 | 1776 && s->intra_dc_precision == 2 && s->q_scale_type == 1 && s->alternate_scan == 0 |
1777 && s->progressive_frame == 0 /* vbv_delay == 0xBBB || 0xE10*/; | |
1778 | |
1779 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
|
1780 || (avctx->error_resilience >= FF_ER_AGGRESSIVE && left>8)){ |
3287 | 1781 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
|
1782 return -1; |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
1783 }else |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
1784 goto eos; |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
1785 } |
2967 | 1786 |
1389 | 1787 ff_init_block_index(s); |
716 | 1788 } |
1789 | |
1790 /* skip mb handling */ | |
1160 | 1791 if (s->mb_skip_run == -1) { |
7629 | 1792 /* read increment again */ |
1160 | 1793 s->mb_skip_run = 0; |
716 | 1794 for(;;) { |
1795 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
|
1796 if (code < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1797 av_log(s->avctx, AV_LOG_ERROR, "mb incr damaged\n"); |
1181 | 1798 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
|
1799 } |
716 | 1800 if (code >= 33) { |
1801 if (code == 33) { | |
1160 | 1802 s->mb_skip_run += 33; |
1181 | 1803 }else if(code == 35){ |
1804 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
|
1805 av_log(s->avctx, AV_LOG_ERROR, "slice mismatch\n"); |
1181 | 1806 return -1; |
1807 } | |
1808 goto eos; /* end of slice */ | |
716 | 1809 } |
1810 /* otherwise, stuffing, nothing to do */ | |
1811 } else { | |
1160 | 1812 s->mb_skip_run += code; |
716 | 1813 break; |
1814 } | |
1815 } | |
5432
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1816 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
|
1817 int i; |
6481 | 1818 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
|
1819 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
|
1820 return -1; |
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1821 } |
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 /* skip mb */ |
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1824 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
|
1825 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
|
1826 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
|
1827 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
|
1828 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
|
1829 else |
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1830 s->mv_type = MV_TYPE_FIELD; |
6481 | 1831 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
|
1832 /* 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
|
1833 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
|
1834 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
|
1835 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
|
1836 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
|
1837 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
|
1838 } else { |
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1839 /* 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
|
1840 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
|
1841 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
|
1842 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
|
1843 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
|
1844 } |
e0624692025f
move some code which was executed for every skipped MB so it is only executed
michael
parents:
5431
diff
changeset
|
1845 } |
716 | 1846 } |
0 | 1847 } |
1285 | 1848 eos: // end of slice |
6372 | 1849 *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
|
1850 //printf("y %d %d %d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y); |
1285 | 1851 return 0; |
1852 } | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1853 |
1827 | 1854 static int slice_decode_thread(AVCodecContext *c, void *arg){ |
1855 MpegEncContext *s= arg; | |
1861 | 1856 const uint8_t *buf= s->gb.buffer; |
1827 | 1857 int mb_y= s->start_mb_y; |
1858 | |
1859 s->error_count= 3*(s->end_mb_y - s->start_mb_y)*s->mb_width; | |
1860 | |
1861 for(;;){ | |
3776 | 1862 uint32_t start_code; |
1863 int ret; | |
1827 | 1864 |
1865 ret= mpeg_decode_slice((Mpeg1Context*)s, mb_y, &buf, s->gb.buffer_end - buf); | |
1866 emms_c(); | |
2967 | 1867 //av_log(c, AV_LOG_DEBUG, "ret:%d resync:%d/%d mb:%d/%d ts:%d/%d ec:%d\n", |
1827 | 1868 //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); |
1869 if(ret < 0){ | |
1870 if(s->resync_mb_x>=0 && s->resync_mb_y>=0) | |
1871 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); | |
1872 }else{ | |
1873 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); | |
1874 } | |
2967 | 1875 |
1827 | 1876 if(s->mb_y == s->end_mb_y) |
1877 return 0; | |
2967 | 1878 |
3086 | 1879 start_code= -1; |
1880 buf = ff_find_start_code(buf, s->gb.buffer_end, &start_code); | |
1827 | 1881 mb_y= start_code - SLICE_MIN_START_CODE; |
1882 if(mb_y < 0 || mb_y >= s->end_mb_y) | |
1883 return -1; | |
1884 } | |
2967 | 1885 |
1827 | 1886 return 0; //not reached |
1887 } | |
1888 | |
1285 | 1889 /** |
7629 | 1890 * Handles slice ends. |
1891 * @return 1 if it seems to be the last slice | |
1285 | 1892 */ |
1893 static int slice_end(AVCodecContext *avctx, AVFrame *pict) | |
1894 { | |
1895 Mpeg1Context *s1 = avctx->priv_data; | |
1896 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
2967 | 1897 |
1402
f662e9c86cf2
* fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents:
1389
diff
changeset
|
1898 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
|
1899 return 0; |
fc858abf6b10
fixed segfault if sequence header has not been found before slice decoding
bellard
parents:
1289
diff
changeset
|
1900 |
1381 | 1901 #ifdef HAVE_XVMC |
1902 if(s->avctx->xvmc_acceleration) | |
1903 XVMC_field_end(s); | |
1904 #endif | |
0 | 1905 /* end of slice reached */ |
1285 | 1906 if (/*s->mb_y<<field_pic == s->mb_height &&*/ !s->first_field) { |
0 | 1907 /* end of image */ |
903 | 1908 |
1728 | 1909 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_MPEG2; |
1196 | 1910 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1911 ff_er_frame_end(s); |
0 | 1912 |
1913 MPV_frame_end(s); | |
1914 | |
6481 | 1915 if (s->pict_type == FF_B_TYPE || s->low_delay) { |
1328 | 1916 *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
|
1917 ff_print_debug_info(s, pict); |
0 | 1918 } else { |
903 | 1919 s->picture_number++; |
7629 | 1920 /* latency of 1 frame for I- and P-frames */ |
0 | 1921 /* XXX: use another variable than picture_number */ |
1211 | 1922 if (s->last_picture_ptr != NULL) { |
1328 | 1923 *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
|
1924 ff_print_debug_info(s, pict); |
0 | 1925 } |
1926 } | |
1380 | 1927 |
1285 | 1928 return 1; |
0 | 1929 } else { |
1285 | 1930 return 0; |
0 | 1931 } |
1932 } | |
1933 | |
2967 | 1934 static int mpeg1_decode_sequence(AVCodecContext *avctx, |
1862 | 1935 const uint8_t *buf, int buf_size) |
0 | 1936 { |
1937 Mpeg1Context *s1 = avctx->priv_data; | |
1938 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
|
1939 int width,height; |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1940 int i, v, j; |
401
e20655449d4a
mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents:
391
diff
changeset
|
1941 |
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
|
1942 init_get_bits(&s->gb, buf, buf_size*8); |
0 | 1943 |
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
|
1944 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
|
1945 height = get_bits(&s->gb, 12); |
6866 | 1946 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
|
1947 return -1; |
917 | 1948 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
|
1949 if (s->aspect_ratio_info == 0) { |
bed080a7ccbd
log aspect ratio forbidden value, and fail if error resilience is high
bcoudurier
parents:
6492
diff
changeset
|
1950 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
|
1951 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
|
1952 return -1; |
bed080a7ccbd
log aspect ratio forbidden value, and fail if error resilience is high
bcoudurier
parents:
6492
diff
changeset
|
1953 } |
0 | 1954 s->frame_rate_index = get_bits(&s->gb, 4); |
1837 | 1955 if (s->frame_rate_index == 0 || s->frame_rate_index > 13) |
0 | 1956 return -1; |
1957 s->bit_rate = get_bits(&s->gb, 18) * 400; | |
21 | 1958 if (get_bits1(&s->gb) == 0) /* marker */ |
0 | 1959 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
|
1960 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
|
1961 s->height = height; |
0 | 1962 |
1710
4a68b20eeb2c
print vbv buffer size & bitrate when decoding with -debug 1
michael
parents:
1708
diff
changeset
|
1963 s->avctx->rc_buffer_size= get_bits(&s->gb, 10) * 1024*16; |
21 | 1964 skip_bits(&s->gb, 1); |
0 | 1965 |
1966 /* get matrix */ | |
21 | 1967 if (get_bits1(&s->gb)) { |
0 | 1968 for(i=0;i<64;i++) { |
1969 v = get_bits(&s->gb, 8); | |
1809 | 1970 if(v==0){ |
1971 av_log(s->avctx, AV_LOG_ERROR, "intra matrix damaged\n"); | |
1972 return -1; | |
1973 } | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1974 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
|
1975 s->intra_matrix[j] = v; |
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
1976 s->chroma_intra_matrix[j] = v; |
0 | 1977 } |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1978 #ifdef DEBUG |
4652 | 1979 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
|
1980 for(i=0;i<64;i++) |
4652 | 1981 dprintf(s->avctx, " %d", s->intra_matrix[s->dsp.idct_permutation[i]]); |
1982 dprintf(s->avctx, "\n"); | |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1983 #endif |
0 | 1984 } else { |
1985 for(i=0;i<64;i++) { | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1986 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
|
1987 v = ff_mpeg1_default_intra_matrix[i]; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
1988 s->intra_matrix[j] = v; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
1989 s->chroma_intra_matrix[j] = v; |
0 | 1990 } |
1991 } | |
21 | 1992 if (get_bits1(&s->gb)) { |
0 | 1993 for(i=0;i<64;i++) { |
1994 v = get_bits(&s->gb, 8); | |
1809 | 1995 if(v==0){ |
1996 av_log(s->avctx, AV_LOG_ERROR, "inter matrix damaged\n"); | |
1997 return -1; | |
1998 } | |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
1999 j = s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
344 | 2000 s->inter_matrix[j] = v; |
2001 s->chroma_inter_matrix[j] = v; | |
0 | 2002 } |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2003 #ifdef DEBUG |
7629 | 2004 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
|
2005 for(i=0;i<64;i++) |
4652 | 2006 dprintf(s->avctx, " %d", s->inter_matrix[s->dsp.idct_permutation[i]]); |
2007 dprintf(s->avctx, "\n"); | |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2008 #endif |
0 | 2009 } else { |
2010 for(i=0;i<64;i++) { | |
1092 | 2011 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
|
2012 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
|
2013 s->inter_matrix[j] = v; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
2014 s->chroma_inter_matrix[j] = v; |
0 | 2015 } |
2016 } | |
2967 | 2017 |
1809 | 2018 if(show_bits(&s->gb, 23) != 0){ |
2019 av_log(s->avctx, AV_LOG_ERROR, "sequence header damaged\n"); | |
2020 return -1; | |
2021 } | |
0 | 2022 |
7629 | 2023 /* we set MPEG-2 parameters so that it emulates MPEG-1 */ |
0 | 2024 s->progressive_sequence = 1; |
2025 s->progressive_frame = 1; | |
2026 s->picture_structure = PICT_FRAME; | |
2027 s->frame_pred_frame_dct = 1; | |
1850 | 2028 s->chroma_format = 1; |
1421 | 2029 s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG1VIDEO; |
7629 | 2030 avctx->sub_id = 1; /* indicates MPEG-1 */ |
1888
4bbe33eed9f0
move MPV_common_init after parsing stream parameters, matrix rebuild
iive
parents:
1880
diff
changeset
|
2031 s->out_format = FMT_MPEG1; |
7629 | 2032 s->swap_uv = 0;//AFAIK VCR2 does not have SEQ_HEADER |
1672 | 2033 if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1; |
2967 | 2034 |
1710
4a68b20eeb2c
print vbv buffer size & bitrate when decoding with -debug 1
michael
parents:
1708
diff
changeset
|
2035 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
2967 | 2036 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
|
2037 s->avctx->rc_buffer_size, s->bit_rate); |
2967 | 2038 |
0 | 2039 return 0; |
2040 } | |
2041 | |
1376 | 2042 static int vcr2_init_sequence(AVCodecContext *avctx) |
2043 { | |
2044 Mpeg1Context *s1 = avctx->priv_data; | |
2045 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
1377 | 2046 int i, v; |
1376 | 2047 |
7629 | 2048 /* start new MPEG-1 context decoding */ |
1376 | 2049 s->out_format = FMT_MPEG1; |
2050 if (s1->mpeg_enc_ctx_allocated) { | |
2051 MPV_common_end(s); | |
2052 } | |
2270 | 2053 s->width = avctx->coded_width; |
2054 s->height = avctx->coded_height; | |
1376 | 2055 avctx->has_b_frames= 0; //true? |
1380 | 2056 s->low_delay= 1; |
1381 | 2057 |
1821 | 2058 if(avctx->xvmc_acceleration){ |
2059 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_xvmc_mpg2_420); | |
2060 }else{ | |
2061 avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_420); | |
2062 } | |
2063 | |
1381 | 2064 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
|
2065 if( avctx->idct_algo == FF_IDCT_AUTO ) |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2066 avctx->idct_algo = FF_IDCT_SIMPLE; |
2967 | 2067 |
1376 | 2068 if (MPV_common_init(s) < 0) |
2069 return -1; | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2070 exchange_uv(s);//common init reset pblocks, so we swap them here |
2967 | 2071 s->swap_uv = 1;// in case of xvmc we need to swap uv for each MB |
1376 | 2072 s1->mpeg_enc_ctx_allocated = 1; |
2073 | |
2074 for(i=0;i<64;i++) { | |
2075 int j= s->dsp.idct_permutation[i]; | |
2076 v = ff_mpeg1_default_intra_matrix[i]; | |
2077 s->intra_matrix[j] = v; | |
2078 s->chroma_intra_matrix[j] = v; | |
2079 | |
2080 v = ff_mpeg1_default_non_intra_matrix[i]; | |
2081 s->inter_matrix[j] = v; | |
2082 s->chroma_inter_matrix[j] = v; | |
2083 } | |
2084 | |
2085 s->progressive_sequence = 1; | |
2086 s->progressive_frame = 1; | |
2087 s->picture_structure = PICT_FRAME; | |
2088 s->frame_pred_frame_dct = 1; | |
1850 | 2089 s->chroma_format = 1; |
1421 | 2090 s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO; |
7629 | 2091 avctx->sub_id = 2; /* indicates MPEG-2 */ |
1376 | 2092 return 0; |
2093 } | |
2094 | |
2095 | |
2967 | 2096 static void mpeg_decode_user_data(AVCodecContext *avctx, |
1084 | 2097 const uint8_t *buf, int buf_size) |
2098 { | |
2099 const uint8_t *p; | |
2100 int len, flags; | |
2101 p = buf; | |
2102 len = buf_size; | |
2103 | |
2104 /* we parse the DTG active format information */ | |
2105 if (len >= 5 && | |
2106 p[0] == 'D' && p[1] == 'T' && p[2] == 'G' && p[3] == '1') { | |
2107 flags = p[4]; | |
2108 p += 5; | |
2109 len -= 5; | |
2110 if (flags & 0x80) { | |
2111 /* skip event id */ | |
2112 if (len < 2) | |
2113 return; | |
2114 p += 2; | |
2115 len -= 2; | |
2116 } | |
2117 if (flags & 0x40) { | |
2118 if (len < 1) | |
2119 return; | |
2120 avctx->dtg_active_format = p[0] & 0x0f; | |
2121 } | |
2122 } | |
2123 } | |
2124 | |
2967 | 2125 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
|
2126 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
|
2127 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
|
2128 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
|
2129 |
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 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
|
2131 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
|
2132 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
|
2133 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
|
2134 |
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 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
|
2136 |
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 drop_frame_flag = get_bits1(&s->gb); |
2967 | 2138 |
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
|
2139 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
|
2140 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
|
2141 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
|
2142 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
|
2143 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
|
2144 |
6992
082bb10acbd4
print correct mpeg-2 broken_link value, and print closed_gop
bcoudurier
parents:
6939
diff
changeset
|
2145 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
|
2146 /*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
|
2147 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
|
2148 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
|
2149 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
|
2150 |
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 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
|
2152 av_log(s->avctx, AV_LOG_DEBUG, "GOP (%2d:%02d:%02d.[%02d]) closed_gop=%d broken_link=%d\n", |
2979 | 2153 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
|
2154 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
|
2155 } |
1211 | 2156 /** |
7629 | 2157 * Finds the end of the current frame in the bitstream. |
1211 | 2158 * @return the position of the first byte of the next frame, or -1 |
2159 */ | |
4916
13ef168891b0
add a ff_ prefix to the now exported mpeg1_find_frame_end() function
aurel
parents:
4915
diff
changeset
|
2160 int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size) |
1988 | 2161 { |
1211 | 2162 int i; |
3086 | 2163 uint32_t state= pc->state; |
2967 | 2164 |
6380
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2165 /* 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
|
2166 if (buf_size == 0) |
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2167 return 0; |
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2168 |
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 0 frame start -> 1/4 |
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2171 1 first_SEQEXT -> 0/2 |
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2172 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
|
2173 3 second_SEQEXT -> 2/0 |
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2174 4 searching end |
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2175 */ |
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 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
|
2178 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
|
2179 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
|
2180 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
|
2181 pc->frame_start_found--; |
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2182 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
|
2183 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
|
2184 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
|
2185 } |
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2186 state++; |
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2187 }else{ |
3086 | 2188 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
|
2189 if(pc->frame_start_found==0 && state >= SLICE_MIN_START_CODE && state <= SLICE_MAX_START_CODE){ |
1211 | 2190 i++; |
6380
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2191 pc->frame_start_found=4; |
1211 | 2192 } |
5449 | 2193 if(state == SEQ_END_CODE){ |
2194 pc->state=-1; | |
2195 return i+1; | |
2196 } | |
6380
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2197 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
|
2198 pc->frame_start_found= 0; |
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2199 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
|
2200 pc->frame_start_found++; |
464938b9c2b0
Make find_frame_end() merge 2 mpeg2 field pictures. This should make mpeg2
michael
parents:
6372
diff
changeset
|
2201 if(pc->frame_start_found == 4 && (state&0xFFFFFF00) == 0x100){ |
1211 | 2202 if(state < SLICE_MIN_START_CODE || state > SLICE_MAX_START_CODE){ |
2203 pc->frame_start_found=0; | |
2967 | 2204 pc->state=-1; |
1211 | 2205 return i-3; |
2206 } | |
2207 } | |
2208 } | |
2967 | 2209 } |
1211 | 2210 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
|
2211 return END_NOT_FOUND; |
1211 | 2212 } |
2213 | |
6562 | 2214 static int decode_chunks(AVCodecContext *avctx, |
2215 AVFrame *picture, int *data_size, | |
2216 const uint8_t *buf, int buf_size); | |
2217 | |
0 | 2218 /* handle buffering and image synchronisation */ |
2967 | 2219 static int mpeg_decode_frame(AVCodecContext *avctx, |
0 | 2220 void *data, int *data_size, |
6220 | 2221 const uint8_t *buf, int buf_size) |
0 | 2222 { |
2223 Mpeg1Context *s = avctx->priv_data; | |
925 | 2224 AVFrame *picture = data; |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2225 MpegEncContext *s2 = &s->mpeg_enc_ctx; |
4652 | 2226 dprintf(avctx, "fill_buffer\n"); |
0 | 2227 |
5449 | 2228 if (buf_size == 0 || (buf_size == 4 && AV_RB32(buf) == SEQ_END_CODE)) { |
2979 | 2229 /* special case for last picture */ |
2230 if (s2->low_delay==0 && s2->next_picture_ptr) { | |
2231 *picture= *(AVFrame*)s2->next_picture_ptr; | |
2232 s2->next_picture_ptr= NULL; | |
2233 | |
2234 *data_size = sizeof(AVFrame); | |
2235 } | |
5814
14a9ceb162d2
Prevent infinite loop when buffer holds SEQ_END_CODE only. Fix for r9870
ramiro
parents:
5458
diff
changeset
|
2236 return buf_size; |
0 | 2237 } |
2238 | |
1211 | 2239 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
|
2240 int next= ff_mpeg1_find_frame_end(&s2->parse_context, buf, buf_size); |
2967 | 2241 |
4931
0d1cc37d9430
make some parser parameters const to avoid casting const to non-const
aurel
parents:
4916
diff
changeset
|
2242 if( ff_combine_frame(&s2->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0 ) |
1211 | 2243 return buf_size; |
2967 | 2244 } |
2245 | |
2246 #if 0 | |
2247 if (s->repeat_field % 2 == 1) { | |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2248 s->repeat_field++; |
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2249 //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
|
2250 // s2->picture_number, s->repeat_field); |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2251 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
|
2252 *data_size = sizeof(AVPicture); |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2253 goto the_end; |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2254 } |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2255 } |
383
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2256 #endif |
1376 | 2257 |
2258 if(s->mpeg_enc_ctx_allocated==0 && avctx->codec_tag == ff_get_fourcc("VCR2")) | |
2259 vcr2_init_sequence(avctx); | |
2967 | 2260 |
1827 | 2261 s->slice_count= 0; |
2967 | 2262 |
6563 | 2263 if(avctx->extradata && !avctx->frame_number) |
2264 decode_chunks(avctx, picture, data_size, avctx->extradata, avctx->extradata_size); | |
2265 | |
6562 | 2266 return decode_chunks(avctx, picture, data_size, buf, buf_size); |
2267 } | |
2268 | |
2269 static int decode_chunks(AVCodecContext *avctx, | |
2270 AVFrame *picture, int *data_size, | |
2271 const uint8_t *buf, int buf_size) | |
2272 { | |
2273 Mpeg1Context *s = avctx->priv_data; | |
2274 MpegEncContext *s2 = &s->mpeg_enc_ctx; | |
2275 const uint8_t *buf_ptr = buf; | |
2276 const uint8_t *buf_end = buf + buf_size; | |
2277 int ret, input_size; | |
2278 | |
1211 | 2279 for(;;) { |
7629 | 2280 /* find next start code */ |
6562 | 2281 uint32_t start_code = -1; |
3086 | 2282 buf_ptr = ff_find_start_code(buf_ptr,buf_end, &start_code); |
3776 | 2283 if (start_code > 0x1ff){ |
6481 | 2284 if(s2->pict_type != FF_B_TYPE || avctx->skip_frame <= AVDISCARD_DEFAULT){ |
1827 | 2285 if(avctx->thread_count > 1){ |
2286 int i; | |
2287 | |
2288 avctx->execute(avctx, slice_decode_thread, (void**)&(s2->thread_context[0]), NULL, s->slice_count); | |
2289 for(i=0; i<s->slice_count; i++) | |
2290 s2->error_count += s2->thread_context[i]->error_count; | |
2291 } | |
1484 | 2292 if (slice_end(avctx, picture)) { |
1672 | 2293 if(s2->last_picture_ptr || s2->low_delay) //FIXME merge with the stuff in mpeg_decode_slice |
1484 | 2294 *data_size = sizeof(AVPicture); |
2295 } | |
1285 | 2296 } |
1220 | 2297 return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index); |
0 | 2298 } |
2967 | 2299 |
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2300 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
|
2301 |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2302 if(avctx->debug & FF_DEBUG_STARTCODE){ |
6494
1144fc79b912
Use correct t printf modifier for pointer differences.
diego
parents:
6493
diff
changeset
|
2303 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
|
2304 } |
1211 | 2305 |
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2306 /* prepare data for next start code */ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2307 switch(start_code) { |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2308 case SEQ_START_CODE: |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2309 mpeg1_decode_sequence(avctx, buf_ptr, |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2310 input_size); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2311 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2312 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2313 case PICTURE_START_CODE: |
7629 | 2314 /* we have a complete image: we try to decompress it */ |
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2315 mpeg1_decode_picture(avctx, |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2316 buf_ptr, input_size); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2317 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2318 case EXT_START_CODE: |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2319 mpeg_decode_extension(avctx, |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2320 buf_ptr, input_size); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2321 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2322 case USER_START_CODE: |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2323 mpeg_decode_user_data(avctx, |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2324 buf_ptr, input_size); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2325 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2326 case GOP_START_CODE: |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2327 s2->first_field=0; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2328 mpeg_decode_gop(avctx, |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2329 buf_ptr, input_size); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2330 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2331 default: |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2332 if (start_code >= SLICE_MIN_START_CODE && |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2333 start_code <= SLICE_MAX_START_CODE) { |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2334 int mb_y= start_code - SLICE_MIN_START_CODE; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2335 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2336 if(s2->last_picture_ptr==NULL){ |
5127 | 2337 /* Skip B-frames if we do not have reference frames. */ |
6481 | 2338 if(s2->pict_type==FF_B_TYPE) break; |
6109 | 2339 } |
2340 if(s2->next_picture_ptr==NULL){ | |
7629 | 2341 /* Skip P-frames if we do not have a reference frame or we have an invalid header. */ |
6481 | 2342 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
|
2343 } |
5127 | 2344 /* Skip B-frames if we are in a hurry. */ |
6481 | 2345 if(avctx->hurry_up && s2->pict_type==FF_B_TYPE) break; |
2346 if( (avctx->skip_frame >= AVDISCARD_NONREF && s2->pict_type==FF_B_TYPE) | |
2347 ||(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
|
2348 || avctx->skip_frame >= AVDISCARD_ALL) |
0 | 2349 break; |
5127 | 2350 /* 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
|
2351 if(avctx->hurry_up>=5) break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2352 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2353 if (!s->mpeg_enc_ctx_allocated) break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2354 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2355 if(s2->codec_id == CODEC_ID_MPEG2VIDEO){ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2356 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
|
2357 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2358 } |
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 if(s2->first_slice){ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2361 s2->first_slice=0; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2362 if(mpeg_field_start(s2) < 0) |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2363 return -1; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2364 } |
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
|
2365 if(!s2->current_picture_ptr){ |
5129 | 2366 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
|
2367 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
|
2368 } |
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2369 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2370 if(avctx->thread_count > 1){ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2371 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
|
2372 if(threshold <= mb_y){ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2373 MpegEncContext *thread_context= s2->thread_context[s->slice_count]; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2374 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2375 thread_context->start_mb_y= mb_y; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2376 thread_context->end_mb_y = s2->mb_height; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2377 if(s->slice_count){ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2378 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
|
2379 ff_update_duplicate_context(thread_context, s2); |
2786 | 2380 } |
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2381 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
|
2382 s->slice_count++; |
0 | 2383 } |
7629 | 2384 buf_ptr += 2; //FIXME add minimum number of bytes per slice |
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2385 }else{ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2386 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
|
2387 emms_c(); |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2388 |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2389 if(ret < 0){ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2390 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
|
2391 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
|
2392 }else{ |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2393 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
|
2394 } |
0 | 2395 } |
4119
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2396 } |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2397 break; |
85438e10d72d
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents:
4070
diff
changeset
|
2398 } |
0 | 2399 } |
2400 } | |
2401 | |
2402 static int mpeg_decode_end(AVCodecContext *avctx) | |
2403 { | |
2404 Mpeg1Context *s = avctx->priv_data; | |
2405 | |
2406 if (s->mpeg_enc_ctx_allocated) | |
2407 MPV_common_end(&s->mpeg_enc_ctx); | |
2408 return 0; | |
2409 } | |
2410 | |
1423 | 2411 AVCodec mpeg1video_decoder = { |
2412 "mpeg1video", | |
0 | 2413 CODEC_TYPE_VIDEO, |
2414 CODEC_ID_MPEG1VIDEO, | |
2415 sizeof(Mpeg1Context), | |
2416 mpeg_decode_init, | |
2417 NULL, | |
2418 mpeg_decode_end, | |
2419 mpeg_decode_frame, | |
2453 | 2420 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
1368 | 2421 .flush= ff_mpeg_flush, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6992
diff
changeset
|
2422 .long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"), |
0 | 2423 }; |
1381 | 2424 |
1423 | 2425 AVCodec mpeg2video_decoder = { |
2426 "mpeg2video", | |
2427 CODEC_TYPE_VIDEO, | |
2428 CODEC_ID_MPEG2VIDEO, | |
2429 sizeof(Mpeg1Context), | |
2430 mpeg_decode_init, | |
2431 NULL, | |
2432 mpeg_decode_end, | |
2433 mpeg_decode_frame, | |
2453 | 2434 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
1423 | 2435 .flush= ff_mpeg_flush, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6992
diff
changeset
|
2436 .long_name= NULL_IF_CONFIG_SMALL("MPEG-2 video"), |
1423 | 2437 }; |
2438 | |
1615 | 2439 //legacy decoder |
2440 AVCodec mpegvideo_decoder = { | |
2441 "mpegvideo", | |
2442 CODEC_TYPE_VIDEO, | |
2443 CODEC_ID_MPEG2VIDEO, | |
2444 sizeof(Mpeg1Context), | |
2445 mpeg_decode_init, | |
2446 NULL, | |
2447 mpeg_decode_end, | |
2448 mpeg_decode_frame, | |
2453 | 2449 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
1615 | 2450 .flush= ff_mpeg_flush, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6992
diff
changeset
|
2451 .long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"), |
1615 | 2452 }; |
2453 | |
1381 | 2454 #ifdef HAVE_XVMC |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6494
diff
changeset
|
2455 static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx){ |
1381 | 2456 Mpeg1Context *s; |
2457 | |
2967 | 2458 if( avctx->thread_count > 1) |
2076 | 2459 return -1; |
1381 | 2460 if( !(avctx->slice_flags & SLICE_FLAG_CODED_ORDER) ) |
2461 return -1; | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2462 if( !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD) ){ |
4652 | 2463 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
|
2464 } |
1381 | 2465 mpeg_decode_init(avctx); |
2466 s = avctx->priv_data; | |
2467 | |
2468 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
|
2469 avctx->xvmc_acceleration = 2;//2 - the blocks are packed! |
1381 | 2470 |
2471 return 0; | |
2472 } | |
2473 | |
2474 AVCodec mpeg_xvmc_decoder = { | |
2475 "mpegvideo_xvmc", | |
2476 CODEC_TYPE_VIDEO, | |
2477 CODEC_ID_MPEG2VIDEO_XVMC, | |
2478 sizeof(Mpeg1Context), | |
2479 mpeg_mc_decode_init, | |
2480 NULL, | |
2481 mpeg_decode_end, | |
2482 mpeg_decode_frame, | |
2453 | 2483 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
|
2484 .flush= ff_mpeg_flush, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6992
diff
changeset
|
2485 .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video XvMC (X-Video Motion Compensation)"), |
1381 | 2486 }; |
2487 | |
2488 #endif |