diff options
| author | Andy Hung <hunga@google.com> | 2015-07-29 18:39:21 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-30 22:03:10 +0000 |
| commit | 84bbadf848f606ff28273baf26fc246cf967059a (patch) | |
| tree | 2d43b3d33684514c74d4bde9ae393a5a4ee51aea /src | |
| parent | cfcb54d5866e51314f16e3cb0a4147ddd72dd00f (diff) | |
| download | android_frameworks_wilhelm-84bbadf848f606ff28273baf26fc246cf967059a.tar.gz android_frameworks_wilhelm-84bbadf848f606ff28273baf26fc246cf967059a.tar.bz2 android_frameworks_wilhelm-84bbadf848f606ff28273baf26fc246cf967059a.zip | |
Update OpenSL ES for odd channel counts
Bug: 22629234
Change-Id: I3effb86dc7418997e8b24bf8a11c757878c99693
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/channels.c | 6 | ||||
| -rw-r--r-- | src/data.c | 36 |
2 files changed, 38 insertions, 4 deletions
diff --git a/src/android/channels.c b/src/android/channels.c index 887ec68..ee6cd09 100644 --- a/src/android/channels.c +++ b/src/android/channels.c @@ -29,10 +29,16 @@ SLuint32 channelCountToMask(unsigned channelCount) case 2: return SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT; // Android-specific + case 3: + return SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT | SL_SPEAKER_FRONT_CENTER; case 4: return SL_ANDROID_SPEAKER_QUAD; + case 5: + return SL_ANDROID_SPEAKER_QUAD | SL_SPEAKER_FRONT_CENTER; case 6: return SL_ANDROID_SPEAKER_5DOT1; + case 7: + return SL_ANDROID_SPEAKER_5DOT1 | SL_SPEAKER_BACK_CENTER; case 8: return SL_ANDROID_SPEAKER_7DOT1; // FIXME FCC_8 @@ -373,8 +373,11 @@ static SLresult checkDataFormat(const char *name, void *pFormat, DataFormat *pDa switch (pDataFormat->mPCM.numChannels) { case 1: // mono case 2: // stereo + case 3: // stereo + front center case 4: // QUAD + case 5: // QUAD + front center case 6: // 5.1 + case 7: // 5.1 + back center case 8: // 7.1 break; case 0: // unknown @@ -460,28 +463,53 @@ static SLresult checkDataFormat(const char *name, void *pFormat, DataFormat *pDa } break; #ifdef ANDROID + case SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT | SL_SPEAKER_FRONT_CENTER: + if (3 != pDataFormat->mPCM.numChannels) { + result = SL_RESULT_PARAMETER_INVALID; + } + break; case SL_ANDROID_SPEAKER_QUAD: if (4 != pDataFormat->mPCM.numChannels) { result = SL_RESULT_PARAMETER_INVALID; } break; + case SL_ANDROID_SPEAKER_QUAD | SL_SPEAKER_FRONT_CENTER: + if (5 != pDataFormat->mPCM.numChannels) { + result = SL_RESULT_PARAMETER_INVALID; + } + break; case SL_ANDROID_SPEAKER_5DOT1: if (6 != pDataFormat->mPCM.numChannels) { result = SL_RESULT_PARAMETER_INVALID; } break; + case SL_ANDROID_SPEAKER_5DOT1 | SL_SPEAKER_BACK_CENTER: + if (7 != pDataFormat->mPCM.numChannels) { + result = SL_RESULT_PARAMETER_INVALID; + } + break; case SL_ANDROID_SPEAKER_7DOT1: if (8 != pDataFormat->mPCM.numChannels) { result = SL_RESULT_PARAMETER_INVALID; } break; #endif - case 0: + case 0: { + // According to OpenSL ES 1.0.1 section 9.1.7 SLDataFormat_PCM, "a default + // setting of zero indicates stereo format (i.e. the setting is equivalent to + // SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT)." + // + // ANDROID SPECIFIC BEHAVIOR. + // We fill in the appropriate mask to the number indicated by numChannels. // The default of front left rather than center for mono may be non-intuitive, // but the left channel is the first channel for stereo or multichannel content. - pDataFormat->mPCM.channelMask = pDataFormat->mPCM.numChannels == 2 ? - SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT : SL_SPEAKER_FRONT_LEFT; - break; + SLuint32 mask = channelCountToMask(pDataFormat->mPCM.numChannels); + if (mask == UNKNOWN_CHANNELMASK) { + result = SL_RESULT_PARAMETER_INVALID; + } else { + pDataFormat->mPCM.channelMask = mask; + } + } break; default: result = SL_RESULT_PARAMETER_INVALID; break; |