diff options
author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2007-02-28 06:39:58 +0000 |
---|---|---|
committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2007-02-28 06:39:58 +0000 |
commit | 9d1f80f2070349429e2f4d45a03fbd34a5c6bcf4 (patch) | |
tree | bd2d10f398ce0a87729a52fbea75228ff7e87220 /libavcodec/vc1.c | |
parent | 558b86a5d03690b359f5a84ba1cd3222055e55fb (diff) | |
download | ffmpeg-streaming-9d1f80f2070349429e2f4d45a03fbd34a5c6bcf4.zip ffmpeg-streaming-9d1f80f2070349429e2f4d45a03fbd34a5c6bcf4.tar.gz |
WMV3 Complex Profile initial support
Originally committed as revision 8159 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vc1.c')
-rw-r--r-- | libavcodec/vc1.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index c1a8b4c..5993f15 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -1145,10 +1145,9 @@ static int decode_sequence_header(AVCodecContext *avctx, GetBitContext *gb) av_log(avctx, AV_LOG_DEBUG, "Header: %0X\n", show_bits(gb, 32)); v->profile = get_bits(gb, 2); - if (v->profile == 2) + if (v->profile == PROFILE_COMPLEX) { - av_log(avctx, AV_LOG_ERROR, "Profile value 2 is forbidden (and WMV3 Complex Profile is unsupported)\n"); - return -1; + av_log(avctx, AV_LOG_ERROR, "WMV3 Complex Profile is not fully supported\n"); } if (v->profile == PROFILE_ADVANCED) @@ -1465,6 +1464,9 @@ static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) else if (v->multires && v->s.pict_type != B_TYPE) v->respic = get_bits(gb, 2); + if(v->res_x8 && (v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE)){ + if(get_bits1(gb))return -1; + } //av_log(v->s.avctx, AV_LOG_INFO, "%c Frame: QP=[%i]%i (+%i/2) %i\n", // (v->s.pict_type == P_TYPE) ? 'P' : ((v->s.pict_type == I_TYPE) ? 'I' : 'B'), pqindex, v->pq, v->halfpq, v->rangeredfrm); @@ -3435,6 +3437,7 @@ static int vc1_decode_p_mb(VC1Context *v) s->dsp.vc1_inv_trans_8x8(s->block[i]); if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1; for(j = 0; j < 64; j++) s->block[i][j] += 128; + if(!v->res_fasttx && v->res_x8) for(j = 0; j < 64; j++) s->block[i][j] += 16; s->dsp.put_pixels_clamped(s->block[i], s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2)); if(v->pq >= 9 && v->overlap) { if(v->c_avail) @@ -3538,6 +3541,7 @@ static int vc1_decode_p_mb(VC1Context *v) s->dsp.vc1_inv_trans_8x8(s->block[i]); if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1; for(j = 0; j < 64; j++) s->block[i][j] += 128; + if(!v->res_fasttx && v->res_x8) for(j = 0; j < 64; j++) s->block[i][j] += 16; s->dsp.put_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize); if(v->pq >= 9 && v->overlap) { if(v->c_avail) |