| Message ID | 20181027213950.27048-1-sw@jkqxz.net |
|---|---|
| State | Accepted |
| Commit | 30fcc10937966cd24b253d4b8267c455f2212b8a |
| Headers | show |
On 10/27/2018 6:39 PM, Mark Thompson wrote: > --- > libavcodec/cbs_h264_syntax_template.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c > index 9e29132fec..dbf9ff1268 100644 > --- a/libavcodec/cbs_h264_syntax_template.c > +++ b/libavcodec/cbs_h264_syntax_template.c > @@ -513,6 +513,8 @@ static int FUNC(sei_buffering_period)(CodedBitstreamContext *ctx, RWContext *rw, > const H264RawSPS *sps; > int err, i, length; > > + HEADER("Buffering Period"); > + > ue(seq_parameter_set_id, 0, 31); > > sps = h264->sps[current->seq_parameter_set_id]; > @@ -605,6 +607,8 @@ static int FUNC(sei_pic_timing)(CodedBitstreamContext *ctx, RWContext *rw, > const H264RawSPS *sps; > int err; > > + HEADER("Picture Timing"); > + > sps = h264->active_sps; > if (!sps) { > // If there is exactly one possible SPS but it is not yet active > @@ -674,6 +678,8 @@ static int FUNC(sei_pan_scan_rect)(CodedBitstreamContext *ctx, RWContext *rw, > { > int err, i; > > + HEADER("Pan-Scan Rectangle"); > + > ue(pan_scan_rect_id, 0, UINT32_MAX - 1); > flag(pan_scan_rect_cancel_flag); > > @@ -699,6 +705,8 @@ static int FUNC(sei_user_data_registered)(CodedBitstreamContext *ctx, RWContext > { > int err, i, j; > > + HEADER("User Data Registered ITU-T T.35"); > + > u(8, itu_t_t35_country_code, 0x00, 0xff); > if (current->itu_t_t35_country_code != 0xff) > i = 1; > @@ -731,6 +739,8 @@ static int FUNC(sei_user_data_unregistered)(CodedBitstreamContext *ctx, RWContex > { > int err, i; > > + HEADER("User Data Unregistered"); > + > #ifdef READ > if (*payload_size < 16) { > av_log(ctx->log_ctx, AV_LOG_ERROR, > @@ -758,6 +768,8 @@ static int FUNC(sei_recovery_point)(CodedBitstreamContext *ctx, RWContext *rw, > { > int err; > > + HEADER("Recovery Point"); > + > ue(recovery_frame_cnt, 0, 65535); > flag(exact_match_flag); > flag(broken_link_flag); > @@ -771,6 +783,8 @@ static int FUNC(sei_display_orientation)(CodedBitstreamContext *ctx, RWContext * > { > int err; > > + HEADER("Display Orientation"); > + > flag(display_orientation_cancel_flag); > if (!current->display_orientation_cancel_flag) { > flag(hor_flip); > @@ -788,6 +802,8 @@ static int FUNC(sei_mastering_display_colour_volume)(CodedBitstreamContext *ctx, > { > int err, c; > > + HEADER("Mastering Display Colour Volume"); > + > for (c = 0; c < 3; c++) { > us(16, display_primaries_x[c], 0, 50000, 1, c); > us(16, display_primaries_y[c], 0, 50000, 1, c); LGTM.
diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index 9e29132fec..dbf9ff1268 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -513,6 +513,8 @@ static int FUNC(sei_buffering_period)(CodedBitstreamContext *ctx, RWContext *rw, const H264RawSPS *sps; int err, i, length; + HEADER("Buffering Period"); + ue(seq_parameter_set_id, 0, 31); sps = h264->sps[current->seq_parameter_set_id]; @@ -605,6 +607,8 @@ static int FUNC(sei_pic_timing)(CodedBitstreamContext *ctx, RWContext *rw, const H264RawSPS *sps; int err; + HEADER("Picture Timing"); + sps = h264->active_sps; if (!sps) { // If there is exactly one possible SPS but it is not yet active @@ -674,6 +678,8 @@ static int FUNC(sei_pan_scan_rect)(CodedBitstreamContext *ctx, RWContext *rw, { int err, i; + HEADER("Pan-Scan Rectangle"); + ue(pan_scan_rect_id, 0, UINT32_MAX - 1); flag(pan_scan_rect_cancel_flag); @@ -699,6 +705,8 @@ static int FUNC(sei_user_data_registered)(CodedBitstreamContext *ctx, RWContext { int err, i, j; + HEADER("User Data Registered ITU-T T.35"); + u(8, itu_t_t35_country_code, 0x00, 0xff); if (current->itu_t_t35_country_code != 0xff) i = 1; @@ -731,6 +739,8 @@ static int FUNC(sei_user_data_unregistered)(CodedBitstreamContext *ctx, RWContex { int err, i; + HEADER("User Data Unregistered"); + #ifdef READ if (*payload_size < 16) { av_log(ctx->log_ctx, AV_LOG_ERROR, @@ -758,6 +768,8 @@ static int FUNC(sei_recovery_point)(CodedBitstreamContext *ctx, RWContext *rw, { int err; + HEADER("Recovery Point"); + ue(recovery_frame_cnt, 0, 65535); flag(exact_match_flag); flag(broken_link_flag); @@ -771,6 +783,8 @@ static int FUNC(sei_display_orientation)(CodedBitstreamContext *ctx, RWContext * { int err; + HEADER("Display Orientation"); + flag(display_orientation_cancel_flag); if (!current->display_orientation_cancel_flag) { flag(hor_flip); @@ -788,6 +802,8 @@ static int FUNC(sei_mastering_display_colour_volume)(CodedBitstreamContext *ctx, { int err, c; + HEADER("Mastering Display Colour Volume"); + for (c = 0; c < 3; c++) { us(16, display_primaries_x[c], 0, 50000, 1, c); us(16, display_primaries_y[c], 0, 50000, 1, c);