Will be reused in the following patch.
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/cbs_h2645.c | 9 +++++++++
libavcodec/cbs_h265_syntax_template.c | 7 +++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
index d42073cc5a..a60b3217a0 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -233,6 +233,15 @@ static int cbs_write_se_golomb(CodedBitstreamContext *ctx,
PutBitContext *pbc,
return 0;
}
+static int cbs_h265_payload_extension_present(GetBitContext *gbc, uint32_t
payload_size,
+ int cur_pos)
+{
+ int bits_left;
+ bits_left = payload_size * 8 - cur_pos;
+ return (bits_left > 0 &&
+ (bits_left > 7 || show_bits(gbc, bits_left) &
MAX_UINT_BITS(bits_left - 1)));
+}
+
#define HEADER(name) do { \
ff_cbs_trace_header(ctx, name); \
} while (0)
diff --git a/libavcodec/cbs_h265_syntax_template.c
b/libavcodec/cbs_h265_syntax_template.c
index fe5ffac80f..96b9acc1dc 100644
--- a/libavcodec/cbs_h265_syntax_template.c
+++ b/libavcodec/cbs_h265_syntax_template.c
@@ -1568,7 +1568,7 @@ static int
FUNC(sei_buffering_period)(CodedBitstreamContext *ctx, RWContext *rw,
int err, i, length;
#ifdef READ
- int start_pos, end_pos, bits_left;
+ int start_pos, end_pos;
start_pos = get_bits_count(rw);
#endif
@@ -1650,9 +1650,8 @@ static int
FUNC(sei_buffering_period)(CodedBitstreamContext *ctx, RWContext *rw,
// payload_extension_present() - true if we are before the last 1-bit
// in the payload structure, which must be in the last byte.
end_pos = get_bits_count(rw);
- bits_left = *payload_size * 8 - (end_pos - start_pos);
- if (bits_left > 0 &&
- (bits_left > 7 || ff_ctz(show_bits(rw, bits_left)) < bits_left - 1))
+ if (cbs_h265_payload_extension_present(rw, *payload_size,
+ end_pos - start_pos))
flag(use_alt_cpb_params_flag);
else
infer(use_alt_cpb_params_flag, 0);
--
2.26.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
