oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/mad: use mad_bit_skip() where appropriate

Browse Source
This commit is contained in:
Max Kellermann
2018-10-19 20:24:16 +02:00
parent c63f24e58e
commit 650a67dc38
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/decoder/plugins/MadDecoderPlugin.cxx
View File

@@ -566,7 +566,7 @@ parse_xing(struct xing *xing, struct mad_bitptr *ptr, int *oldbitlen)
if (bitsleft < 0) if (bitsleft < 0)
return false; return false;
else if (bitsleft > 0) { else if (bitsleft > 0) {
mad_bit_read(ptr, bitsleft); mad_bit_skip(ptr, bitsleft);
bitlen -= 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)) (lame->version.major == 3 && lame->version.minor < 95))
adj = 6; adj = 6;
mad_bit_read(ptr, 16); mad_bit_skip(ptr, 16);
lame->peak = mad_f_todouble(mad_bit_read(ptr, 32) << 5); /* peak */ lame->peak = mad_f_todouble(mad_bit_read(ptr, 32) << 5); /* peak */
FormatDebug(mad_domain, "LAME peak found: %f", lame->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); lame->track_gain);
} }
#else #else
mad_bit_read(ptr, 16); mad_bit_skip(ptr, 16);
#endif #endif
mad_bit_read(ptr, 16); mad_bit_skip(ptr, 16);
lame->encoder_delay = mad_bit_read(ptr, 12); lame->encoder_delay = mad_bit_read(ptr, 12);
lame->encoder_padding = 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", FormatDebug(mad_domain, "encoder delay is %i, encoder padding is %i",
lame->encoder_delay, lame->encoder_padding); lame->encoder_delay, lame->encoder_padding);
mad_bit_read(ptr, 80); mad_bit_skip(ptr, 80);
lame->crc = mad_bit_read(ptr, 16); lame->crc = mad_bit_read(ptr, 16);