From e9965a5e8ec301fdbcd42967a3adcb39a711d80f Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Wed, 2 Apr 2025 12:54:07 +0200
Subject: [PATCH 19/23] avocdec/mjpegenc_huffman: Avoid redundant loop
There is no point in iterating over the list twice.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/mjpegenc_huffman.c | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/libavcodec/mjpegenc_huffman.c b/libavcodec/mjpegenc_huffman.c
index 898db7d060..16c0930524 100644
--- a/libavcodec/mjpegenc_huffman.c
+++ b/libavcodec/mjpegenc_huffman.c
@@ -185,31 +185,28 @@ void ff_mjpeg_encode_huffman_init(MJpegEncHuffmanContext *s)
void ff_mjpeg_encode_huffman_close(MJpegEncHuffmanContext *s, uint8_t bits[17],
uint8_t val[], int max_nval)
{
- int i, j;
- int nval = 0;
+ int nval;
PTable val_counts[257];
HuffTable distincts[256];
- for (i = 0; i < 256; i++) {
- if (s->val_count[i]) nval++;
- }
- av_assert0 (nval <= max_nval);
+ av_assert1(max_nval <= FF_ARRAY_ELEMS(val_counts) - 1);
- j = 0;
- for (i = 0; i < 256; i++) {
+ nval = 0;
+ for (int i = 0; i < 256; i++) {
if (s->val_count[i]) {
- val_counts[j].value = i;
- val_counts[j].prob = s->val_count[i];
- j++;
+ val_counts[nval].value = i;
+ val_counts[nval].prob = s->val_count[i];
+ nval++;
+ av_assert2(nval <= max_nval);
}
}
- val_counts[j].value = 256;
- val_counts[j].prob = 0;
+ val_counts[nval].value = 256;
+ val_counts[nval].prob = 0;
mjpegenc_huffman_compute_bits(val_counts, distincts, nval + 1, 16);
AV_QSORT(distincts, nval, HuffTable, compare_by_length);
memset(bits, 0, sizeof(bits[0]) * 17);
- for (i = 0; i < nval; i++) {
+ for (int i = 0; i < nval; i++) {
val[i] = distincts[i].code;
bits[distincts[i].length]++;
}
--
2.45.2