History

avcodec/vc2enc: Avoid excessive inlining

There is no reason to inline put_vc2_ue_uint() everywhere; only one call site is actually hot: The one in encode_subband() (which accounts for 35735040 of 35739495 calls to said function in a FATE run). Uninline all the others.

Andreas Rheinhardt committed 1 year ago

Commit e99faf21 parent fcd5df51 file · +7 −2Browse files

Unified · Split

libavcodec/vc2enc.c+7−2
@@ -204,7 +204,7 @@ static av_cold void vc2_init_static_data(void) · 203 unmodified lines
204 }204 }
205}205}
206 206
207static av_always_inline void put_vc2_ue_uint(PutBitContext *pb, uint32_t val)207static av_always_inline void put_vc2_ue_uint_inline(PutBitContext *pb, uint32_t val)
208{208{
209 uint64_t pbits = 1;209 uint64_t pbits = 1;
210 int bits = 1;210 int bits = 1;
@@ -222,6 +222,11 @@ static av_always_inline void put_vc2_ue_uint(PutBitContext *pb, uint32_t val) · 11 unmodified lines
222 put_bits63(pb, bits, pbits);222 put_bits63(pb, bits, pbits);
223}223}
224 224
225static av_noinline void put_vc2_ue_uint(PutBitContext *pb, uint32_t val)
226{
227 put_vc2_ue_uint_inline(pb, val);
228}
229
225static av_always_inline int count_vc2_ue_uint(uint32_t val)230static av_always_inline int count_vc2_ue_uint(uint32_t val)
226{231{
227 return 2 * av_log2(val + 1) + 1;232 return 2 * av_log2(val + 1) + 1;
@@ -545,7 +550,7 @@ static void encode_subband(const VC2EncContext *s, PutBitContext *pb, · 317 unmodified lines
545 for (y = top; y < bottom; y++) {550 for (y = top; y < bottom; y++) {
546 for (x = left; x < right; x++) {551 for (x = left; x < right; x++) {
547 uint32_t c_abs = QUANT(FFABS(coeff[x]), q_m, q_a, q_s);552 uint32_t c_abs = QUANT(FFABS(coeff[x]), q_m, q_a, q_s);
548 put_vc2_ue_uint(pb, c_abs);553 put_vc2_ue_uint_inline(pb, c_abs);
549 if (c_abs)554 if (c_abs)
550 put_bits(pb, 1, coeff[x] < 0);555 put_bits(pb, 1, coeff[x] < 0);
551 }556 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t