diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-06-08 17:45:00 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2015-06-08 17:48:56 -0700 |
| commit | ba0b2c989ecbbae4678903954a4629ef342e1089 (patch) | |
| tree | a8abc6754d7fb5d69d37430cb944f8853db47347 /src | |
| parent | a80a6ff9a1f80792478c9d43578afa24a07eb2f0 (diff) | |
| download | android_frameworks_wilhelm-ba0b2c989ecbbae4678903954a4629ef342e1089.tar.gz android_frameworks_wilhelm-ba0b2c989ecbbae4678903954a4629ef342e1089.tar.bz2 android_frameworks_wilhelm-ba0b2c989ecbbae4678903954a4629ef342e1089.zip | |
Add FCC_8 comments to indicate 8-channel assumptions
Bug: 21656069
Change-Id: I411a5c83eec126bc6cda796bd4c9f842ed6ee762
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/channels.c | 1 | ||||
| -rw-r--r-- | src/classes.h | 6 | ||||
| -rw-r--r-- | src/data.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/android/channels.c b/src/android/channels.c index d730516..887ec68 100644 --- a/src/android/channels.c +++ b/src/android/channels.c @@ -35,6 +35,7 @@ SLuint32 channelCountToMask(unsigned channelCount) return SL_ANDROID_SPEAKER_5DOT1; case 8: return SL_ANDROID_SPEAKER_7DOT1; + // FIXME FCC_8 default: return UNKNOWN_CHANNELMASK; } diff --git a/src/classes.h b/src/classes.h index f4ac305..c39ff2b 100644 --- a/src/classes.h +++ b/src/classes.h @@ -71,7 +71,7 @@ SLuint8 mMuteMask; // Mask for which channels are muted: bit 0=left, 1=right SLuint8 mSoloMask; // Mask for which channels are soloed: bit 0=left, 1=right SLuint8 mNumChannels; // initially UNKNOWN_NUMCHANNELS, then const once it is known, - // range 1 <= x <= 8 + // range 1 <= x <= 8 FIXME FCC_8 // End of former IMuteSolo fields SLuint32 mSampleRateMilliHz;// initially UNKNOWN_SAMPLERATE, then const once it is known // Formerly at IEffectSend @@ -146,7 +146,7 @@ DataLocatorFormat mDataSink; // cached data for this instance SLuint8 mNumChannels; // initially UNKNOWN_NUMCHANNELS, then const once it is known, - // range 1 <= x <= 8 + // range 1 <= x <= 8 FIXME FCC_8 SLuint32 mSampleRateMilliHz;// initially UNKNOWN_SAMPLERATE, then const once it is known // implementation-specific data for this instance #ifdef ANDROID @@ -335,7 +335,7 @@ typedef struct CMediaPlayer_struct { DataLocatorFormat mVibraSink; DataLocatorFormat mLEDArraySink; SLuint8 mNumChannels; // initially UNKNOWN_NUMCHANNELS, then const once it is known, - // range 1 <= x <= 8 + // range 1 <= x <= 8 FIXME FCC_8 #ifdef ANDROID android::sp<android::GenericPlayer> mAVPlayer; android::sp<android::CallbackProtector> mCallbackProtector; @@ -369,7 +369,7 @@ static SLresult checkDataFormat(const char *name, void *pFormat, DataFormat *pDa do { // check the channel count - // FIXME Android and 8-channel positional assumptions here + // FIXME FCC_8 Android and 8-channel positional assumptions here switch (pDataFormat->mPCM.numChannels) { case 1: // mono case 2: // stereo @@ -444,7 +444,7 @@ static SLresult checkDataFormat(const char *name, void *pFormat, DataFormat *pDa } // check the channel mask - // FIXME Android and 8-channel positional assumptions here + // FIXME FCC_8 Android and 8-channel positional assumptions here switch (pDataFormat->mPCM.channelMask) { case SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT: if (2 != pDataFormat->mPCM.numChannels) { |