diff options
Diffstat (limited to 'libavcodec/rv34.c')
-rw-r--r-- | libavcodec/rv34.c | 58 |
1 files changed, 42 insertions, 16 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 0720ffb..4bae2c4 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -2,20 +2,20 @@ * RV30/40 decoder common data * Copyright (c) 2007 Mike Melanson, Konstantin Shishkov * - * 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 */ @@ -24,6 +24,7 @@ * RV30/40 decoder common data */ +#include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "avcodec.h" @@ -213,7 +214,7 @@ static int rv34_decode_cbp(GetBitContext *gb, RV34VLC *vlc, int table) } /** - * Get one coefficient value from the bistream and store it. + * Get one coefficient value from the bitstream and store it. */ static inline void decode_coeff(int16_t *dst, int coef, int esc, GetBitContext *gb, VLC* vlc, int q) { @@ -727,16 +728,19 @@ static inline void rv34_mc(RV34DecContext *r, const int block_type, s->vdsp.emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, s->linesize, (width << 3) + 6, (height << 3) + 6, - src_x - 2, src_y - 2, s->h_edge_pos, s->v_edge_pos); + src_x - 2, src_y - 2, + s->h_edge_pos, s->v_edge_pos); srcY = s->edge_emu_buffer + 2 + 2*s->linesize; s->vdsp.emulated_edge_mc(uvbuf, srcU, - s->uvlinesize,s->uvlinesize, + s->uvlinesize, s->uvlinesize, (width << 2) + 1, (height << 2) + 1, - uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); + uvsrc_x, uvsrc_y, + s->h_edge_pos >> 1, s->v_edge_pos >> 1); s->vdsp.emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, s->uvlinesize, (width << 2) + 1, (height << 2) + 1, - uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); + uvsrc_x, uvsrc_y, + s->h_edge_pos >> 1, s->v_edge_pos >> 1); srcU = uvbuf; srcV = uvbuf + 16; } @@ -1337,7 +1341,7 @@ static int check_slice_end(RV34DecContext *r, MpegEncContext *s) if(r->s.mb_skip_run > 1) return 0; bits = get_bits_left(&s->gb); - if(bits < 0 || (bits < 8 && !show_bits(&s->gb, bits))) + if(bits <= 0 || (bits < 8 && !show_bits(&s->gb, bits))) return 1; return 0; } @@ -1359,11 +1363,11 @@ static int rv34_decoder_alloc(RV34DecContext *r) { r->intra_types_stride = r->s.mb_width * 4 + 4; - r->cbp_chroma = av_malloc(r->s.mb_stride * r->s.mb_height * + r->cbp_chroma = av_mallocz(r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_chroma)); - r->cbp_luma = av_malloc(r->s.mb_stride * r->s.mb_height * + r->cbp_luma = av_mallocz(r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_luma)); - r->deblock_coefs = av_malloc(r->s.mb_stride * r->s.mb_height * + r->deblock_coefs = av_mallocz(r->s.mb_stride * r->s.mb_height * sizeof(*r->deblock_coefs)); r->intra_types_hist = av_malloc(r->intra_types_stride * 4 * 2 * sizeof(*r->intra_types_hist)); @@ -1408,6 +1412,10 @@ static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n"); return AVERROR_INVALIDDATA; } + if (s->width != r->si.width || s->height != r->si.height) { + av_log(s->avctx, AV_LOG_ERROR, "Size mismatch\n"); + return AVERROR_INVALIDDATA; + } r->si.end = end; s->qscale = r->si.quant; @@ -1585,18 +1593,30 @@ static int finish_frame(AVCodecContext *avctx, AVFrame *pict) if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) { if ((ret = av_frame_ref(pict, s->current_picture_ptr->f)) < 0) return ret; - ff_print_debug_info(s, s->current_picture_ptr); + ff_print_debug_info(s, s->current_picture_ptr, pict); + ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1); got_picture = 1; } else if (s->last_picture_ptr != NULL) { if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) return ret; - ff_print_debug_info(s, s->last_picture_ptr); + ff_print_debug_info(s, s->last_picture_ptr, pict); + ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_QSCALE_TYPE_MPEG1); got_picture = 1; } return got_picture; } +static AVRational update_sar(int old_w, int old_h, AVRational sar, int new_w, int new_h) +{ + // attempt to keep aspect during typical resolution switches + if (!sar.num) + sar = (AVRational){1, 1}; + + sar = av_mul_q(sar, (AVRational){new_h * old_w, new_w * old_h}); + return sar; +} + int ff_rv34_decode_frame(AVCodecContext *avctx, void *data, int *got_picture_ptr, AVPacket *avpkt) @@ -1658,7 +1678,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, /* first slice */ if (si.start == 0) { if (s->mb_num_left > 0) { - av_log(avctx, AV_LOG_ERROR, "New frame but still %d MB left.", + av_log(avctx, AV_LOG_ERROR, "New frame but still %d MB left.\n", s->mb_num_left); ff_er_frame_end(&s->er); ff_MPV_frame_end(s); @@ -1670,6 +1690,12 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, av_log(s->avctx, AV_LOG_WARNING, "Changing dimensions to %dx%d\n", si.width, si.height); + if (av_image_check_size(si.width, si.height, 0, s->avctx)) + return AVERROR_INVALIDDATA; + + s->avctx->sample_aspect_ratio = update_sar( + s->width, s->height, s->avctx->sample_aspect_ratio, + si.width, si.height); s->width = si.width; s->height = si.height; |