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

pcm/Export: eliminate the AudioFormat parameter from GetFrameSize()

Browse Source
This commit is contained in:
Max Kellermann 2019-06-26 15:42:47 +02:00
parent 53faf77d20
commit f43cafbf7d
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/output/plugins/AlsaOutputPlugin.cxx
View File

@ -674,7 +674,7 @@ AlsaOutput::Open(AudioFormat &audio_format)
#ifndef NDEBUG #ifndef NDEBUG
in_frame_size = audio_format.GetFrameSize(); in_frame_size = audio_format.GetFrameSize();
#endif #endif
out_frame_size = pcm_export->GetFrameSize(audio_format); out_frame_size = pcm_export->GetFrameSize();
drain = false; drain = false;

2
src/output/plugins/OSXOutputPlugin.cxx
View File

@ -856,7 +856,7 @@ OSXOutput::Open(AudioFormat &audio_format)
if (dop_enabled) { if (dop_enabled) {
pcm_export->Open(audio_format.format, audio_format.channels, params); pcm_export->Open(audio_format.format, audio_format.channels, params);
ring_buffer_size = std::max<size_t>(buffer_frame_size, ring_buffer_size = std::max<size_t>(buffer_frame_size,
MPD_OSX_BUFFER_TIME_MS * pcm_export->GetFrameSize(audio_format) * asbd.mSampleRate / 1000); MPD_OSX_BUFFER_TIME_MS * pcm_export->GetFrameSize() * asbd.mSampleRate / 1000);
} }
#endif #endif
ring_buffer = new boost::lockfree::spsc_queue<uint8_t>(ring_buffer_size); ring_buffer = new boost::lockfree::spsc_queue<uint8_t>(ring_buffer_size);

4
src/pcm/Export.cxx
View File

@ -115,7 +115,7 @@ PcmExport::Reset() noexcept
} }
size_t size_t
PcmExport::GetFrameSize(const AudioFormat &audio_format) const noexcept PcmExport::GetFrameSize() const noexcept
{ {
if (pack24) if (pack24)
/* packed 24 bit samples (3 bytes per sample) */ /* packed 24 bit samples (3 bytes per sample) */
@ -141,7 +141,7 @@ PcmExport::GetFrameSize(const AudioFormat &audio_format) const noexcept
} }
#endif #endif
return audio_format.GetFrameSize(); return channels * sample_format_size(src_sample_format);
} }
unsigned unsigned

2
src/pcm/Export.hxx
View File

@ -188,7 +188,7 @@ public:
* Calculate the size of one output frame. * Calculate the size of one output frame.
*/ */
gcc_pure gcc_pure
size_t GetFrameSize(const AudioFormat &audio_format) const noexcept; size_t GetFrameSize() const noexcept;
/** /**
* Export a PCM buffer. * Export a PCM buffer.