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