diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-05-09 23:14:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-09 23:14:12 +0000 |
| commit | 16821ec9e1619f4edcc87f21ea1537580109b14d (patch) | |
| tree | 37a6c2c5cc999557c0140cc6f5c46fd44e2cc31f /include | |
| parent | 01427884471391999393a15abbb95b5f0dce7d3b (diff) | |
| parent | d776ac63ce9c013c9626226e43f7db606e035838 (diff) | |
| download | frameworks_av-16821ec9e1619f4edcc87f21ea1537580109b14d.zip frameworks_av-16821ec9e1619f4edcc87f21ea1537580109b14d.tar.gz frameworks_av-16821ec9e1619f4edcc87f21ea1537580109b14d.tar.bz2 | |
Merge "IAudioFlinger::openRecord returns IMemory(s)"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioRecord.h | 4 | ||||
| -rw-r--r-- | include/media/IAudioFlinger.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index b3c44a8..6a68c94 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -490,10 +490,12 @@ private: int mSessionId; transfer_type mTransfer; - // Next 4 fields may be changed if IAudioRecord is re-created, but always != 0 + // Next 5 fields may be changed if IAudioRecord is re-created, but always != 0 + // provided the initial set() was successful sp<IAudioRecord> mAudioRecord; sp<IMemory> mCblkMemory; audio_track_cblk_t* mCblk; // re-load after mLock.unlock() + sp<IMemory> mBufferMemory; audio_io_handle_t mInput; // returned by AudioSystem::getInput() int mPreviousPriority; // before start() diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 9101f06..7db6a48 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -88,6 +88,8 @@ public: track_flags_t *flags, pid_t tid, // -1 means unused, otherwise must be valid non-0 int *sessionId, + sp<IMemory>& cblk, + sp<IMemory>& buffers, // return value 0 means it follows cblk status_t *status) = 0; /* query the audio hardware state. This state never changes, |