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