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