diff options
| -rw-r--r-- | src/android/AudioPlayer_to_android.cpp | 11 | ||||
| -rw-r--r-- | src/android/AudioRecorder_to_android.cpp | 16 |
2 files changed, 20 insertions, 7 deletions
diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp index 056ecd5..41272db 100644 --- a/src/android/AudioPlayer_to_android.cpp +++ b/src/android/AudioPlayer_to_android.cpp @@ -1477,8 +1477,17 @@ SLresult android_audioPlayer_realize(CAudioPlayer *pAudioPlayer, SLboolean async audio_channel_mask_t channelMask; channelMask = sles_to_audio_output_channel_mask(df_pcm->channelMask); - if (channelMask == SL_ANDROID_UNKNOWN_CHANNELMASK) { + + // To maintain backward compatibility with previous releases, ignore + // channel masks that are not indexed. + if (channelMask == AUDIO_CHANNEL_INVALID + || audio_channel_mask_get_representation(channelMask) + == AUDIO_CHANNEL_REPRESENTATION_POSITION) { channelMask = audio_channel_out_mask_from_count(df_pcm->numChannels); + SL_LOGI("Emulating old channel mask behavior " + "(ignoring positional mask %#x, using default mask %#x based on " + "channel count of %d)", df_pcm->channelMask, channelMask, + df_pcm->numChannels); } SL_LOGV("AudioPlayer: mapped SLES channel mask %#x to android channel mask %#x", df_pcm->channelMask, diff --git a/src/android/AudioRecorder_to_android.cpp b/src/android/AudioRecorder_to_android.cpp index c0215c2..0a99129 100644 --- a/src/android/AudioRecorder_to_android.cpp +++ b/src/android/AudioRecorder_to_android.cpp @@ -447,14 +447,18 @@ SLresult android_audioRecorder_realize(CAudioRecorder* ar, SLboolean async) { // note that df_pcm->channelMask has already been validated during object creation. audio_channel_mask_t channelMask = sles_to_audio_input_channel_mask(df_pcm->channelMask); - // To maintain backward compatibility with previous releases, ignore input - // channel masks that are not indexed. We do not define valid positional bits - // for OpenSL ES input formats. - if (audio_channel_mask_get_representation(channelMask) - == AUDIO_CHANNEL_REPRESENTATION_POSITION) { + // To maintain backward compatibility with previous releases, ignore + // channel masks that are not indexed. + if (channelMask == AUDIO_CHANNEL_INVALID + || audio_channel_mask_get_representation(channelMask) + == AUDIO_CHANNEL_REPRESENTATION_POSITION) { channelMask = audio_channel_in_mask_from_count(df_pcm->numChannels); + SL_LOGI("Emulating old channel mask behavior " + "(ignoring positional mask %#x, using default mask %#x based on " + "channel count of %d)", df_pcm->channelMask, channelMask, + df_pcm->numChannels); } - SL_LOGV("SLES channel mask 0x%x converted to Android mask 0x%x", df_pcm->channelMask, channelMask); + SL_LOGV("SLES channel mask %#x converted to Android mask %#x", df_pcm->channelMask, channelMask); // initialize platform-specific CAudioRecorder fields ar->mAudioRecord = new android::AudioRecord( |