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