Message ID | 20200820022409.1662424-1-mjbshaw@google.com |
---|---|
State | Accepted |
Headers | show |
Series | [FFmpeg-devel] avcodec/proresenc: add support for PQ and HLG | expand |
Context | Check | Description |
---|---|---|
andriy/default | pending | |
andriy/make_warn | warning | New warnings during build |
andriy/make | success | Make finished |
andriy/make_fate | success | Make fate finished |
On Wed, Aug 19, 2020 at 8:24 PM Michael Bradshaw <mjbshaw@google.com> wrote: > Signed-off-by: Michael Bradshaw <mjbshaw@google.com> > --- > libavcodec/proresenc_anatoliy.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/proresenc_anatoliy.c > b/libavcodec/proresenc_anatoliy.c > index 1128978330..3aa18a3ca4 100644 > --- a/libavcodec/proresenc_anatoliy.c > +++ b/libavcodec/proresenc_anatoliy.c > @@ -55,7 +55,8 @@ static const int bitrate_table[6] = { 1000, 2100, 3500, > 5400, 7000, 10000}; > > static const int valid_primaries[9] = { AVCOL_PRI_RESERVED0, > AVCOL_PRI_BT709, AVCOL_PRI_UNSPECIFIED, AVCOL_PRI_BT470BG, > AVCOL_PRI_SMPTE170M, > AVCOL_PRI_BT2020, AVCOL_PRI_SMPTE431, AVCOL_PRI_SMPTE432,INT_MAX }; > -static const int valid_trc[4] = { AVCOL_TRC_RESERVED0, > AVCOL_TRC_BT709, AVCOL_TRC_UNSPECIFIED, INT_MAX }; > +static const int valid_trc[4] = { AVCOL_TRC_RESERVED0, > AVCOL_TRC_BT709, AVCOL_TRC_UNSPECIFIED, AVCOL_TRC_SMPTE2084, > Should be [6], not [4]. Will send an updated patch. + AVCOL_TRC_ARIB_STD_B67, INT_MAX }; > static const int valid_colorspace[5] = { AVCOL_SPC_BT709, > AVCOL_SPC_UNSPECIFIED, AVCOL_SPC_SMPTE170M, > AVCOL_SPC_BT2020_NCL, INT_MAX }; > > -- > 2.28.0.220.ged08abb693-goog > >
diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 1128978330..3aa18a3ca4 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -55,7 +55,8 @@ static const int bitrate_table[6] = { 1000, 2100, 3500, 5400, 7000, 10000}; static const int valid_primaries[9] = { AVCOL_PRI_RESERVED0, AVCOL_PRI_BT709, AVCOL_PRI_UNSPECIFIED, AVCOL_PRI_BT470BG, AVCOL_PRI_SMPTE170M, AVCOL_PRI_BT2020, AVCOL_PRI_SMPTE431, AVCOL_PRI_SMPTE432,INT_MAX }; -static const int valid_trc[4] = { AVCOL_TRC_RESERVED0, AVCOL_TRC_BT709, AVCOL_TRC_UNSPECIFIED, INT_MAX }; +static const int valid_trc[4] = { AVCOL_TRC_RESERVED0, AVCOL_TRC_BT709, AVCOL_TRC_UNSPECIFIED, AVCOL_TRC_SMPTE2084, + AVCOL_TRC_ARIB_STD_B67, INT_MAX }; static const int valid_colorspace[5] = { AVCOL_SPC_BT709, AVCOL_SPC_UNSPECIFIED, AVCOL_SPC_SMPTE170M, AVCOL_SPC_BT2020_NCL, INT_MAX };
Signed-off-by: Michael Bradshaw <mjbshaw@google.com> --- libavcodec/proresenc_anatoliy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)