RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-07 01:32:19 +00:00
Code Issues Projects Releases Wiki Activity

lavc/libvpx: Fix support for RGB colorspace.

Browse Source 
Reported and tested by Nicolas George.
Fixes ticket .
This commit is contained in:
Carl Eugen Hoyos 2016-02-19 21:06:26 +01:00
parent 84d7933e3b
commit 432be6362c
3 changed files with 23 additions and 2 deletions

8
libavcodec/libvpx.c
View File

@ -38,6 +38,9 @@ static const enum AVPixelFormat vp9_pix_fmts_highcol[] = {
AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P,
AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV440P,
AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P,
#if VPX_IMAGE_ABI_VERSION >= 3
AV_PIX_FMT_GBRP,
#endif
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
@ -54,6 +57,11 @@ static const enum AVPixelFormat vp9_pix_fmts_highbd[] = {
AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV422P12,
AV_PIX_FMT_YUV440P12, AV_PIX_FMT_YUV440P12,
AV_PIX_FMT_YUV444P12, 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 AV_PIX_FMT_NONE
}; };
#endif #endif

15
libavcodec/libvpxenc.c
View File

@ -106,6 +106,7 @@ typedef struct VP8EncoderContext {
int aq_mode; int aq_mode;
int drop_threshold; int drop_threshold;
int noise_sensitivity; int noise_sensitivity;
int vpx_cs;
} VP8Context; } VP8Context;
/** String mappings for enum vp8e_enc_control_id */ /** 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, struct vpx_codec_enc_cfg *enccfg, vpx_codec_flags_t *flags,
vpx_img_fmt_t *img_fmt) vpx_img_fmt_t *img_fmt)
{ {
VP8Context *ctx = avctx->priv_data;
#ifdef VPX_IMG_FMT_HIGHBITDEPTH #ifdef VPX_IMG_FMT_HIGHBITDEPTH
enccfg->g_bit_depth = enccfg->g_input_bit_depth = 8; enccfg->g_bit_depth = enccfg->g_input_bit_depth = 8;
#endif #endif
@ -294,6 +296,8 @@ static int set_pix_fmt(AVCodecContext *avctx, vpx_codec_caps_t codec_caps,
enccfg->g_profile = 1; enccfg->g_profile = 1;
*img_fmt = VPX_IMG_FMT_I440; *img_fmt = VPX_IMG_FMT_I440;
return 0; return 0;
case AV_PIX_FMT_GBRP:
ctx->vpx_cs = VPX_CS_SRGB;
#endif #endif
case AV_PIX_FMT_YUV444P: case AV_PIX_FMT_YUV444P:
enccfg->g_profile = 1; enccfg->g_profile = 1;
@ -334,12 +338,16 @@ static int set_pix_fmt(AVCodecContext *avctx, vpx_codec_caps_t codec_caps,
return 0; return 0;
} }
break; break;
case AV_PIX_FMT_GBRP10:
case AV_PIX_FMT_GBRP12:
ctx->vpx_cs = VPX_CS_SRGB;
#endif #endif
case AV_PIX_FMT_YUV444P10: case AV_PIX_FMT_YUV444P10:
case AV_PIX_FMT_YUV444P12: case AV_PIX_FMT_YUV444P12:
if (codec_caps & VPX_CODEC_CAP_HIGHBITDEPTH) { if (codec_caps & VPX_CODEC_CAP_HIGHBITDEPTH) {
enccfg->g_bit_depth = enccfg->g_input_bit_depth = 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; enccfg->g_profile = 3;
*img_fmt = VPX_IMG_FMT_I44416; *img_fmt = VPX_IMG_FMT_I44416;
*flags |= VPX_CODEC_USE_HIGHBITDEPTH; *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) static void set_colorspace(AVCodecContext *avctx)
{ {
enum vpx_color_space vpx_cs; enum vpx_color_space vpx_cs;
VP8Context *ctx = avctx->priv_data;
if (ctx->vpx_cs) {
vpx_cs = ctx->vpx_cs;
} else {
switch (avctx->colorspace) { switch (avctx->colorspace) {
case AVCOL_SPC_RGB: vpx_cs = VPX_CS_SRGB; break; case AVCOL_SPC_RGB: vpx_cs = VPX_CS_SRGB; break;
case AVCOL_SPC_BT709: vpx_cs = VPX_CS_BT_709; break; case AVCOL_SPC_BT709: vpx_cs = VPX_CS_BT_709; break;
@ -373,6 +385,7 @@ static void set_colorspace(AVCodecContext *avctx)
avctx->colorspace); avctx->colorspace);
return; return;
} }
}
codecctl_int(avctx, VP9E_SET_COLOR_SPACE, vpx_cs); codecctl_int(avctx, VP9E_SET_COLOR_SPACE, vpx_cs);
} }
#endif #endif

2
libavcodec/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 24 #define LIBAVCODEC_VERSION_MINOR 24
#define LIBAVCODEC_VERSION_MICRO 104 #define LIBAVCODEC_VERSION_MICRO 105
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \