diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-08-29 17:09:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-29 17:09:37 -0700 |
| commit | f94b2946a511c5cbb6b9001449ca8278cb332bda (patch) | |
| tree | 65bcaa09c8ffb831340fcc9bb92b91d190ec4e46 /include/media | |
| parent | 73e4f3d44f7022b03943ae34f08363e049e4b46f (diff) | |
| parent | 56b592240073b1ab116c6e23a9c4c34ef5ad80d8 (diff) | |
| download | frameworks_av-f94b2946a511c5cbb6b9001449ca8278cb332bda.zip frameworks_av-f94b2946a511c5cbb6b9001449ca8278cb332bda.tar.gz frameworks_av-f94b2946a511c5cbb6b9001449ca8278cb332bda.tar.bz2 | |
am 56b59224: Merge "Add IAudioTrack::getTimestamp()" into klp-dev
* commit '56b592240073b1ab116c6e23a9c4c34ef5ad80d8':
Add IAudioTrack::getTimestamp()
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/AudioTrack.h | 5 | ||||
| -rw-r--r-- | include/media/IAudioTrack.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index ebb7ef3..453c106 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -227,6 +227,7 @@ public: * - INVALID_OPERATION: AudioTrack is already initialized * - BAD_VALUE: invalid parameter (channelMask, format, sampleRate...) * - NO_INIT: audio server or audio hardware not initialized + * If status is not equal to NO_ERROR, don't call any other APIs on this AudioTrack. * If sharedBuffer is non-0, the frameCount parameter is ignored and * replaced by the shared buffer's total allocated size in frame units. * @@ -249,7 +250,7 @@ public: transfer_type transferType = TRANSFER_DEFAULT, const audio_offload_info_t *offloadInfo = NULL); - /* Result of constructing the AudioTrack. This must be checked + /* Result of constructing the AudioTrack. This must be checked for successful initialization * before using any AudioTrack API (except for set()), because using * an uninitialized AudioTrack produces undefined results. * See set() method above for possible return codes. @@ -646,7 +647,7 @@ protected: bool isOffloaded() const { return (mFlags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) != 0; } - // may be changed if IAudioTrack is re-created + // Next 3 fields may be changed if IAudioTrack is re-created, but always != 0 sp<IAudioTrack> mAudioTrack; sp<IMemory> mCblkMemory; audio_track_cblk_t* mCblk; // re-load after mLock.unlock() diff --git a/include/media/IAudioTrack.h b/include/media/IAudioTrack.h index 1014403..afac4ae 100644 --- a/include/media/IAudioTrack.h +++ b/include/media/IAudioTrack.h @@ -26,6 +26,7 @@ #include <binder/IMemory.h> #include <utils/LinearTransform.h> #include <utils/String8.h> +#include <media/AudioTimestamp.h> namespace android { @@ -86,6 +87,9 @@ public: /* Send parameters to the audio hardware */ virtual status_t setParameters(const String8& keyValuePairs) = 0; + + /* Return NO_ERROR if timestamp is valid */ + virtual status_t getTimestamp(AudioTimestamp& timestamp) = 0; }; // ---------------------------------------------------------------------------- |