diff options
Diffstat (limited to 'libavcodec/svq3.c')
-rw-r--r-- | libavcodec/svq3.c | 94 |
1 files changed, 65 insertions, 29 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 1ea99d15a6..53c4d3202c 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1,20 +1,20 @@ /* - * Copyright (c) 2003 The Libav Project + * Copyright (c) 2003 The FFmpeg Project * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -37,7 +37,7 @@ * * You will know you have these parameters passed correctly when the decoder * correctly decodes this file: - * http://samples.libav.org/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov + * http://samples.mplayerhq.hu/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov */ #include "internal.h" #include "avcodec.h" @@ -48,6 +48,7 @@ #include "h264_mvpred.h" #include "golomb.h" +#include "hpeldsp.h" #include "rectangle.h" #include "vdpau_internal.h" @@ -65,6 +66,7 @@ typedef struct { H264Context h; + HpelDSPContext hdsp; Picture *cur_pic; Picture *next_pic; Picture *last_pic; @@ -73,6 +75,8 @@ typedef struct { int unknown_flag; int next_slice_index; uint32_t watermark_key; + uint8_t *buf; + int buf_size; int adaptive_quant; int next_p_frame_damaged; int h_edge_pos; @@ -216,6 +220,8 @@ void ff_svq3_add_idct_c(uint8_t *dst, int16_t *block, dst[i + stride * 2] = av_clip_uint8(dst[i + stride * 2] + ((z1 - z2) * qmul + rr >> 20)); dst[i + stride * 3] = av_clip_uint8(dst[i + stride * 3] + ((z0 - z3) * qmul + rr >> 20)); } + + memset(block, 0, 16 * sizeof(int16_t)); } static inline int svq3_decode_block(GetBitContext *gb, int16_t *block, @@ -224,14 +230,17 @@ static inline int svq3_decode_block(GetBitContext *gb, int16_t *block, static const uint8_t *const scan_patterns[4] = { luma_dc_zigzag_scan, zigzag_scan, svq3_scan, chroma_dc_scan }; - int run, level, limit; + int run, level, sign, limit; unsigned vlc; const int intra = 3 * type >> 2; const uint8_t *const scan = scan_patterns[type]; for (limit = (16 >> intra); index < 16; index = limit, limit += 8) { for (; (vlc = svq3_get_ue_golomb(gb)) != 0; index++) { - int sign = (vlc & 1) ? 0 : -1; + if ((int32_t)vlc < 0) + return -1; + + sign = (vlc & 1) ? 0 : -1; vlc = vlc + 1 >> 1; if (type == 3) { @@ -246,20 +255,19 @@ static inline int svq3_decode_block(GetBitContext *gb, int16_t *block, level = (vlc + 9 >> 2) - run; } } else { - if (vlc < 16) { + if (vlc < 16U) { run = svq3_dct_tables[intra][vlc].run; level = svq3_dct_tables[intra][vlc].level; } else if (intra) { run = vlc & 0x7; - level = (vlc >> 3) + - ((run == 0) ? 8 : ((run < 2) ? 2 : ((run < 5) ? 0 : -1))); + level = (vlc >> 3) + ((run == 0) ? 8 : ((run < 2) ? 2 : ((run < 5) ? 0 : -1))); } else { run = vlc & 0xF; - level = (vlc >> 4) + - ((run == 0) ? 4 : ((run < 3) ? 2 : ((run < 10) ? 1 : 0))); + level = (vlc >> 4) + ((run == 0) ? 4 : ((run < 3) ? 2 : ((run < 10) ? 1 : 0))); } } + if ((index += run) >= limit) return -1; @@ -310,9 +318,9 @@ static inline void svq3_mc_dir_part(SVQ3Context *s, : h->dsp.put_tpel_pixels_tab)[dxy](dest, src, h->linesize, width, height); else - (avg ? h->dsp.avg_pixels_tab - : h->dsp.put_pixels_tab)[blocksize][dxy](dest, src, h->linesize, - height); + (avg ? s->hdsp.avg_pixels_tab + : s->hdsp.put_pixels_tab)[blocksize][dxy](dest, src, h->linesize, + height); if (!(h->flags & CODEC_FLAG_GRAY)) { mx = mx + (mx < (int) x) >> 1; @@ -338,10 +346,10 @@ static inline void svq3_mc_dir_part(SVQ3Context *s, h->uvlinesize, width, height); else - (avg ? h->dsp.avg_pixels_tab - : h->dsp.put_pixels_tab)[blocksize][dxy](dest, src, - h->uvlinesize, - height); + (avg ? s->hdsp.avg_pixels_tab + : s->hdsp.put_pixels_tab)[blocksize][dxy](dest, src, + h->uvlinesize, + height); } } } @@ -599,7 +607,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) for (i = 0; i < 16; i += 2) { vlc = svq3_get_ue_golomb(&h->gb); - if (vlc >= 25) { + if (vlc >= 25U) { av_log(h->avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc); return -1; } @@ -664,13 +672,11 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) } if (!IS_SKIP(mb_type) || h->pict_type == AV_PICTURE_TYPE_B) { memset(h->non_zero_count_cache + 8, 0, 14 * 8 * sizeof(uint8_t)); - h->dsp.clear_blocks(h->mb + 0); - h->dsp.clear_blocks(h->mb + 384); } if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || h->pict_type == AV_PICTURE_TYPE_B)) { - if ((vlc = svq3_get_ue_golomb(&h->gb)) >= 48) { + if ((vlc = svq3_get_ue_golomb(&h->gb)) >= 48U){ av_log(h->avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc); return -1; } @@ -865,8 +871,10 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) if (ff_h264_decode_init(avctx) < 0) return -1; + ff_hpeldsp_init(&s->hdsp, avctx->flags); h->flags = avctx->flags; h->is_complex = 1; + h->sps.chroma_format_idc = 1; h->picture_structure = PICT_FRAME; avctx->pix_fmt = avctx->codec->pix_fmts[0]; @@ -969,7 +977,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) int offset = get_bits_count(&gb) + 7 >> 3; uint8_t *buf; - if ((uint64_t)watermark_width * 4 > UINT_MAX / watermark_height) + if (watermark_height <= 0 || (uint64_t)watermark_width*4 > UINT_MAX/watermark_height) return -1; buf = av_malloc(buf_len); @@ -1083,10 +1091,11 @@ fail: static int svq3_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { - const uint8_t *buf = avpkt->data; SVQ3Context *s = avctx->priv_data; H264Context *h = &s->h; int buf_size = avpkt->size; + int left; + uint8_t *buf; int ret, m, i; /* special case for last picture */ @@ -1101,10 +1110,21 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, return 0; } - init_get_bits(&h->gb, buf, 8 * buf_size); - h->mb_x = h->mb_y = h->mb_xy = 0; + if (s->watermark_key) { + av_fast_malloc(&s->buf, &s->buf_size, + buf_size+FF_INPUT_BUFFER_PADDING_SIZE); + if (!s->buf) + return AVERROR(ENOMEM); + memcpy(s->buf, avpkt->data, buf_size); + buf = s->buf; + } else { + buf = avpkt->data; + } + + init_get_bits(&h->gb, buf, 8 * buf_size); + if (svq3_decode_slice_header(avctx)) return -1; @@ -1245,7 +1265,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, return -1; } - if (mb_type != 0) + if (mb_type != 0 || h->cbp) ff_h264_hl_decode_mb(h); if (h->pict_type != AV_PICTURE_TYPE_B && !h->low_delay) @@ -1258,6 +1278,18 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, h->low_delay, h->mb_height * 16, h->mb_width * 16); } + left = buf_size*8 - get_bits_count(&h->gb); + + if (h->mb_y != h->mb_height || h->mb_x != h->mb_width) { + av_log(avctx, AV_LOG_INFO, "frame num %d incomplete pic x %d y %d left %d\n", avctx->frame_number, h->mb_y, h->mb_x, left); + //av_hex_dump(stderr, buf+buf_size-8, 8); + } + + if (left < 0) { + av_log(avctx, AV_LOG_ERROR, "frame num %d left %d\n", avctx->frame_number, left); + return -1; + } + if (h->pict_type == AV_PICTURE_TYPE_B || h->low_delay) ret = av_frame_ref(data, &s->cur_pic->f); else if (s->last_pic->f.data[0]) @@ -1294,6 +1326,10 @@ static int svq3_decode_end(AVCodecContext *avctx) ff_h264_free_context(h); + av_freep(&s->buf); + s->buf_size = 0; + av_freep(&h->edge_emu_buffer); + return 0; } |