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

decoder/opus: convert field output_gain to float

Browse Source
This commit is contained in:
Max Kellermann 2020-10-16 18:28:54 +02:00
parent 1406144210
commit c32a809d38
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/decoder/plugins/OpusDecoderPlugin.cxx
View File

@ -79,7 +79,7 @@ class MPDOpusDecoder final : public OggDecoder {
* The output gain from the Opus header. Initialized by * The output gain from the Opus header. Initialized by
* OnOggBeginning(). * OnOggBeginning().
*/ */
signed output_gain; float output_gain;
/** /**
* The pre-skip value from the Opus header. Initialized by * The pre-skip value from the Opus header. Initialized by
@ -170,10 +170,14 @@ MPDOpusDecoder::OnOggBeginning(const ogg_packet &packet)
throw std::runtime_error("BOS packet must be OpusHead"); throw std::runtime_error("BOS packet must be OpusHead");
unsigned channels; unsigned channels;
if (!ScanOpusHeader(packet.packet, packet.bytes, channels, output_gain, pre_skip) || signed output_gain_i;
if (!ScanOpusHeader(packet.packet, packet.bytes, channels, output_gain_i, pre_skip) ||
!audio_valid_channel_count(channels)) !audio_valid_channel_count(channels))
throw std::runtime_error("Malformed BOS packet"); throw std::runtime_error("Malformed BOS packet");
/* convert Q7.8 fixed-point to float */
output_gain = float(output_gain_i) / 256.0f;
granulepos = 0; granulepos = 0;
skip = pre_skip; skip = pre_skip;
@ -251,8 +255,8 @@ MPDOpusDecoder::HandleTags(const ogg_packet &packet)
* ReplayGain. Add 5dB to compensate for the different * ReplayGain. Add 5dB to compensate for the different
* reference levels between ReplayGain (89dB) and EBU R128 (-23 LUFS). * reference levels between ReplayGain (89dB) and EBU R128 (-23 LUFS).
*/ */
rgi.track.gain = float(output_gain) / 256.0f + 5; rgi.track.gain = output_gain + 5;
rgi.album.gain = float(output_gain) / 256.0f + 5; rgi.album.gain = output_gain + 5;
TagBuilder tag_builder; TagBuilder tag_builder;
AddTagHandler h(tag_builder); AddTagHandler h(tag_builder);