| Message ID | 20200820023625.1667627-1-mjbshaw@google.com |
|---|---|
| State | Accepted |
| Commit | b30f737f7af5385d55b877b41737852d487f5ab1 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/proresenc: add support for PQ and HLG | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
> On Aug 20, 2020, at 10:36 AM, Michael Bradshaw <mjbshaw-at-google.com@ffmpeg.org> 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..3005db0bb4 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[6] = { AVCOL_TRC_RESERVED0, AVCOL_TRC_BT709, AVCOL_TRC_UNSPECIFIED, AVCOL_TRC_SMPTE2084, > + AVCOL_TRC_ARIB_STD_B67, INT_MAX }; For future-proof, how about remove the array size? > 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 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Wed, Aug 19, 2020 at 9:23 PM zhilizhao <quinkblack@foxmail.com> wrote: > > -static const int valid_trc[4] = { AVCOL_TRC_RESERVED0, > AVCOL_TRC_BT709, AVCOL_TRC_UNSPECIFIED, INT_MAX }; > > +static const int valid_trc[6] = { AVCOL_TRC_RESERVED0, > AVCOL_TRC_BT709, AVCOL_TRC_UNSPECIFIED, AVCOL_TRC_SMPTE2084, > > + AVCOL_TRC_ARIB_STD_B67, > INT_MAX }; > > For future-proof, how about remove the array size? Sure, but maybe as a follow-up patch? I'd like to remove the array size from all of the arrays, but I don't want this particular patch to grow beyond its original scope.
On Thu, Aug 20, 2020 at 10:45 AM Michael Bradshaw <mjbshaw@google.com> wrote: > On Wed, Aug 19, 2020 at 9:23 PM zhilizhao <quinkblack@foxmail.com> wrote: > >> > -static const int valid_trc[4] = { AVCOL_TRC_RESERVED0, >> AVCOL_TRC_BT709, AVCOL_TRC_UNSPECIFIED, INT_MAX }; >> > +static const int valid_trc[6] = { AVCOL_TRC_RESERVED0, >> AVCOL_TRC_BT709, AVCOL_TRC_UNSPECIFIED, AVCOL_TRC_SMPTE2084, >> > + AVCOL_TRC_ARIB_STD_B67, >> INT_MAX }; >> >> For future-proof, how about remove the array size? > > > Sure, but maybe as a follow-up patch? I'd like to remove the array size > from all of the arrays, but I don't want this particular patch to grow > beyond its original scope. > Pushed this patch. I sent out another patch to remove the array size and instead infer it.
diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 1128978330..3005db0bb4 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[6] = { 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(-)