Skip to content

M
mpd
Commit 3e9738dc authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/mpcdec: read the bit rate

This was lost in commit 8ead8f7e, because this was never implemented for the new API.
parent 2ecf57cd
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
NEWS
View file @ 3e9738dc
......@@ -14,6 +14,7 @@ ver 0.20 (not yet released)
* decoder
- ffmpeg: support ReplayGain and MixRamp
- ffmpeg: support stream tags
- mpcdec: read the bit rate
* output
- jack: reduce CPU usage
- pulse: set channel map to WAVE-EX
......
src/decoder/plugins/MpcdecDecoderPlugin.cxx
View file @ 3e9738dc
......@@ -193,8 +193,6 @@ mpcdec_decode(Decoder &mpd_decoder, InputStream &is)
decoder_seek_error(mpd_decoder);
}
mpc_uint32_t vbr_update_bits = 0;
MPC_SAMPLE_FORMAT sample_buffer[MPC_DECODER_BUFFER_LENGTH];
mpc_frame_info frame;
frame.buffer = (MPC_SAMPLE_FORMAT *)sample_buffer;
......@@ -214,8 +212,8 @@ mpcdec_decode(Decoder &mpd_decoder, InputStream &is)
MpcdecSampleTraits::value_type chunk[ARRAY_SIZE(sample_buffer)];
mpc_to_mpd_buffer(chunk, sample_buffer, ret);
long bit_rate = vbr_update_bits * audio_format.sample_rate
/ 1152 / 1000;
long bit_rate = unsigned(frame.bits) * audio_format.sample_rate
/ (1000 * frame.samples);
cmd = decoder_data(mpd_decoder, is,
chunk, ret * sizeof(chunk[0]),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment