diff options
Diffstat (limited to 'libavcodec/svq3.c')
-rw-r--r-- | libavcodec/svq3.c | 157 |
1 files changed, 108 insertions, 49 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index a89f14c975..da86f6e567 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 <inttypes.h> @@ -54,6 +54,7 @@ #include "mathops.h" #include "rectangle.h" #include "tpeldsp.h" +#include "vdpau_internal.h" #if CONFIG_ZLIB #include <zlib.h> @@ -83,8 +84,10 @@ typedef struct SVQ3Context { int slice_size; int halfpel_flag; int thirdpel_flag; - int unknown_flag; + int has_watermark; uint32_t watermark_key; + uint8_t *buf; + int buf_size; int adaptive_quant; int next_p_frame_damaged; int h_edge_pos; @@ -190,6 +193,8 @@ static const uint32_t svq3_dequant_coeff[32] = { 61694, 68745, 77615, 89113, 100253, 109366, 126635, 141533 }; +static int svq3_decode_end(AVCodecContext *avctx); + static void svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp) { const int qmul = svq3_dequant_coeff[qp]; @@ -272,14 +277,17 @@ static inline int svq3_decode_block(GetBitContext *gb, int16_t *block, luma_dc_zigzag_scan, ff_zigzag_scan, svq3_scan, ff_h264_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) { @@ -294,20 +302,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; @@ -622,7 +629,7 @@ static av_always_inline void hl_decode_mb_predict_luma(SVQ3Context *s, int nnz, tr; if (dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED) { const int topright_avail = (s->topright_samples_available << i) & 0x8000; - assert(s->mb_y || linesize <= block_offset[i]); + av_assert2(s->mb_y || linesize <= block_offset[i]); if (!topright_avail) { tr = ptr[3 - linesize] * 0x01010101u; topright = (uint8_t *)&tr; @@ -834,7 +841,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:%"PRIu32"\n", vlc); return -1; @@ -910,7 +917,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->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=%"PRIu32"\n", vlc); return -1; } @@ -1035,7 +1042,7 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) AV_WL32(&h->gb.buffer[1], header ^ s->watermark_key); } if (length > 0) { - memcpy(s->slice_buf, &s->slice_buf[slice_length], length - 1); + memmove(s->slice_buf, &s->slice_buf[slice_length], length - 1); } skip_bits_long(&s->gb, slice_bytes * 8); } @@ -1063,14 +1070,14 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) /* unknown fields */ skip_bits1(&h->gb); - if (s->unknown_flag) + if (s->has_watermark) skip_bits1(&h->gb); skip_bits1(&h->gb); skip_bits(&h->gb, 2); - while (get_bits1(&h->gb)) - skip_bits(&h->gb, 8); + if (skip_1stop_8data_bits(&h->gb) < 0) + return AVERROR_INVALIDDATA; /* reset intra predictors and invalidate motion vector references */ if (s->mb_x > 0) { @@ -1114,15 +1121,14 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) unsigned char *extradata_end; unsigned int size; int marker_found = 0; + int ret; s->cur_pic = av_mallocz(sizeof(*s->cur_pic)); s->last_pic = av_mallocz(sizeof(*s->last_pic)); s->next_pic = av_mallocz(sizeof(*s->next_pic)); if (!s->next_pic || !s->last_pic || !s->cur_pic) { - av_freep(&s->cur_pic); - av_freep(&s->last_pic); - av_freep(&s->next_pic); - return AVERROR(ENOMEM); + ret = AVERROR(ENOMEM); + goto fail; } s->cur_pic->f = av_frame_alloc(); @@ -1131,16 +1137,21 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) if (!s->cur_pic->f || !s->last_pic->f || !s->next_pic->f) return AVERROR(ENOMEM); - if (ff_h264_decode_init(avctx) < 0) - return -1; + if ((ret = ff_h264_decode_init(avctx)) < 0) + goto fail; // we will overwrite it later during decoding av_frame_free(&h->cur_pic.f); + av_frame_free(&h->last_pic_for_ec.f); + ff_h264dsp_init(&s->h264dsp, 8, 1); + av_assert0(h->sps.bit_depth_chroma == 0); ff_h264_pred_init(&s->hpc, AV_CODEC_ID_SVQ3, 8, 1); ff_videodsp_init(&s->vdsp, 8); + + avctx->bits_per_raw_sample = 8; h->sps.bit_depth_luma = 8; h->chroma_format_idc = 1; @@ -1151,6 +1162,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) h->flags = avctx->flags; sl->is_complex = 1; + h->sps.chroma_format_idc = 1; h->picture_structure = PICT_FRAME; avctx->pix_fmt = AV_PIX_FMT_YUVJ420P; avctx->color_range = AVCOL_RANGE_JPEG; @@ -1160,7 +1172,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) s->halfpel_flag = 1; s->thirdpel_flag = 1; - s->unknown_flag = 0; + s->has_watermark = 0; /* prowl for the "SEQH" marker in the extradata */ extradata = (unsigned char *)avctx->extradata; @@ -1179,10 +1191,13 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) if (marker_found) { GetBitContext gb; int frame_size_code; + int unk0, unk1, unk2, unk3, unk4; size = AV_RB32(&extradata[4]); - if (size > extradata_end - extradata - 8) - return AVERROR_INVALIDDATA; + if (size > extradata_end - extradata - 8) { + ret = AVERROR_INVALIDDATA; + goto fail; + } init_get_bits(&gb, extradata + 8, size * 8); /* 'frame size code' and optional 'width, height' */ @@ -1226,22 +1241,27 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) s->thirdpel_flag = get_bits1(&gb); /* unknown fields */ - skip_bits1(&gb); - skip_bits1(&gb); - skip_bits1(&gb); - skip_bits1(&gb); + unk0 = get_bits1(&gb); + unk1 = get_bits1(&gb); + unk2 = get_bits1(&gb); + unk3 = get_bits1(&gb); h->low_delay = get_bits1(&gb); /* unknown field */ - skip_bits1(&gb); + unk4 = get_bits1(&gb); - while (get_bits1(&gb)) - skip_bits(&gb, 8); + av_log(avctx, AV_LOG_DEBUG, "Unknown fields %d %d %d %d %d\n", + unk0, unk1, unk2, unk3, unk4); - s->unknown_flag = get_bits1(&gb); + if (skip_1stop_8data_bits(&gb) < 0) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + + s->has_watermark = get_bits1(&gb); avctx->has_b_frames = !h->low_delay; - if (s->unknown_flag) { + if (s->has_watermark) { #if CONFIG_ZLIB unsigned watermark_width = svq3_get_ue_golomb(&gb); unsigned watermark_height = svq3_get_ue_golomb(&gb); @@ -1254,11 +1274,17 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) int offset = get_bits_count(&gb) + 7 >> 3; uint8_t *buf; - if (watermark_height > 0 && - (uint64_t)watermark_width * 4 > UINT_MAX / watermark_height) - return -1; + if (watermark_height <= 0 || + (uint64_t)watermark_width * 4 > UINT_MAX / watermark_height) { + ret = -1; + goto fail; + } buf = av_malloc(buf_len); + if (!buf) { + ret = AVERROR(ENOMEM); + goto fail; + } av_log(avctx, AV_LOG_DEBUG, "watermark size: %ux%u\n", watermark_width, watermark_height); av_log(avctx, AV_LOG_DEBUG, @@ -1269,7 +1295,8 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "could not uncompress watermark logo\n"); av_free(buf); - return -1; + ret = -1; + goto fail; } s->watermark_key = ff_svq1_packet_checksum(buf, buf_len, 0); s->watermark_key = s->watermark_key << 16 | s->watermark_key; @@ -1279,7 +1306,8 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) #else av_log(avctx, AV_LOG_ERROR, "this svq3 file contains watermark which need zlib support compiled in\n"); - return -1; + ret = -1; + goto fail; #endif } } @@ -1311,6 +1339,9 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) init_dequant4_coeff_table(s); return 0; +fail: + svq3_decode_end(avctx); + return ret; } static void free_picture(AVCodecContext *avctx, H264Picture *pic) @@ -1364,7 +1395,7 @@ static int get_buffer(AVCodecContext *avctx, H264Picture *pic) goto fail; if (!s->edge_emu_buffer) { - s->edge_emu_buffer = av_mallocz(pic->f->linesize[0] * 17); + s->edge_emu_buffer = av_mallocz_array(pic->f->linesize[0], 17); if (!s->edge_emu_buffer) return AVERROR(ENOMEM); } @@ -1381,11 +1412,12 @@ 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; H264SliceContext *sl = &h->slice_ctx[0]; int buf_size = avpkt->size; + int left; + uint8_t *buf; int ret, m, i; /* special case for last picture */ @@ -1400,12 +1432,22 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, return 0; } + sl->mb_x = sl->mb_y = sl->mb_xy = 0; + + if (s->watermark_key) { + av_fast_padded_malloc(&s->buf, &s->buf_size, buf_size); + if (!s->buf) + return AVERROR(ENOMEM); + memcpy(s->buf, avpkt->data, buf_size); + buf = s->buf; + } else { + buf = avpkt->data; + } + ret = init_get_bits(&s->gb, buf, 8 * buf_size); if (ret < 0) return ret; - s->mb_x = s->mb_y = s->mb_xy = 0; - if (svq3_decode_slice_header(avctx)) return -1; @@ -1439,6 +1481,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, if (s->pict_type != AV_PICTURE_TYPE_I) { if (!s->last_pic->f->data[0]) { av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n"); + av_frame_unref(s->last_pic->f); ret = get_buffer(avctx, s->last_pic); if (ret < 0) return ret; @@ -1451,6 +1494,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, if (s->pict_type == AV_PICTURE_TYPE_B && !s->next_pic->f->data[0]) { av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n"); + av_frame_unref(s->next_pic->f); ret = get_buffer(avctx, s->next_pic); if (ret < 0) return ret; @@ -1538,7 +1582,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, return -1; } - if (mb_type != 0) + if (mb_type != 0 || sl->cbp) hl_decode_mb(s, h, &h->slice_ctx[0]); if (s->pict_type != AV_PICTURE_TYPE_B && !h->low_delay) @@ -1552,6 +1596,18 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, h->low_delay); } + left = buf_size*8 - get_bits_count(&h->gb); + + if (sl->mb_y != h->mb_height || sl->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, sl->mb_y, sl->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 (s->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]) @@ -1595,6 +1651,9 @@ static av_cold int svq3_decode_end(AVCodecContext *avctx) ff_h264_free_context(h); + av_freep(&s->buf); + s->buf_size = 0; + return 0; } |