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