diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioEffect.h | 21 | ||||
| -rw-r--r-- | include/media/Visualizer.h | 11 |
2 files changed, 20 insertions, 12 deletions
diff --git a/include/media/AudioEffect.h b/include/media/AudioEffect.h index 02dfc1b..05d834d 100644 --- a/include/media/AudioEffect.h +++ b/include/media/AudioEffect.h @@ -402,6 +402,15 @@ protected: int32_t mId; // system wide unique effect engine instance ID Mutex mLock; // Mutex for mEnabled access + // IEffectClient + virtual void controlStatusChanged(bool controlGranted); + virtual void enableStatusChanged(bool enabled); + virtual void commandExecuted(uint32_t cmdCode, + uint32_t cmdSize, + void *pCmdData, + uint32_t replySize, + void *pReplyData); + private: // Implements the IEffectClient interface @@ -433,20 +442,8 @@ private: AudioEffect *mEffect; }; - - friend class EffectClient; - - // IEffectClient - void controlStatusChanged(bool controlGranted); - void enableStatusChanged(bool enabled); - void commandExecuted(uint32_t cmdCode, - uint32_t cmdSize, - void *pCmdData, - uint32_t replySize, - void *pReplyData); void binderDied(); - sp<IEffect> mIEffect; // IEffect binder interface sp<EffectClient> mIEffectClient; // IEffectClient implementation sp<IMemory> mCblkMemory; // shared memory for deferred parameter setting diff --git a/include/media/Visualizer.h b/include/media/Visualizer.h index 60fa15b..fdec5ee 100644 --- a/include/media/Visualizer.h +++ b/include/media/Visualizer.h @@ -108,6 +108,12 @@ public: // returns the sampling rate of the audio being captured uint32_t getSamplingRate() { return mSampleRate; } + // set the way volume affects the captured data + // mode must one of VISUALIZER_SCALING_MODE_NORMALIZED, + // VISUALIZER_SCALING_MODE_AS_PLAYED + status_t setScalingMode(uint32_t mode); + uint32_t getScalingMode() { return mScalingMode; } + // return a capture in PCM 8 bit unsigned format. The size of the capture is equal to // getCaptureSize() status_t getWaveForm(uint8_t *waveform); @@ -117,6 +123,10 @@ public: // are returned status_t getFft(uint8_t *fft); +protected: + // from IEffectClient + virtual void controlStatusChanged(bool controlGranted); + private: static const uint32_t CAPTURE_RATE_MAX = 20000; @@ -147,6 +157,7 @@ private: uint32_t mCaptureRate; uint32_t mCaptureSize; uint32_t mSampleRate; + uint32_t mScalingMode; capture_cbk_t mCaptureCallBack; void *mCaptureCbkUser; sp<CaptureThread> mCaptureThread; |