[FFmpeg-devel] [PATCH] lavc/libvpx: fix support for RGB colorspace.
Carl Eugen Hoyos
cehoyos at ag.or.at
Fri Feb 19 00:34:56 CET 2016
On Friday 19 February 2016 12:18:06 am James Almer wrote:
> On 2/18/2016 8:10 PM, James Almer wrote:
> > On 2/18/2016 7:59 PM, Carl Eugen Hoyos wrote:
> >> + case AV_PIX_FMT_GBRP:
> >> + ctx->vpx_cs = VPX_CS_SRGB;
> >
> > This is only available since libvpx 1.4.0, so you need to wrap all this
> > new code inside some preprocessor checks. I think VPX_IMAGE_ABI_VERSION
> > >= 3 should do it, but better wait for James Zern for confirmation.
Of course, new patch attached (depends on the BE fix).
> Alternatively we could bump the minimum required version and remove most of
> the existing checks. 1.3.0 is pretty old by now and it would let us clean
> these files.
I would prefer if this could be done independently (and afterwards).
Thank you for the review, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/libvpx.c b/libavcodec/libvpx.c
index a60d186..58e98e6 100644
--- a/libavcodec/libvpx.c
+++ b/libavcodec/libvpx.c
@@ -38,6 +38,9 @@ static const enum AVPixelFormat vp9_pix_fmts_highcol[] = {
AV_PIX_FMT_YUV422P,
AV_PIX_FMT_YUV440P,
AV_PIX_FMT_YUV444P,
+#if VPX_IMAGE_ABI_VERSION >= 3
+ AV_PIX_FMT_GBRP,
+#endif
AV_PIX_FMT_NONE
};
@@ -54,6 +57,11 @@ static const enum AVPixelFormat vp9_pix_fmts_highbd[] = {
AV_PIX_FMT_YUV422P12,
AV_PIX_FMT_YUV440P12,
AV_PIX_FMT_YUV444P12,
+#if VPX_IMAGE_ABI_VERSION >= 3
+ AV_PIX_FMT_GBRP,
+ AV_PIX_FMT_GBRP10,
+ AV_PIX_FMT_GBRP12,
+#endif
AV_PIX_FMT_NONE
};
#endif
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 8992497..5417aea 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -106,6 +106,7 @@ typedef struct VP8EncoderContext {
int aq_mode;
int drop_threshold;
int noise_sensitivity;
+ int vpx_cs;
} VP8Context;
/** String mappings for enum vp8e_enc_control_id */
@@ -277,6 +278,7 @@ static int set_pix_fmt(AVCodecContext *avctx, vpx_codec_caps_t codec_caps,
struct vpx_codec_enc_cfg *enccfg, vpx_codec_flags_t *flags,
vpx_img_fmt_t *img_fmt)
{
+ VP8Context *ctx = avctx->priv_data;
#ifdef VPX_IMG_FMT_HIGHBITDEPTH
enccfg->g_bit_depth = enccfg->g_input_bit_depth = 8;
#endif
@@ -294,6 +296,8 @@ static int set_pix_fmt(AVCodecContext *avctx, vpx_codec_caps_t codec_caps,
enccfg->g_profile = 1;
*img_fmt = VPX_IMG_FMT_I440;
return 0;
+ case AV_PIX_FMT_GBRP:
+ ctx->vpx_cs = VPX_CS_SRGB;
#endif
case AV_PIX_FMT_YUV444P:
enccfg->g_profile = 1;
@@ -334,12 +338,16 @@ static int set_pix_fmt(AVCodecContext *avctx, vpx_codec_caps_t codec_caps,
return 0;
}
break;
+ case AV_PIX_FMT_GBRP10:
+ case AV_PIX_FMT_GBRP12:
+ ctx->vpx_cs = VPX_CS_SRGB;
#endif
case AV_PIX_FMT_YUV444P10:
case AV_PIX_FMT_YUV444P12:
if (codec_caps & VPX_CODEC_CAP_HIGHBITDEPTH) {
enccfg->g_bit_depth = enccfg->g_input_bit_depth =
- avctx->pix_fmt == AV_PIX_FMT_YUV444P10 ? 10 : 12;
+ avctx->pix_fmt == AV_PIX_FMT_YUV444P10 ||
+ avctx->pix_fmt == AV_PIX_FMT_GBRP10 ? 10 : 12;
enccfg->g_profile = 3;
*img_fmt = VPX_IMG_FMT_I44416;
*flags |= VPX_CODEC_USE_HIGHBITDEPTH;
@@ -358,7 +366,11 @@ static int set_pix_fmt(AVCodecContext *avctx, vpx_codec_caps_t codec_caps,
static void set_colorspace(AVCodecContext *avctx)
{
enum vpx_color_space vpx_cs;
+ VP8Context *ctx = avctx->priv_data;
+ if (ctx->vpx_cs) {
+ vpx_cs = ctx->vpx_cs;
+ } else {
switch (avctx->colorspace) {
case AVCOL_SPC_RGB: vpx_cs = VPX_CS_SRGB; break;
case AVCOL_SPC_BT709: vpx_cs = VPX_CS_BT_709; break;
@@ -373,6 +385,7 @@ static void set_colorspace(AVCodecContext *avctx)
avctx->colorspace);
return;
}
+ }
codecctl_int(avctx, VP9E_SET_COLOR_SPACE, vpx_cs);
}
#endif
More information about the ffmpeg-devel
mailing list