diff options
| author | Max Kellermann <max@musicpd.org> | 2020-09-21 11:15:21 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2020-09-21 11:15:45 +0200 |
| commit | b72801abf3bba84565bb040215071a21182e698c (patch) | |
| tree | ae99184908d620252e73bea0113d3f675c219d5f | |
| parent | 23d5a2b8620cea69958d087fc7e13fe1e5adb83d (diff) | |
util/ByteOrder: add FromLE16S()
| -rw-r--r-- | src/decoder/plugins/OpusHead.cxx | 3 | ||||
| -rw-r--r-- | src/util/ByteOrder.hxx | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/decoder/plugins/OpusHead.cxx b/src/decoder/plugins/OpusHead.cxx index 7a1c766a9..e93e754b4 100644 --- a/src/decoder/plugins/OpusHead.cxx +++ b/src/decoder/plugins/OpusHead.cxx @@ -39,8 +39,7 @@ ScanOpusHeader(const void *data, size_t size, unsigned &channels_r, if (size < 19 || (h->version & 0xf0) != 0) return false; - uint16_t gain_bits = FromLE16(h->output_gain); - output_gain_r = (gain_bits & 0x8000) ? gain_bits - 0x10000 : gain_bits; + output_gain_r = FromLE16S(h->output_gain); channels_r = h->channels; pre_skip_r = FromLE16(h->pre_skip); diff --git a/src/util/ByteOrder.hxx b/src/util/ByteOrder.hxx index f52c2bd38..121f458f2 100644 --- a/src/util/ByteOrder.hxx +++ b/src/util/ByteOrder.hxx @@ -243,4 +243,15 @@ ToLE64(uint64_t value) noexcept return IsLittleEndian() ? value : ByteSwap64(value); } +/** + * Converts a 16 bit integer from little endian to the host byte order + * and returns it as a signed integer. + */ +constexpr int16_t +FromLE16S(uint16_t value) noexcept +{ + /* assuming two's complement representation */ + return static_cast<int16_t>(FromLE16(value)); +} + #endif |