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