| Message ID | 20220322215443.19311-1-jeebjp@gmail.com |
|---|---|
| State | Accepted |
| Commit | 51c0b9e829be99093ae8d1e642a8cf99896529b8 |
| Headers | show |
| Series | [FFmpeg-devel,v2] avcodec/libsvtav1: pass color description info | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_aarch64_jetson | success | Make finished |
| andriy/make_fate_aarch64_jetson | success | Make fate finished |
| andriy/make_armv7_RPi4 | success | Make finished |
| andriy/make_fate_armv7_RPi4 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 3/22/2022 6:54 PM, Jan Ekström wrote: > From: Christopher Degawa <ccom@randomderp.com> > > Signed-off-by: Christopher Degawa <ccom@randomderp.com> > --- > libavcodec/libsvtav1.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c > index f02e410f69..6cf280377e 100644 > --- a/libavcodec/libsvtav1.c > +++ b/libavcodec/libsvtav1.c > @@ -228,6 +228,16 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, > return AVERROR(EINVAL); > } > > + param->color_primaries = avctx->color_primaries; > + param->matrix_coefficients = (desc->flags & AV_PIX_FMT_FLAG_RGB) ? > + AVCOL_SPC_RGB : avctx->colorspace; > + param->transfer_characteristics = avctx->color_trc; > + > + if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED) > + param->color_range = avctx->color_range == AVCOL_RANGE_JPEG; > + else > + param->color_range = !!(desc->flags & AV_PIX_FMT_FLAG_RGB); > + > if (avctx->profile != FF_PROFILE_UNKNOWN) > param->profile = avctx->profile; > LGTM
On Wed, Mar 23, 2022 at 2:57 PM James Almer <jamrial@gmail.com> wrote: > > On 3/22/2022 6:54 PM, Jan Ekström wrote: > > From: Christopher Degawa <ccom@randomderp.com> > > > > Signed-off-by: Christopher Degawa <ccom@randomderp.com> > > --- > > libavcodec/libsvtav1.c | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > > > > diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c > > index f02e410f69..6cf280377e 100644 > > --- a/libavcodec/libsvtav1.c > > +++ b/libavcodec/libsvtav1.c > > @@ -228,6 +228,16 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, > > return AVERROR(EINVAL); > > } > > > > + param->color_primaries = avctx->color_primaries; > > + param->matrix_coefficients = (desc->flags & AV_PIX_FMT_FLAG_RGB) ? > > + AVCOL_SPC_RGB : avctx->colorspace; > > + param->transfer_characteristics = avctx->color_trc; > > + > > + if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED) > > + param->color_range = avctx->color_range == AVCOL_RANGE_JPEG; > > + else > > + param->color_range = !!(desc->flags & AV_PIX_FMT_FLAG_RGB); > > + > > if (avctx->profile != FF_PROFILE_UNKNOWN) > > param->profile = avctx->profile; > > > > LGTM Thanks, applied as 51c0b9e829be99093ae8d1e642a8cf99896529b8 . Jan
diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index f02e410f69..6cf280377e 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -228,6 +228,16 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, return AVERROR(EINVAL); } + param->color_primaries = avctx->color_primaries; + param->matrix_coefficients = (desc->flags & AV_PIX_FMT_FLAG_RGB) ? + AVCOL_SPC_RGB : avctx->colorspace; + param->transfer_characteristics = avctx->color_trc; + + if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED) + param->color_range = avctx->color_range == AVCOL_RANGE_JPEG; + else + param->color_range = !!(desc->flags & AV_PIX_FMT_FLAG_RGB); + if (avctx->profile != FF_PROFILE_UNKNOWN) param->profile = avctx->profile;