diff options
Diffstat (limited to 'libavcodec/qpeg.c')
| -rw-r--r-- | libavcodec/qpeg.c | 66 |
1 files changed, 45 insertions, 21 deletions
diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index 4de1655ebb..71f322b828 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -2,20 +2,20 @@ * QPEG codec * Copyright (c) 2004 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 */ @@ -30,8 +30,7 @@ typedef struct QpegContext{ AVCodecContext *avctx; - AVFrame *pic; - uint8_t *refdata; + AVFrame *pic, *ref; uint32_t pal[256]; GetByteContext buffer; } QpegContext; @@ -111,7 +110,7 @@ static const int qpeg_table_w[16] = { 0x00, 0x20, 0x18, 0x08, 0x18, 0x10, 0x20, 0x10, 0x08, 0x10, 0x20, 0x20, 0x08, 0x10, 0x18, 0x04}; /* Decodes delta frames */ -static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst, +static void av_noinline qpeg_decode_inter(QpegContext *qctx, uint8_t *dst, int stride, int width, int height, int delta, const uint8_t *ctable, uint8_t *refdata) @@ -121,9 +120,13 @@ static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst, int filled = 0; int orig_height; - /* copy prev frame */ - for(i = 0; i < height; i++) - memcpy(refdata + (i * width), dst + (i * stride), width); + if (refdata) { + /* copy prev frame */ + for (i = 0; i < height; i++) + memcpy(dst + (i * stride), refdata + (i * stride), width); + } else { + refdata = dst; + } orig_height = height; height--; @@ -134,7 +137,7 @@ static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst, if(delta) { /* motion compensation */ - while((code & 0xF0) == 0xF0) { + while(bytestream2_get_bytes_left(&qctx->buffer) > 0 && (code & 0xF0) == 0xF0) { if(delta == 1) { int me_idx; int me_w, me_h, me_x, me_y; @@ -161,16 +164,16 @@ static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst, /* check motion vector */ if ((me_x + filled < 0) || (me_x + me_w + filled > width) || - (height - me_y - me_h < 0) || (height - me_y > orig_height) || + (height - me_y - me_h < 0) || (height - me_y >= orig_height) || (filled + me_w > width) || (height - me_h < 0)) av_log(NULL, AV_LOG_ERROR, "Bogus motion vector (%i,%i), block size %ix%i at %i,%i\n", me_x, me_y, me_w, me_h, filled, height); else { /* do motion compensation */ - me_plane = refdata + (filled + me_x) + (height - me_y) * width; + me_plane = refdata + (filled + me_x) + (height - me_y) * stride; for(j = 0; j < me_h; j++) { for(i = 0; i < me_w; i++) - dst[filled + i - (j * stride)] = me_plane[i - (j * width)]; + dst[filled + i - (j * stride)] = me_plane[i - (j * stride)]; } } } @@ -198,6 +201,9 @@ static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst, } else if(code >= 0xC0) { /* copy code: 0xC0..0xDF */ code &= 0x1F; + if(code + 1 > bytestream2_get_bytes_left(&qctx->buffer)) + break; + for(i = 0; i <= code; i++) { dst[filled++] = bytestream2_get_byte(&qctx->buffer); if(filled >= width) { @@ -251,6 +257,7 @@ static int decode_frame(AVCodecContext *avctx, uint8_t ctable[128]; QpegContext * const a = avctx->priv_data; AVFrame * const p = a->pic; + AVFrame * const ref = a->ref; uint8_t* outdata; int delta, ret; const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); @@ -261,10 +268,12 @@ static int decode_frame(AVCodecContext *avctx, } bytestream2_init(&a->buffer, avpkt->data, avpkt->size); - if ((ret = ff_reget_buffer(avctx, p)) < 0) { - av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); + + av_frame_unref(ref); + av_frame_move_ref(ref, p); + + if ((ret = ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF)) < 0) return ret; - } outdata = p->data[0]; bytestream2_skip(&a->buffer, 4); bytestream2_get_buffer(&a->buffer, ctable, 128); @@ -274,7 +283,7 @@ static int decode_frame(AVCodecContext *avctx, if(delta == 0x10) { qpeg_decode_intra(a, outdata, p->linesize[0], avctx->width, avctx->height); } else { - qpeg_decode_inter(a, outdata, p->linesize[0], avctx->width, avctx->height, delta, ctable, a->refdata); + qpeg_decode_inter(a, outdata, p->linesize[0], avctx->width, avctx->height, delta, ctable, ref->data[0]); } /* make the palette available on the way out */ @@ -292,13 +301,25 @@ static int decode_frame(AVCodecContext *avctx, return avpkt->size; } +static void decode_flush(AVCodecContext *avctx){ + QpegContext * const a = avctx->priv_data; + int i, pal_size; + const uint8_t *pal_src; + + pal_size = FFMIN(1024U, avctx->extradata_size); + pal_src = avctx->extradata + avctx->extradata_size - pal_size; + + for (i=0; i<pal_size/4; i++) + a->pal[i] = 0xFFU<<24 | AV_RL32(pal_src+4*i); +} + static av_cold int decode_end(AVCodecContext *avctx) { QpegContext * const a = avctx->priv_data; av_frame_free(&a->pic); + av_frame_free(&a->ref); - av_free(a->refdata); return 0; } @@ -307,10 +328,12 @@ static av_cold int decode_init(AVCodecContext *avctx){ a->avctx = avctx; avctx->pix_fmt= AV_PIX_FMT_PAL8; - a->refdata = av_malloc(avctx->width * avctx->height); + + decode_flush(avctx); a->pic = av_frame_alloc(); - if (!a->pic) { + a->ref = av_frame_alloc(); + if (!a->pic || !a->ref) { decode_end(avctx); return AVERROR(ENOMEM); } @@ -327,5 +350,6 @@ AVCodec ff_qpeg_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, + .flush = decode_flush, .capabilities = CODEC_CAP_DR1, }; |