X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fv210dec.c;h=74301fe48b89a59613d231cf039494ff27f3988f;hb=e328178da90f44690e0076f4dbfd16da9175f441;hp=da23ec43b9aee0cc046c9ae97dc61d68eebf9130;hpb=ca0bb1c49cfa55dbe5acd8dda5e71252d31147dd;p=ffmpeg diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index da23ec43b9a..74301fe48b8 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -4,79 +4,75 @@ * Copyright (C) 2009 Michael Niedermayer * Copyright (c) 2009 Baptiste Coudurier * - * 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 */ #include "avcodec.h" +#include "internal.h" #include "libavutil/bswap.h" +#include "libavutil/internal.h" +#include "libavutil/mem.h" static av_cold int decode_init(AVCodecContext *avctx) { if (avctx->width & 1) { av_log(avctx, AV_LOG_ERROR, "v210 needs even width\n"); - return -1; + return AVERROR_INVALIDDATA; } - if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) - return -1; - avctx->pix_fmt = PIX_FMT_YUV422P16; + avctx->pix_fmt = AV_PIX_FMT_YUV422P10; avctx->bits_per_raw_sample = 10; - avctx->coded_frame = avcodec_alloc_frame(); - return 0; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) +static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, + AVPacket *avpkt) { - int h, w; - AVFrame *pic = avctx->coded_frame; + int h, w, ret; + AVFrame *pic = data; const uint8_t *psrc = avpkt->data; uint16_t *y, *u, *v; int aligned_width = ((avctx->width + 47) / 48) * 48; int stride = aligned_width * 8 / 3; - if (pic->data[0]) - avctx->release_buffer(avctx, pic); - if (avpkt->size < stride * avctx->height) { av_log(avctx, AV_LOG_ERROR, "packet too small\n"); - return -1; + return AVERROR_INVALIDDATA; } - pic->reference = 0; - if (avctx->get_buffer(avctx, pic) < 0) - return -1; + if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) + return ret; - y = pic->data[0]; - u = pic->data[1]; - v = pic->data[2]; - pic->pict_type = FF_I_TYPE; + y = (uint16_t*)pic->data[0]; + u = (uint16_t*)pic->data[1]; + v = (uint16_t*)pic->data[2]; + pic->pict_type = AV_PICTURE_TYPE_I; pic->key_frame = 1; -#define READ_PIXELS(a, b, c) \ - do { \ - val = le2me_32(*src++); \ - *a++ = val << 6; \ - *b++ = (val >> 4) & 0xFFC0; \ - *c++ = (val >> 14) & 0xFFC0; \ - } while (0); +#define READ_PIXELS(a, b, c) \ + do { \ + val = av_le2ne32(*src++); \ + *a++ = val & 0x3FF; \ + *b++ = (val >> 10) & 0x3FF; \ + *c++ = (val >> 20) & 0x3FF; \ + } while (0) for (h = 0; h < avctx->height; h++) { - const uint32_t *src = psrc; + const uint32_t *src = (const uint32_t*)psrc; uint32_t val; for (w = 0; w < avctx->width - 5; w += 6) { READ_PIXELS(u, y, v); @@ -87,46 +83,35 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac if (w < avctx->width - 1) { READ_PIXELS(u, y, v); - val = le2me_32(*src++); - *y++ = val << 6; + val = av_le2ne32(*src++); + *y++ = val & 0x3FF; } if (w < avctx->width - 3) { - *u++ = (val >> 4) & 0xFFC0; - *y++ = (val >> 14) & 0xFFC0; + *u++ = (val >> 10) & 0x3FF; + *y++ = (val >> 20) & 0x3FF; - val = le2me_32(*src++); - *v++ = val << 6; - *y++ = (val >> 4) & 0xFFC0; + val = av_le2ne32(*src++); + *v++ = val & 0x3FF; + *y++ = (val >> 10) & 0x3FF; } psrc += stride; - y += pic->linesize[0]/2 - avctx->width; - u += pic->linesize[1]/2 - avctx->width/2; - v += pic->linesize[2]/2 - avctx->width/2; + y += pic->linesize[0] / 2 - avctx->width; + u += pic->linesize[1] / 2 - avctx->width / 2; + v += pic->linesize[2] / 2 - avctx->width / 2; } - *data_size = sizeof(AVFrame); - *(AVFrame*)data = *avctx->coded_frame; + *got_frame = 1; return avpkt->size; } -static av_cold int decode_close(AVCodecContext *avctx) -{ - av_freep(&avctx->coded_frame); - - return 0; -} - -AVCodec v210_decoder = { - "v210", - CODEC_TYPE_VIDEO, - CODEC_ID_V210, - 0, - decode_init, - NULL, - decode_close, - decode_frame, - CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), +AVCodec ff_v210_decoder = { + .name = "v210", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_V210, + .init = decode_init, + .decode = decode_frame, + .capabilities = AV_CODEC_CAP_DR1, };