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