Commit b02441d5f3 for aom
commit b02441d5f338597bc49e023e7afb3ccf76ec1300
Author: Frank Galligan <fgalligan@google.com>
Date: Fri Nov 13 10:43:55 2026 -0800
aom_dsp: Inline hot bitwriter_buffer write helpers
Inline aom_wb_write_bit and aom_wb_write_literal in bitwriter_buffer.h
while keeping aom_wb_write_unsigned_literal exported for shared-library
tools such as svc_encoder_rtc.
Speedup: -0.58% (1T) / -0.40% (8T) encode time reduction (bit-exact).
TAG=agy
CONV=b929a630-a6cd-45a0-979c-1767c30178ee
Change-Id: I6cd1434ebf977e4fd0febc30e861bc841f6742aa
diff --git a/aom_dsp/bitwriter_buffer.c b/aom_dsp/bitwriter_buffer.c
index d92ce7d67a..f53c0af48c 100644
--- a/aom_dsp/bitwriter_buffer.c
+++ b/aom_dsp/bitwriter_buffer.c
@@ -27,20 +27,6 @@ uint32_t aom_wb_bytes_written(const struct aom_write_bit_buffer *wb) {
return wb->bit_offset / CHAR_BIT + (wb->bit_offset % CHAR_BIT > 0);
}
-void aom_wb_write_bit(struct aom_write_bit_buffer *wb, int bit) {
- const int off = (int)wb->bit_offset;
- const int p = off / CHAR_BIT;
- const int q = CHAR_BIT - 1 - off % CHAR_BIT;
- if (q == CHAR_BIT - 1) {
- // Zero next char and write bit
- wb->bit_buffer[p] = bit << q;
- } else {
- wb->bit_buffer[p] &= ~(1 << q);
- wb->bit_buffer[p] |= bit << q;
- }
- wb->bit_offset = off + 1;
-}
-
static void overwrite_bit(struct aom_write_bit_buffer *wb, int bit) {
// Do not zero bytes but overwrite exisiting values
const int off = (int)wb->bit_offset;
@@ -51,12 +37,6 @@ static void overwrite_bit(struct aom_write_bit_buffer *wb, int bit) {
wb->bit_offset = off + 1;
}
-void aom_wb_write_literal(struct aom_write_bit_buffer *wb, int data, int bits) {
- assert(bits <= 31);
- int bit;
- for (bit = bits - 1; bit >= 0; bit--) aom_wb_write_bit(wb, (data >> bit) & 1);
-}
-
void aom_wb_write_unsigned_literal(struct aom_write_bit_buffer *wb,
uint32_t data, int bits) {
assert(bits <= 32);
diff --git a/aom_dsp/bitwriter_buffer.h b/aom_dsp/bitwriter_buffer.h
index 636444a512..b4157ccae8 100644
--- a/aom_dsp/bitwriter_buffer.h
+++ b/aom_dsp/bitwriter_buffer.h
@@ -12,6 +12,8 @@
#ifndef AOM_AOM_DSP_BITWRITER_BUFFER_H_
#define AOM_AOM_DSP_BITWRITER_BUFFER_H_
+#include <assert.h>
+
#include "aom/aom_integer.h"
#ifdef __cplusplus
@@ -27,9 +29,25 @@ int aom_wb_is_byte_aligned(const struct aom_write_bit_buffer *wb);
uint32_t aom_wb_bytes_written(const struct aom_write_bit_buffer *wb);
-void aom_wb_write_bit(struct aom_write_bit_buffer *wb, int bit);
+static inline void aom_wb_write_bit(struct aom_write_bit_buffer *wb, int bit) {
+ const uint32_t off = wb->bit_offset;
+ const uint32_t p = off >> 3;
+ const int q = 7 - (int)(off & 7);
+ if (q == 7) {
+ wb->bit_buffer[p] = (uint8_t)(bit << 7);
+ } else {
+ wb->bit_buffer[p] = (uint8_t)((wb->bit_buffer[p] & ~(1 << q)) | (bit << q));
+ }
+ wb->bit_offset = off + 1;
+}
-void aom_wb_write_literal(struct aom_write_bit_buffer *wb, int data, int bits);
+static inline void aom_wb_write_literal(struct aom_write_bit_buffer *wb,
+ int data, int bits) {
+ assert(bits <= 31);
+ for (int bit = bits - 1; bit >= 0; bit--) {
+ aom_wb_write_bit(wb, (data >> bit) & 1);
+ }
+}
void aom_wb_write_unsigned_literal(struct aom_write_bit_buffer *wb,
uint32_t data, int bits);