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

further guard dop code by if (dop_enabled)

Browse Source
This commit is contained in:
Yue Wang 2018-07-13 16:36:29 -07:00 committed by GitHub
parent 6d2a30b860
commit ef84e5c8fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,7 @@ struct OSXOutput final : AudioOutput {
* @see http://dsd-guide.com/dop-open-standard * @see http://dsd-guide.com/dop-open-standard
*/ */
bool dop_setting; bool dop_setting;
bool dop_enabled;
Manual<PcmExport> pcm_export; Manual<PcmExport> pcm_export;
#endif #endif
@ -779,10 +780,9 @@ OSXOutput::Open(AudioFormat &audio_format)
if (dop && audio_format.format == SampleFormat::DSD) { if (dop && audio_format.format == SampleFormat::DSD) {
asbd.mBitsPerChannel = 24; asbd.mBitsPerChannel = 24;
params.dop = true; params.dop = true;
} asbd.mSampleRate = params.CalcOutputSampleRate(audio_format.sample_rate);
asbd.mSampleRate = params.CalcOutputSampleRate(audio_format.sample_rate);
if (audio_format.format == SampleFormat::DSD)
asbd.mBytesPerPacket = 4 * audio_format.channels; asbd.mBytesPerPacket = 4 * audio_format.channels;
}
#endif #endif
asbd.mFramesPerPacket = 1; asbd.mFramesPerPacket = 1;
@ -800,6 +800,7 @@ OSXOutput::Open(AudioFormat &audio_format)
asbd.mSampleRate = params.CalcOutputSampleRate(audio_format.sample_rate); asbd.mSampleRate = params.CalcOutputSampleRate(audio_format.sample_rate);
asbd.mBytesPerFrame = asbd.mBytesPerPacket; asbd.mBytesPerFrame = asbd.mBytesPerPacket;
} }
dop_enabled = params.dop;
#endif #endif
OSStatus status = OSStatus status =
@ -839,13 +840,15 @@ OSXOutput::Open(AudioFormat &audio_format)
errormsg); errormsg);
} }
#ifdef ENABLE_DSD
pcm_export->Open(audio_format.format, audio_format.channels, params);
size_t ring_buffer_size = std::max<size_t>(buffer_frame_size,
MPD_OSX_BUFFER_TIME_MS * pcm_export->GetFrameSize(audio_format) * asbd.mSampleRate / 1000);
#else
size_t ring_buffer_size = std::max<size_t>(buffer_frame_size, size_t ring_buffer_size = std::max<size_t>(buffer_frame_size,
MPD_OSX_BUFFER_TIME_MS * audio_format.GetFrameSize() * audio_format.sample_rate / 1000); MPD_OSX_BUFFER_TIME_MS * audio_format.GetFrameSize() * audio_format.sample_rate / 1000);
#ifdef ENABLE_DSD
if (dop_enabled) {
pcm_export->Open(audio_format.format, audio_format.channels, params);
ring_buffer_size = std::max<size_t>(buffer_frame_size,
MPD_OSX_BUFFER_TIME_MS * pcm_export->GetFrameSize(audio_format) * 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);
@ -872,19 +875,20 @@ OSXOutput::Play(const void *chunk, size_t size)
} }
} }
#ifdef ENABLE_DSD #ifdef ENABLE_DSD
const auto e = pcm_export->Export({chunk, size}); if (dop_enabled) {
if (e.size == 0) const auto e = pcm_export->Export({chunk, size});
/* the DoP (DSD over PCM) filter converts two frames /* the DoP (DSD over PCM) filter converts two frames
at a time and ignores the last odd frame; if there at a time and ignores the last odd frame; if there
was only one frame (e.g. the last frame in the was only one frame (e.g. the last frame in the
file), the result is empty; to avoid an endless file), the result is empty; to avoid an endless
loop, bail out here, and pretend the one frame has loop, bail out here, and pretend the one frame has
been played */ been played */
return size; if (e.size == 0)
return size;
size_t bytes_written = ring_buffer->push((const uint8_t *)e.data, size_t bytes_written = ring_buffer->push((const uint8_t *)e.data, e.size);
e.size); return pcm_export->CalcSourceSize(bytes_written);
return pcm_export->CalcSourceSize(bytes_written); }
#endif #endif
return ring_buffer->push((const uint8_t *)chunk, size); return ring_buffer->push((const uint8_t *)chunk, size);
} }