Message ID | 20190728182316.8700-1-sw@jkqxz.net |
---|---|
State | Accepted |
Commit | f9b8503639c0ff90846f07c92e2fe7836690dd0c |
Headers | show |
Mark Thompson: > With video_signal_type_present_flag set but colour_description_present_flag > unset the colour fields would not have had their correct values inferred. > --- > libavcodec/cbs_h264_syntax_template.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c > index 26be6e590f..1671a15d33 100644 > --- a/libavcodec/cbs_h264_syntax_template.c > +++ b/libavcodec/cbs_h264_syntax_template.c > @@ -137,6 +137,10 @@ static int FUNC(vui_parameters)(CodedBitstreamContext *ctx, RWContext *rw, > ub(8, colour_primaries); > ub(8, transfer_characteristics); > ub(8, matrix_coefficients); > + } else { > + infer(colour_primaries, 2); > + infer(transfer_characteristics, 2); > + infer(matrix_coefficients, 2); > } > } else { > infer(video_format, 5); > LGTM. And sorry for not catching this before 43a18884. - Andreas
On 29/07/2019 00:31, Andreas Rheinhardt wrote: > Mark Thompson: >> With video_signal_type_present_flag set but colour_description_present_flag >> unset the colour fields would not have had their correct values inferred. >> --- >> libavcodec/cbs_h264_syntax_template.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c >> index 26be6e590f..1671a15d33 100644 >> --- a/libavcodec/cbs_h264_syntax_template.c >> +++ b/libavcodec/cbs_h264_syntax_template.c >> @@ -137,6 +137,10 @@ static int FUNC(vui_parameters)(CodedBitstreamContext *ctx, RWContext *rw, >> ub(8, colour_primaries); >> ub(8, transfer_characteristics); >> ub(8, matrix_coefficients); >> + } else { >> + infer(colour_primaries, 2); >> + infer(transfer_characteristics, 2); >> + infer(matrix_coefficients, 2); >> } >> } else { >> infer(video_format, 5); >> > LGTM. And sorry for not catching this before 43a18884. Both patches applied. Thank you! - Mark
diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index 26be6e590f..1671a15d33 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -137,6 +137,10 @@ static int FUNC(vui_parameters)(CodedBitstreamContext *ctx, RWContext *rw, ub(8, colour_primaries); ub(8, transfer_characteristics); ub(8, matrix_coefficients); + } else { + infer(colour_primaries, 2); + infer(transfer_characteristics, 2); + infer(matrix_coefficients, 2); } } else { infer(video_format, 5);