X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcyuv.c;h=f628ba1828c9ae95a7ace3226a23ab6625ce8774;hb=b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f;hp=79a84412e7eb40fd9eb8735fd294f414c786ba10;hpb=d36beb3f6902b1217beda576aa18abf7eb72b03c;p=ffmpeg diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index 79a84412e7e..f628ba1828c 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -6,20 +6,20 @@ * * Copyright (C) 2003 the ffmpeg project * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -33,13 +33,13 @@ #include #include "avcodec.h" -#include "dsputil.h" +#include "internal.h" +#include "libavutil/internal.h" typedef struct CyuvDecodeContext { AVCodecContext *avctx; int width, height; - AVFrame frame; } CyuvDecodeContext; static av_cold int cyuv_decode_init(AVCodecContext *avctx) @@ -50,20 +50,21 @@ static av_cold int cyuv_decode_init(AVCodecContext *avctx) s->width = avctx->width; /* width needs to be divisible by 4 for this codec to work */ if (s->width & 0x3) - return -1; + return AVERROR_INVALIDDATA; s->height = avctx->height; - avctx->pix_fmt = PIX_FMT_YUV411P; + avctx->pix_fmt = AV_PIX_FMT_YUV411P; return 0; } static int cyuv_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; CyuvDecodeContext *s=avctx->priv_data; + AVFrame *frame = data; unsigned char *y_plane; unsigned char *u_plane; @@ -81,8 +82,9 @@ static int cyuv_decode_frame(AVCodecContext *avctx, int stream_ptr; unsigned char cur_byte; int pixel_groups; + int ret; - if (avctx->codec_id == CODEC_ID_AURA) { + if (avctx->codec_id == AV_CODEC_ID_AURA) { y_table = u_table; u_table = v_table; } @@ -93,32 +95,27 @@ static int cyuv_decode_frame(AVCodecContext *avctx, if (buf_size != 48 + s->height * (s->width * 3 / 4)) { av_log(avctx, AV_LOG_ERROR, "got a buffer with %d bytes when %d were expected\n", buf_size, 48 + s->height * (s->width * 3 / 4)); - return -1; + return AVERROR_INVALIDDATA; } /* pixel data starts 48 bytes in, after 3x16-byte tables */ stream_ptr = 48; - if (s->frame.data[0]) - avctx->release_buffer(avctx, &s->frame); - - s->frame.buffer_hints = FF_BUFFER_HINTS_VALID; - s->frame.reference = 0; - if (avctx->get_buffer(avctx, &s->frame) < 0) { + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } - y_plane = s->frame.data[0]; - u_plane = s->frame.data[1]; - v_plane = s->frame.data[2]; + y_plane = frame->data[0]; + u_plane = frame->data[1]; + v_plane = frame->data[2]; /* iterate through each line in the height */ for (y_ptr = 0, u_ptr = 0, v_ptr = 0; - y_ptr < (s->height * s->frame.linesize[0]); - y_ptr += s->frame.linesize[0] - s->width, - u_ptr += s->frame.linesize[1] - s->width / 4, - v_ptr += s->frame.linesize[2] - s->width / 4) { + y_ptr < (s->height * frame->linesize[0]); + y_ptr += frame->linesize[0] - s->width, + u_ptr += frame->linesize[1] - s->width / 4, + v_ptr += frame->linesize[2] - s->width / 4) { /* reset predictors */ cur_byte = buf[stream_ptr++]; @@ -161,50 +158,33 @@ static int cyuv_decode_frame(AVCodecContext *avctx, } } - *data_size=sizeof(AVFrame); - *(AVFrame*)data= s->frame; + *got_frame = 1; return buf_size; } -static av_cold int cyuv_decode_end(AVCodecContext *avctx) -{ - CyuvDecodeContext *s = avctx->priv_data; - - if (s->frame.data[0]) - avctx->release_buffer(avctx, &s->frame); - - return 0; -} - #if CONFIG_AURA_DECODER AVCodec ff_aura_decoder = { - "aura", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_AURA, - sizeof(CyuvDecodeContext), - cyuv_decode_init, - NULL, - cyuv_decode_end, - cyuv_decode_frame, - CODEC_CAP_DR1, - NULL, - .long_name = NULL_IF_CONFIG_SMALL("Auravision AURA"), + .name = "aura", + .long_name = NULL_IF_CONFIG_SMALL("Auravision AURA"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_AURA, + .priv_data_size = sizeof(CyuvDecodeContext), + .init = cyuv_decode_init, + .decode = cyuv_decode_frame, + .capabilities = CODEC_CAP_DR1, }; #endif #if CONFIG_CYUV_DECODER AVCodec ff_cyuv_decoder = { - "cyuv", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_CYUV, - sizeof(CyuvDecodeContext), - cyuv_decode_init, - NULL, - cyuv_decode_end, - cyuv_decode_frame, - CODEC_CAP_DR1, - NULL, - .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"), + .name = "cyuv", + .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_CYUV, + .priv_data_size = sizeof(CyuvDecodeContext), + .init = cyuv_decode_init, + .decode = cyuv_decode_frame, + .capabilities = CODEC_CAP_DR1, }; #endif