diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-08-29 17:12:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-29 17:12:44 -0700 |
| commit | ec9ad1b0947f5d6b465281312dbe92f096a8f881 (patch) | |
| tree | 71a3b3f48c0c563311db4fedf75efa5241d2d2c9 /include/media/AudioTrack.h | |
| parent | 6dc365f0d5a92084517f0c3846e4f07fc7206bab (diff) | |
| parent | f94b2946a511c5cbb6b9001449ca8278cb332bda (diff) | |
| download | frameworks_av-ec9ad1b0947f5d6b465281312dbe92f096a8f881.zip frameworks_av-ec9ad1b0947f5d6b465281312dbe92f096a8f881.tar.gz frameworks_av-ec9ad1b0947f5d6b465281312dbe92f096a8f881.tar.bz2 | |
am f94b2946: am 56b59224: Merge "Add IAudioTrack::getTimestamp()" into klp-dev
* commit 'f94b2946a511c5cbb6b9001449ca8278cb332bda':
Add IAudioTrack::getTimestamp()
Diffstat (limited to 'include/media/AudioTrack.h')
| -rw-r--r-- | include/media/AudioTrack.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index d5e0981..56bf49a 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() |