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