On Fri, 15 Feb 2013 14:00:35 +0100, Janne Grunau <[email protected]> wrote: > On 2013-01-08 15:36:30 +0100, Anton Khirnov wrote: > > --- > > libavcodec/yop.c | 56 > > ++++++++++++++++++++---------------------------------- > > 1 file changed, 21 insertions(+), 35 deletions(-) > > > > diff --git a/libavcodec/yop.c b/libavcodec/yop.c > > index 69700bd..ee921cd 100644 > > --- a/libavcodec/yop.c > > +++ b/libavcodec/yop.c > > @@ -105,25 +105,17 @@ 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 void 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]]; > > + 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]; > > @@ -133,23 +125,23 @@ static void yop_paint_block(YopDecContext *s, int tag) > > * 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; > > } > > @@ -176,34 +168,32 @@ 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, x, y; > > uint32_t *palette; > > > > - if (s->frame.data[0]) > > - avctx->release_buffer(avctx, &s->frame); > > - > > - ret = ff_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->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->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; > > + frame->palette_has_changed = 1; > > > > for (y = 0; y < avctx->height; y += 2) { > > for (x = 0; x < avctx->width; x += 2) { > > @@ -215,22 +205,19 @@ static int yop_decode_frame(AVCodecContext *avctx, > > void *data, int *got_frame, > > tag = yop_get_next_nibble(s); > > > > if (tag != 0xf) { > > - yop_paint_block(s, tag); > > + yop_paint_block(s, frame->linesize[0], tag); > > } else { > > tag = yop_get_next_nibble(s); > > - ret = yop_copy_previous_block(s, tag); > > - if (ret < 0) { > > - avctx->release_buffer(avctx, &s->frame); > > + ret = yop_copy_previous_block(s, frame->linesize[0], tag); > > + if (ret < 0) > > return ret; > > - } > > } > > s->dstptr += 2; > > } > > - s->dstptr += 2*s->frame.linesize[0] - x; > > + s->dstptr += 2*frame->linesize[0] - x; > > } > > > > *got_frame = 1; > > - *(AVFrame *) data = s->frame; > > return avpkt->size; > > } > > > > @@ -240,7 +227,6 @@ AVCodec ff_yop_decoder = { > > .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, > > unused variable 'frame' in YopDecContext >
fixed locally. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
