apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-22 00:20:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

libvpx: Support setting color range for vp9.

Browse Source 
Pass through color range to vp9 encoder. Parse color range in libvpxdec.c.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Sasi Inguva
2016-01-09 12:48:49 -03:00
committed by James Almer
parent 2039b3e751
commit cbcc88c039
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/libvpxenc.c
View File

@@ -125,6 +125,9 @@ static const char *const ctlidstr[] = {
#if VPX_ENCODER_ABI_VERSION > 8
[VP9E_SET_COLOR_SPACE] = "VP9E_SET_COLOR_SPACE",
#endif
#if VPX_ENCODER_ABI_VERSION >= 11
[VP9E_SET_COLOR_RANGE] = "VP9E_SET_COLOR_RANGE",
#endif
#endif
};
@@ -368,6 +371,24 @@ static void set_colorspace(AVCodecContext *avctx)
codecctl_int(avctx, VP9E_SET_COLOR_SPACE, vpx_cs);
}
#endif
#if VPX_ENCODER_ABI_VERSION >= 11
static void set_color_range(AVCodecContext *avctx)
{
enum vpx_color_range vpx_cr;
switch (avctx->color_range) {
case AVCOL_RANGE_UNSPECIFIED:
case AVCOL_RANGE_MPEG: vpx_cr = VPX_CR_STUDIO_RANGE; break;
case AVCOL_RANGE_JPEG: vpx_cr = VPX_CR_FULL_RANGE; break;
default:
av_log(avctx, AV_LOG_WARNING, "Unsupported color range (%d)\n",
avctx->color_range);
return;
}
codecctl_int(avctx, VP9E_SET_COLOR_RANGE, vpx_cr);
}
#endif
#endif
static av_cold int vpx_init(AVCodecContext *avctx,
@@ -616,6 +637,9 @@ static av_cold int vpx_init(AVCodecContext *avctx,
codecctl_int(avctx, VP9E_SET_AQ_MODE, ctx->aq_mode);
#if VPX_ENCODER_ABI_VERSION > 8
set_colorspace(avctx);
#endif
#if VPX_ENCODER_ABI_VERSION >= 11
set_color_range(avctx);
#endif
}
#endif