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

output/sles: support floating point samples

Browse Source 
According to https://developer.android.com/ndk/guides/audio/opensl/android-extensions

This feature was mentioned in https://github.com/MusicPlayerDaemon/MPD/issues/922
This commit is contained in:
Max Kellermann 2020-07-20 14:46:24 +02:00
parent 64a1386eb6
commit 448b397cb8
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.21.26 (not yet released) ver 0.21.26 (not yet released)
* output
- sles: support floating point samples
ver 0.21.25 (2020/07/06) ver 0.21.25 (2020/07/06)
* protocol: * protocol:

15
src/output/plugins/sles/SlesOutputPlugin.cxx
View File

@ -173,12 +173,12 @@ SlesOutput::Open(AudioFormat &audio_format)
if (audio_format.channels > 2) if (audio_format.channels > 2)
audio_format.channels = 1; audio_format.channels = 1;
SLDataFormat_PCM format_pcm; SLAndroidDataFormat_PCM_EX format_pcm;
format_pcm.formatType = SL_DATAFORMAT_PCM; format_pcm.formatType = SL_DATAFORMAT_PCM;
format_pcm.numChannels = audio_format.channels; format_pcm.numChannels = audio_format.channels;
/* from the Android NDK docs: "Note that the field samplesPerSec is /* from the Android NDK docs: "Note that the field samplesPerSec is
actually in units of milliHz, despite the misleading name." */ actually in units of milliHz, despite the misleading name." */
format_pcm.samplesPerSec = audio_format.sample_rate * 1000u; format_pcm.sampleRate = audio_format.sample_rate * 1000u;
format_pcm.bitsPerSample = SL_PCMSAMPLEFORMAT_FIXED_16; format_pcm.bitsPerSample = SL_PCMSAMPLEFORMAT_FIXED_16;
format_pcm.containerSize = SL_PCMSAMPLEFORMAT_FIXED_16; format_pcm.containerSize = SL_PCMSAMPLEFORMAT_FIXED_16;
format_pcm.channelMask = audio_format.channels == 1 format_pcm.channelMask = audio_format.channels == 1
@ -187,6 +187,7 @@ SlesOutput::Open(AudioFormat &audio_format)
format_pcm.endianness = IsLittleEndian() format_pcm.endianness = IsLittleEndian()
? SL_BYTEORDER_LITTLEENDIAN ? SL_BYTEORDER_LITTLEENDIAN
: SL_BYTEORDER_BIGENDIAN; : SL_BYTEORDER_BIGENDIAN;
format_pcm.representation = SL_ANDROID_PCM_REPRESENTATION_SIGNED_INT;
switch (audio_format.format) { switch (audio_format.format) {
/* note: Android doesn't support /* note: Android doesn't support
@ -201,6 +202,16 @@ SlesOutput::Open(AudioFormat &audio_format)
bit */ bit */
break; break;
case SampleFormat::FLOAT:
/* Android has an OpenSLES extension for floating
point samples:
https://developer.android.com/ndk/guides/audio/opensl/android-extensions */
format_pcm.formatType = SL_ANDROID_DATAFORMAT_PCM_EX;
format_pcm.bitsPerSample = format_pcm.containerSize =
SL_PCMSAMPLEFORMAT_FIXED_32;
format_pcm.representation = SL_ANDROID_PCM_REPRESENTATION_FLOAT;
break;
default: default:
/* fall back to 16 bit */ /* fall back to 16 bit */
audio_format.format = SampleFormat::S16; audio_format.format = SampleFormat::S16;