From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 2/2] lavc/tests/bitstream: test bits_*_signed_nz and bits_peek_signed*
Date: Sun, 15 Jan 2023 10:59:34 +0100
Message-ID: <20230115095934.9065-2-anton@khirnov.net> (raw)
In-Reply-To: <20230115095934.9065-1-anton@khirnov.net>
---
libavcodec/tests/bitstream_template.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/libavcodec/tests/bitstream_template.c b/libavcodec/tests/bitstream_template.c
index 13e92a31c6..ef59845154 100644
--- a/libavcodec/tests/bitstream_template.c
+++ b/libavcodec/tests/bitstream_template.c
@@ -42,6 +42,7 @@ enum Op {
OP_READ_63,
OP_READ_64,
OP_READ_SIGNED,
+ OP_READ_SIGNED_NZ,
OP_APPLY_SIGN,
OP_ALIGN,
OP_NB,
@@ -58,7 +59,7 @@ int main(int argc, char **argv)
uint32_t random_seed;
uint64_t val, val1;
- int32_t sval;
+ int32_t sval, sval1;
unsigned count;
/* generate random input, using a given or random seed */
@@ -130,10 +131,26 @@ int main(int argc, char **argv)
break;
case OP_READ_SIGNED:
count = av_lfg_get(&lfg) % FFMIN(33, bits_left(&bc) + 1);
+ sval1 = bits_peek_signed(&bc, count);
sval = bits_read_signed(&bc, count);
fprintf(stderr, "%d read_signed %u: %"PRId32"\n", bits_tell(&bc) - count, count, sval);
+ av_assert0(sval == sval1);
+
+ if (count == 32) put_bits32(&pb, sval);
+ else put_sbits(&pb, count, sval);
+ break;
+ case OP_READ_SIGNED_NZ:
+ count = av_lfg_get(&lfg) % FFMIN(33, bits_left(&bc) + 1);
+ count = FFMAX(count, 1);
+ sval1 = bits_peek_signed_nz(&bc, count);
+ sval = bits_read_signed_nz(&bc, count);
+
+ fprintf(stderr, "%d read_signed_nz %u: %"PRId32"\n", bits_tell(&bc) - count, count, sval);
+
+ av_assert0(sval == sval1);
+
if (count == 32) put_bits32(&pb, sval);
else put_sbits(&pb, count, sval);
break;
--
2.35.1
_______________________________________________
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".
prev parent reply other threads:[~2023-01-15 9:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-15 9:59 [FFmpeg-devel] [PATCH 1/2] lavc/bitstream: avoid UB in bits_{read, peek}_signed(0) Anton Khirnov
2023-01-15 9:59 ` Anton Khirnov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230115095934.9065-2-anton@khirnov.net \
--to=anton@khirnov.net \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git