diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-05-22 18:41:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-22 18:41:38 +0000 |
| commit | 0a7989f5691f161fff97dd550eb602e44a6e6185 (patch) | |
| tree | 79fd65829976dd4efa997ca8e65aa7cc3c2fb968 /include | |
| parent | c5648e09bdacc0882aa55525cc1aad6d09794e11 (diff) | |
| parent | faeb0f291330134dc4468359a36e099aae508449 (diff) | |
| download | frameworks_av-0a7989f5691f161fff97dd550eb602e44a6e6185.zip frameworks_av-0a7989f5691f161fff97dd550eb602e44a6e6185.tar.gz frameworks_av-0a7989f5691f161fff97dd550eb602e44a6e6185.tar.bz2 | |
Merge "libmediaplayerservice: try to open audio sink in offload mode in error." into mnc-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 15 | ||||
| -rw-r--r-- | include/media/MediaPlayerInterface.h | 3 |
2 files changed, 14 insertions, 4 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 458f4b4..e9f0131 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -183,6 +183,10 @@ public: * pid: Process ID of the app which initially requested this AudioTrack * for power management tracking, or -1 for current process ID. * pAttributes: If not NULL, supersedes streamType for use case selection. + * doNotReconnect: If set to true, AudioTrack won't automatically recreate the IAudioTrack + binder to AudioFlinger. + It will return an error instead. The application will recreate + the track based on offloading or different channel configuration, etc. * threadCanCallJava: Not present in parameter list, and so is fixed at false. */ @@ -200,7 +204,8 @@ public: const audio_offload_info_t *offloadInfo = NULL, int uid = -1, pid_t pid = -1, - const audio_attributes_t* pAttributes = NULL); + const audio_attributes_t* pAttributes = NULL, + bool doNotReconnect = false); /* Creates an audio track and registers it with AudioFlinger. * With this constructor, the track is configured for static buffer mode. @@ -228,7 +233,8 @@ public: const audio_offload_info_t *offloadInfo = NULL, int uid = -1, pid_t pid = -1, - const audio_attributes_t* pAttributes = NULL); + const audio_attributes_t* pAttributes = NULL, + bool doNotReconnect = false); /* Terminates the AudioTrack and unregisters it from AudioFlinger. * Also destroys all resources associated with the AudioTrack. @@ -272,7 +278,8 @@ public: const audio_offload_info_t *offloadInfo = NULL, int uid = -1, pid_t pid = -1, - const audio_attributes_t* pAttributes = NULL); + const audio_attributes_t* pAttributes = NULL, + bool doNotReconnect = false); /* Result of constructing the AudioTrack. This must be checked for successful initialization * before using any AudioTrack API (except for set()), because using @@ -877,6 +884,8 @@ protected: // const after set(), except for bits AUDIO_OUTPUT_FLAG_FAST and AUDIO_OUTPUT_FLAG_OFFLOAD. // mLock must be held to read or write those bits reliably. + bool mDoNotReconnect; + int mSessionId; int mAuxEffectId; diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index fa917f9..8c36f0e 100644 --- a/include/media/MediaPlayerInterface.h +++ b/include/media/MediaPlayerInterface.h @@ -113,7 +113,8 @@ public: AudioCallback cb = NULL, void *cookie = NULL, audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, - const audio_offload_info_t *offloadInfo = NULL) = 0; + const audio_offload_info_t *offloadInfo = NULL, + bool doNotResuscitate = false) = 0; virtual status_t start() = 0; |