diff options
Diffstat (limited to 'libavcodec/libvpxdec.c')
| -rw-r--r-- | libavcodec/libvpxdec.c | 137 |
1 files changed, 126 insertions, 11 deletions
diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index 28b7733969..adbc6d0991 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -1,20 +1,20 @@ /* * Copyright (c) 2010, Google, Inc. * - * 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 */ @@ -32,6 +32,7 @@ #include "avcodec.h" #include "internal.h" #include "libvpx.h" +#include "profiles.h" typedef struct VP8DecoderContext { struct vpx_codec_ctx decoder; @@ -59,6 +60,114 @@ static av_cold int vpx_init(AVCodecContext *avctx, return 0; } +// returns 0 on success, AVERROR_INVALIDDATA otherwise +static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img) +{ +#if VPX_IMAGE_ABI_VERSION >= 3 + static const enum AVColorSpace colorspaces[8] = { + AVCOL_SPC_UNSPECIFIED, AVCOL_SPC_BT470BG, AVCOL_SPC_BT709, AVCOL_SPC_SMPTE170M, + AVCOL_SPC_SMPTE240M, AVCOL_SPC_BT2020_NCL, AVCOL_SPC_RESERVED, AVCOL_SPC_RGB, + }; +#if VPX_IMAGE_ABI_VERSION >= 4 + static const enum AVColorRange color_ranges[] = { + AVCOL_RANGE_MPEG, AVCOL_RANGE_JPEG + }; + avctx->color_range = color_ranges[img->range]; +#endif + avctx->colorspace = colorspaces[img->cs]; +#endif + if (avctx->codec_id == AV_CODEC_ID_VP8 && img->fmt != VPX_IMG_FMT_I420) + return AVERROR_INVALIDDATA; + switch (img->fmt) { + case VPX_IMG_FMT_I420: + if (avctx->codec_id == AV_CODEC_ID_VP9) + avctx->profile = FF_PROFILE_VP9_0; + avctx->pix_fmt = AV_PIX_FMT_YUV420P; + return 0; +#if CONFIG_LIBVPX_VP9_DECODER + case VPX_IMG_FMT_I422: + avctx->profile = FF_PROFILE_VP9_1; + avctx->pix_fmt = AV_PIX_FMT_YUV422P; + return 0; +#if VPX_IMAGE_ABI_VERSION >= 3 + case VPX_IMG_FMT_I440: + avctx->profile = FF_PROFILE_VP9_1; + avctx->pix_fmt = AV_PIX_FMT_YUV440P; + return 0; +#endif + case VPX_IMG_FMT_I444: + avctx->profile = FF_PROFILE_VP9_1; +#if VPX_IMAGE_ABI_VERSION >= 3 + avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? + AV_PIX_FMT_GBRP : AV_PIX_FMT_YUV444P; +#else + avctx->pix_fmt = AV_PIX_FMT_YUV444P; +#endif + return 0; +#ifdef VPX_IMG_FMT_HIGHBITDEPTH + case VPX_IMG_FMT_I42016: + avctx->profile = FF_PROFILE_VP9_2; + if (img->bit_depth == 10) { + avctx->pix_fmt = AV_PIX_FMT_YUV420P10; + return 0; + } else if (img->bit_depth == 12) { + avctx->pix_fmt = AV_PIX_FMT_YUV420P12; + return 0; + } else { + return AVERROR_INVALIDDATA; + } + case VPX_IMG_FMT_I42216: + avctx->profile = FF_PROFILE_VP9_3; + if (img->bit_depth == 10) { + avctx->pix_fmt = AV_PIX_FMT_YUV422P10; + return 0; + } else if (img->bit_depth == 12) { + avctx->pix_fmt = AV_PIX_FMT_YUV422P12; + return 0; + } else { + return AVERROR_INVALIDDATA; + } +#if VPX_IMAGE_ABI_VERSION >= 3 + case VPX_IMG_FMT_I44016: + avctx->profile = FF_PROFILE_VP9_3; + if (img->bit_depth == 10) { + avctx->pix_fmt = AV_PIX_FMT_YUV440P10; + return 0; + } else if (img->bit_depth == 12) { + avctx->pix_fmt = AV_PIX_FMT_YUV440P12; + return 0; + } else { + return AVERROR_INVALIDDATA; + } +#endif + case VPX_IMG_FMT_I44416: + avctx->profile = FF_PROFILE_VP9_3; + if (img->bit_depth == 10) { +#if VPX_IMAGE_ABI_VERSION >= 3 + avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? + AV_PIX_FMT_GBRP10 : AV_PIX_FMT_YUV444P10; +#else + avctx->pix_fmt = AV_PIX_FMT_YUV444P10; +#endif + return 0; + } else if (img->bit_depth == 12) { +#if VPX_IMAGE_ABI_VERSION >= 3 + avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? + AV_PIX_FMT_GBRP12 : AV_PIX_FMT_YUV444P12; +#else + avctx->pix_fmt = AV_PIX_FMT_YUV444P12; +#endif + return 0; + } else { + return AVERROR_INVALIDDATA; + } +#endif +#endif + default: + return AVERROR_INVALIDDATA; + } +} + static int vp8_decode(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { @@ -81,11 +190,15 @@ static int vp8_decode(AVCodecContext *avctx, } if ((img = vpx_codec_get_frame(&ctx->decoder, &iter))) { - avctx->pix_fmt = ff_vpx_imgfmt_to_pixfmt(img->fmt); - if (avctx->pix_fmt == AV_PIX_FMT_NONE) { - av_log(avctx, AV_LOG_ERROR, "Unsupported output colorspace (%d)\n", - img->fmt); - return AVERROR_INVALIDDATA; + if ((ret = set_pix_fmt(avctx, img)) < 0) { +#ifdef VPX_IMG_FMT_HIGHBITDEPTH + av_log(avctx, AV_LOG_ERROR, "Unsupported output colorspace (%d) / bit_depth (%d)\n", + img->fmt, img->bit_depth); +#else + av_log(avctx, AV_LOG_ERROR, "Unsupported output colorspace (%d) / bit_depth (%d)\n", + img->fmt, 8); +#endif + return ret; } if ((int) img->d_w != avctx->width || (int) img->d_h != avctx->height) { @@ -97,7 +210,7 @@ static int vp8_decode(AVCodecContext *avctx, } if ((ret = ff_get_buffer(avctx, picture, 0)) < 0) return ret; - av_image_copy(picture->data, picture->linesize, img->planes, + av_image_copy(picture->data, picture->linesize, (const uint8_t **)img->planes, img->stride, avctx->pix_fmt, img->d_w, img->d_h); *got_frame = 1; } @@ -145,6 +258,8 @@ AVCodec ff_libvpx_vp9_decoder = { .init = vp9_init, .close = vp8_free, .decode = vp8_decode, - .capabilities = AV_CODEC_CAP_AUTO_THREADS, + .capabilities = AV_CODEC_CAP_AUTO_THREADS | AV_CODEC_CAP_DR1, + .init_static_data = ff_vp9_init_static, + .profiles = NULL_IF_CONFIG_SMALL(ff_vp9_profiles), }; #endif /* CONFIG_LIBVPX_VP9_DECODER */ |