diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 6 | ||||
| -rw-r--r-- | include/media/IAudioPolicyService.h | 6 | ||||
| -rw-r--r-- | include/media/IDrm.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/MediaCodecSource.h | 3 | ||||
| -rw-r--r-- | include/soundtrigger/ISoundTriggerClient.h | 4 | ||||
| -rw-r--r-- | include/soundtrigger/ISoundTriggerHwService.h | 2 | ||||
| -rw-r--r-- | include/soundtrigger/SoundTrigger.h | 8 | ||||
| -rw-r--r-- | include/soundtrigger/SoundTriggerCallback.h | 4 |
8 files changed, 32 insertions, 3 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index cf34991..f22792f 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -309,6 +309,12 @@ public: /* Set audio port configuration */ static status_t setAudioPortConfig(const struct audio_port_config *config); + + static status_t acquireSoundTriggerSession(audio_session_t *session, + audio_io_handle_t *ioHandle, + audio_devices_t *device); + static status_t releaseSoundTriggerSession(audio_session_t session); + // ---------------------------------------------------------------------------- class AudioPortCallback : public RefBase diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h index abbda32..c251439 100644 --- a/include/media/IAudioPolicyService.h +++ b/include/media/IAudioPolicyService.h @@ -136,6 +136,12 @@ public: virtual status_t setAudioPortConfig(const struct audio_port_config *config) = 0; virtual void registerClient(const sp<IAudioPolicyServiceClient>& client) = 0; + + virtual status_t acquireSoundTriggerSession(audio_session_t *session, + audio_io_handle_t *ioHandle, + audio_devices_t *device) = 0; + + virtual status_t releaseSoundTriggerSession(audio_session_t session) = 0; }; diff --git a/include/media/IDrm.h b/include/media/IDrm.h index 32ae28e..68de87a 100644 --- a/include/media/IDrm.h +++ b/include/media/IDrm.h @@ -70,6 +70,8 @@ struct IDrm : public IInterface { Vector<uint8_t> &certificate, Vector<uint8_t> &wrappedKey) = 0; + virtual status_t unprovisionDevice() = 0; + virtual status_t getSecureStops(List<Vector<uint8_t> > &secureStops) = 0; virtual status_t releaseSecureStops(Vector<uint8_t> const &ssRelease) = 0; diff --git a/include/media/stagefright/MediaCodecSource.h b/include/media/stagefright/MediaCodecSource.h index 4b18a0b..e1b2830 100644 --- a/include/media/stagefright/MediaCodecSource.h +++ b/include/media/stagefright/MediaCodecSource.h @@ -106,7 +106,6 @@ private: bool mStarted; bool mStopping; bool mDoMoreWorkPending; - bool mPullerReachedEOS; sp<AMessage> mEncoderActivityNotify; sp<IGraphicBufferProducer> mGraphicBufferProducer; Vector<sp<ABuffer> > mEncoderInputBuffers; @@ -123,7 +122,7 @@ private: Mutex mOutputBufferLock; Condition mOutputBufferCond; List<MediaBuffer*> mOutputBufferQueue; - bool mEncodedReachedEOS; + bool mEncoderReachedEOS; status_t mErrorCode; DISALLOW_EVIL_CONSTRUCTORS(MediaCodecSource); diff --git a/include/soundtrigger/ISoundTriggerClient.h b/include/soundtrigger/ISoundTriggerClient.h index 7f86d02..480429a 100644 --- a/include/soundtrigger/ISoundTriggerClient.h +++ b/include/soundtrigger/ISoundTriggerClient.h @@ -31,6 +31,10 @@ public: virtual void onRecognitionEvent(const sp<IMemory>& eventMemory) = 0; + virtual void onSoundModelEvent(const sp<IMemory>& eventMemory) = 0; + + virtual void onServiceStateChange(const sp<IMemory>& eventMemory) = 0; + }; // ---------------------------------------------------------------------------- diff --git a/include/soundtrigger/ISoundTriggerHwService.h b/include/soundtrigger/ISoundTriggerHwService.h index 05a764a..ae0cb01 100644 --- a/include/soundtrigger/ISoundTriggerHwService.h +++ b/include/soundtrigger/ISoundTriggerHwService.h @@ -39,6 +39,8 @@ public: virtual status_t attach(const sound_trigger_module_handle_t handle, const sp<ISoundTriggerClient>& client, sp<ISoundTrigger>& module) = 0; + + virtual status_t setCaptureState(bool active) = 0; }; // ---------------------------------------------------------------------------- diff --git a/include/soundtrigger/SoundTrigger.h b/include/soundtrigger/SoundTrigger.h index 1f7f286..bf5e1de 100644 --- a/include/soundtrigger/SoundTrigger.h +++ b/include/soundtrigger/SoundTrigger.h @@ -18,6 +18,7 @@ #define ANDROID_HARDWARE_SOUNDTRIGGER_H #include <binder/IBinder.h> +#include <utils/threads.h> #include <soundtrigger/SoundTriggerCallback.h> #include <soundtrigger/ISoundTrigger.h> #include <soundtrigger/ISoundTriggerHwService.h> @@ -32,12 +33,15 @@ class SoundTrigger : public BnSoundTriggerClient, public IBinder::DeathRecipient { public: + + virtual ~SoundTrigger(); + static status_t listModules(struct sound_trigger_module_descriptor *modules, uint32_t *numModules); static sp<SoundTrigger> attach(const sound_trigger_module_handle_t module, const sp<SoundTriggerCallback>& callback); - virtual ~SoundTrigger(); + static status_t setCaptureState(bool active); void detach(); @@ -51,6 +55,8 @@ public: // BpSoundTriggerClient virtual void onRecognitionEvent(const sp<IMemory>& eventMemory); + virtual void onSoundModelEvent(const sp<IMemory>& eventMemory); + virtual void onServiceStateChange(const sp<IMemory>& eventMemory); //IBinder::DeathRecipient virtual void binderDied(const wp<IBinder>& who); diff --git a/include/soundtrigger/SoundTriggerCallback.h b/include/soundtrigger/SoundTriggerCallback.h index 8a5ba02..b5277f2 100644 --- a/include/soundtrigger/SoundTriggerCallback.h +++ b/include/soundtrigger/SoundTriggerCallback.h @@ -31,6 +31,10 @@ public: virtual void onRecognitionEvent(struct sound_trigger_recognition_event *event) = 0; + virtual void onSoundModelEvent(struct sound_trigger_model_event *event) = 0; + + virtual void onServiceStateChange(sound_trigger_service_state_t state) = 0; + virtual void onServiceDied() = 0; }; |