X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fyop.c;h=3434fd9808b323d0728d48f325bcea140bcf2fe1;hb=b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f;hp=d142f3bc18aab3ead5370f1b95b552fcf6ecdfb5;hpb=36ef5369ee9b336febc2c270f8718cec4476cb85;p=ffmpeg diff --git a/libavcodec/yop.c b/libavcodec/yop.c index d142f3bc18a..3434fd9808b 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -27,18 +27,18 @@ #include "avcodec.h" #include "get_bits.h" +#include "internal.h" typedef struct YopDecContext { - AVFrame frame; AVCodecContext *avctx; int num_pal_colors; int first_color[2]; int frame_data_length; - int row_pos; uint8_t *low_nibble; uint8_t *srcptr; + uint8_t *src_end; uint8_t *dstptr; uint8_t *dstbuf; } YopDecContext; @@ -86,10 +86,15 @@ static av_cold int yop_decode_init(AVCodecContext *avctx) if (avctx->width & 1 || avctx->height & 1 || av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) { av_log(avctx, AV_LOG_ERROR, "YOP has invalid dimensions\n"); - return -1; + return AVERROR_INVALIDDATA; + } + + if (avctx->extradata_size < 3) { + av_log(avctx, AV_LOG_ERROR, "Missing or incomplete extradata.\n"); + return AVERROR_INVALIDDATA; } - avctx->pix_fmt = PIX_FMT_PAL8; + avctx->pix_fmt = AV_PIX_FMT_PAL8; s->num_pal_colors = avctx->extradata[0]; s->first_color[0] = avctx->extradata[1]; @@ -105,51 +110,49 @@ static av_cold int yop_decode_init(AVCodecContext *avctx) return 0; } -static av_cold int yop_decode_close(AVCodecContext *avctx) -{ - YopDecContext *s = avctx->priv_data; - if (s->frame.data[0]) - avctx->release_buffer(avctx, &s->frame); - return 0; -} - /** * Paint a macroblock using the pattern in paint_lut. * @param s codec context * @param tag the tag that was in the nibble */ -static void yop_paint_block(YopDecContext *s, int tag) +static int yop_paint_block(YopDecContext *s, int linesize, int tag) { - s->dstptr[0] = s->srcptr[0]; - s->dstptr[1] = s->srcptr[paint_lut[tag][0]]; - s->dstptr[s->frame.linesize[0]] = s->srcptr[paint_lut[tag][1]]; - s->dstptr[s->frame.linesize[0] + 1] = s->srcptr[paint_lut[tag][2]]; + if (s->src_end - s->srcptr < paint_lut[tag][3]) { + av_log(s->avctx, AV_LOG_ERROR, "Packet too small.\n"); + return AVERROR_INVALIDDATA; + } + + s->dstptr[0] = s->srcptr[0]; + s->dstptr[1] = s->srcptr[paint_lut[tag][0]]; + s->dstptr[linesize] = s->srcptr[paint_lut[tag][1]]; + s->dstptr[linesize + 1] = s->srcptr[paint_lut[tag][2]]; // The number of src bytes consumed is in the last part of the lut entry. s->srcptr += paint_lut[tag][3]; + return 0; } /** * Copy a previously painted macroblock to the current_block. * @param copy_tag the tag that was in the nibble */ -static int yop_copy_previous_block(YopDecContext *s, int copy_tag) +static int yop_copy_previous_block(YopDecContext *s, int linesize, int copy_tag) { uint8_t *bufptr; // Calculate position for the copy source bufptr = s->dstptr + motion_vector[copy_tag][0] + - s->frame.linesize[0] * motion_vector[copy_tag][1]; + linesize * motion_vector[copy_tag][1]; if (bufptr < s->dstbuf) { av_log(s->avctx, AV_LOG_ERROR, "YOP: cannot decode, file probably corrupt\n"); return AVERROR_INVALIDDATA; } - s->dstptr[0] = bufptr[0]; - s->dstptr[1] = bufptr[1]; - s->dstptr[s->frame.linesize[0]] = bufptr[s->frame.linesize[0]]; - s->dstptr[s->frame.linesize[0] + 1] = bufptr[s->frame.linesize[0] + 1]; + s->dstptr[0] = bufptr[0]; + s->dstptr[1] = bufptr[1]; + s->dstptr[linesize] = bufptr[linesize]; + s->dstptr[linesize + 1] = bufptr[linesize + 1]; return 0; } @@ -172,88 +175,81 @@ static uint8_t yop_get_next_nibble(YopDecContext *s) return ret; } -/** - * Take s->dstptr to the next macroblock in sequence. - */ -static void yop_next_macroblock(YopDecContext *s) -{ - // If we are advancing to the next row of macroblocks - if (s->row_pos == s->frame.linesize[0] - 2) { - s->dstptr += s->frame.linesize[0]; - s->row_pos = 0; - }else { - s->row_pos += 2; - } - s->dstptr += 2; -} - -static int yop_decode_frame(AVCodecContext *avctx, void *data, int *data_size, +static int yop_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { YopDecContext *s = avctx->priv_data; + AVFrame *frame = data; int tag, firstcolor, is_odd_frame; - int ret, i; + int ret, i, x, y; uint32_t *palette; - if (s->frame.data[0]) - avctx->release_buffer(avctx, &s->frame); + if (avpkt->size < 4 + 3 * s->num_pal_colors) { + av_log(avctx, AV_LOG_ERROR, "Packet too small.\n"); + return AVERROR_INVALIDDATA; + } - ret = avctx->get_buffer(avctx, &s->frame); + ret = ff_get_buffer(avctx, frame, 0); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - s->frame.linesize[0] = avctx->width; + if (!avctx->frame_number) + memset(frame->data[1], 0, AVPALETTE_SIZE); - s->dstbuf = s->frame.data[0]; - s->dstptr = s->frame.data[0]; + s->dstbuf = frame->data[0]; + s->dstptr = frame->data[0]; s->srcptr = avpkt->data + 4; - s->row_pos = 0; + s->src_end = avpkt->data + avpkt->size; s->low_nibble = NULL; is_odd_frame = avpkt->data[0]; firstcolor = s->first_color[is_odd_frame]; - palette = (uint32_t *)s->frame.data[1]; + palette = (uint32_t *)frame->data[1]; for (i = 0; i < s->num_pal_colors; i++, s->srcptr += 3) palette[i + firstcolor] = (s->srcptr[0] << 18) | (s->srcptr[1] << 10) | (s->srcptr[2] << 2); - s->frame.palette_has_changed = 1; - - while (s->dstptr - s->dstbuf < - avctx->width * avctx->height && - s->srcptr - avpkt->data < avpkt->size) { + frame->palette_has_changed = 1; - tag = yop_get_next_nibble(s); + for (y = 0; y < avctx->height; y += 2) { + for (x = 0; x < avctx->width; x += 2) { + if (s->srcptr - avpkt->data >= avpkt->size) { + av_log(avctx, AV_LOG_ERROR, "Packet too small.\n"); + return AVERROR_INVALIDDATA; + } - if (tag != 0xf) { - yop_paint_block(s, tag); - }else { tag = yop_get_next_nibble(s); - ret = yop_copy_previous_block(s, tag); - if (ret < 0) { - avctx->release_buffer(avctx, &s->frame); - return ret; + + if (tag != 0xf) { + ret = yop_paint_block(s, frame->linesize[0], tag); + if (ret < 0) + return ret; + } else { + tag = yop_get_next_nibble(s); + ret = yop_copy_previous_block(s, frame->linesize[0], tag); + if (ret < 0) + return ret; } + s->dstptr += 2; } - yop_next_macroblock(s); + s->dstptr += 2*frame->linesize[0] - x; } - *data_size = sizeof(AVFrame); - *(AVFrame *) data = s->frame; + *got_frame = 1; return avpkt->size; } AVCodec ff_yop_decoder = { .name = "yop", + .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_YOP, .priv_data_size = sizeof(YopDecContext), .init = yop_decode_init, - .close = yop_decode_close, .decode = yop_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"), + .capabilities = CODEC_CAP_DR1, };