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