| Message ID | 20230124224623.1374077-1-sw@jkqxz.net |
|---|---|
| State | Accepted |
| Commit | bee912cb63d9e391818eaed698e6cc6b97b440f1 |
| Headers | show |
| Series | [FFmpeg-devel,v2,1/4] cbs_av1: Add tracing headers for metadata types | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 1/24/2023 7:46 PM, Mark Thompson wrote: > Make it a little easier to interpret metadata in trace output. > --- > libavcodec/cbs_av1_syntax_template.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c > index e95925a493..817a0f8ae6 100644 > --- a/libavcodec/cbs_av1_syntax_template.c > +++ b/libavcodec/cbs_av1_syntax_template.c > @@ -1843,6 +1843,8 @@ static int FUNC(metadata_hdr_cll)(CodedBitstreamContext *ctx, RWContext *rw, > { > int err; > > + HEADER("HDR CLL Metadata"); > + > fb(16, max_cll); > fb(16, max_fall); > > @@ -1854,6 +1856,8 @@ static int FUNC(metadata_hdr_mdcv)(CodedBitstreamContext *ctx, RWContext *rw, > { > int err, i; > > + HEADER("HDR MDCV Metadata"); > + > for (i = 0; i < 3; i++) { > fbs(16, primary_chromaticity_x[i], 1, i); > fbs(16, primary_chromaticity_y[i], 1, i); > @@ -1920,6 +1924,8 @@ static int FUNC(metadata_scalability)(CodedBitstreamContext *ctx, RWContext *rw, > { > int err; > > + HEADER("Scalability Metadata"); > + > fb(8, scalability_mode_idc); > > if (current->scalability_mode_idc == AV1_SCALABILITY_SS) > @@ -1934,6 +1940,8 @@ static int FUNC(metadata_itut_t35)(CodedBitstreamContext *ctx, RWContext *rw, > int err; > size_t i; > > + HEADER("ITU-T T.35 Metadata"); > + > fb(8, itu_t_t35_country_code); > if (current->itu_t_t35_country_code == 0xff) > fb(8, itu_t_t35_country_code_extension_byte); > @@ -1961,6 +1969,8 @@ static int FUNC(metadata_timecode)(CodedBitstreamContext *ctx, RWContext *rw, > { > int err; > > + HEADER("Timecode Metadata"); > + > fb(5, counting_type); > flag(full_timestamp_flag); > flag(discontinuity_flag); Set LGTM.
On 23/02/2023 13:14, James Almer wrote: > On 1/24/2023 7:46 PM, Mark Thompson wrote: >> Make it a little easier to interpret metadata in trace output. >> --- >> libavcodec/cbs_av1_syntax_template.c | 10 ++++++++++ >> 1 file changed, 10 insertions(+) >> >> ... > > Set LGTM. Set applied. (Apologies for the delay in getting back to this :) Thanks, - Mark
diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index e95925a493..817a0f8ae6 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1843,6 +1843,8 @@ static int FUNC(metadata_hdr_cll)(CodedBitstreamContext *ctx, RWContext *rw, { int err; + HEADER("HDR CLL Metadata"); + fb(16, max_cll); fb(16, max_fall); @@ -1854,6 +1856,8 @@ static int FUNC(metadata_hdr_mdcv)(CodedBitstreamContext *ctx, RWContext *rw, { int err, i; + HEADER("HDR MDCV Metadata"); + for (i = 0; i < 3; i++) { fbs(16, primary_chromaticity_x[i], 1, i); fbs(16, primary_chromaticity_y[i], 1, i); @@ -1920,6 +1924,8 @@ static int FUNC(metadata_scalability)(CodedBitstreamContext *ctx, RWContext *rw, { int err; + HEADER("Scalability Metadata"); + fb(8, scalability_mode_idc); if (current->scalability_mode_idc == AV1_SCALABILITY_SS) @@ -1934,6 +1940,8 @@ static int FUNC(metadata_itut_t35)(CodedBitstreamContext *ctx, RWContext *rw, int err; size_t i; + HEADER("ITU-T T.35 Metadata"); + fb(8, itu_t_t35_country_code); if (current->itu_t_t35_country_code == 0xff) fb(8, itu_t_t35_country_code_extension_byte); @@ -1961,6 +1969,8 @@ static int FUNC(metadata_timecode)(CodedBitstreamContext *ctx, RWContext *rw, { int err; + HEADER("Timecode Metadata"); + fb(5, counting_type); flag(full_timestamp_flag); flag(discontinuity_flag);