From 650a67dc38b3870b8a4f6fc2912705da61df530f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Fri, 19 Oct 2018 20:24:16 +0200
Subject: [PATCH] decoder/mad: use mad_bit_skip() where appropriate
---
src/decoder/plugins/MadDecoderPlugin.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx
index b422178d2..b861d52b3 100644
--- a/src/decoder/plugins/MadDecoderPlugin.cxx
+++ b/src/decoder/plugins/MadDecoderPlugin.cxx
@@ -566,7 +566,7 @@ parse_xing(struct xing *xing, struct mad_bitptr *ptr, int *oldbitlen)
if (bitsleft < 0)
return false;
else if (bitsleft > 0) {
- mad_bit_read(ptr, bitsleft);
+ mad_bit_skip(ptr, bitsleft);
bitlen -= bitsleft;
}
@@ -614,7 +614,7 @@ parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
(lame->version.major == 3 && lame->version.minor < 95))
adj = 6;
- mad_bit_read(ptr, 16);
+ mad_bit_skip(ptr, 16);
lame->peak = mad_f_todouble(mad_bit_read(ptr, 32) << 5); /* peak */
FormatDebug(mad_domain, "LAME peak found: %f", lame->peak);
@@ -646,10 +646,10 @@ parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
lame->track_gain);
}
#else
- mad_bit_read(ptr, 16);
+ mad_bit_skip(ptr, 16);
#endif
- mad_bit_read(ptr, 16);
+ mad_bit_skip(ptr, 16);
lame->encoder_delay = mad_bit_read(ptr, 12);
lame->encoder_padding = mad_bit_read(ptr, 12);
@@ -657,7 +657,7 @@ parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
FormatDebug(mad_domain, "encoder delay is %i, encoder padding is %i",
lame->encoder_delay, lame->encoder_padding);
- mad_bit_read(ptr, 80);
+ mad_bit_skip(ptr, 80);
lame->crc = mad_bit_read(ptr, 16);