diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-07-07 13:27:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-02 20:11:01 +0000 |
| commit | 5c68f959eaa2e02fed5643c78e281fff42bcc0a2 (patch) | |
| tree | c2009db526d2f2d81713f149edf2bc7a7adf41b6 /services/audioflinger | |
| parent | 11fa4012f1c68083abfc21972f3f46da397d2c5c (diff) | |
| parent | 7df8c0b799d8f52d6386e03313286dbd7d5cdc7c (diff) | |
| download | frameworks_av-5c68f959eaa2e02fed5643c78e281fff42bcc0a2.zip frameworks_av-5c68f959eaa2e02fed5643c78e281fff42bcc0a2.tar.gz frameworks_av-5c68f959eaa2e02fed5643c78e281fff42bcc0a2.tar.bz2 | |
Merge "IAudioFlinger::openRecord now suggests notificationFrames"
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 3 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 1 | ||||
| -rwxr-xr-x | services/audioflinger/Threads.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/Threads.h | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index a269886..2124f85 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1333,6 +1333,7 @@ sp<IAudioRecord> AudioFlinger::openRecord( IAudioFlinger::track_flags_t *flags, pid_t tid, int *sessionId, + size_t *notificationFrames, sp<IMemory>& cblk, sp<IMemory>& buffers, status_t *status) @@ -1407,7 +1408,7 @@ sp<IAudioRecord> AudioFlinger::openRecord( // TODO: the uid should be passed in as a parameter to openRecord recordTrack = thread->createRecordTrack_l(client, sampleRate, format, channelMask, - frameCount, lSessionId, + frameCount, lSessionId, notificationFrames, IPCThreadState::self()->getCallingUid(), flags, tid, &lStatus); LOG_ALWAYS_FATAL_IF((lStatus == NO_ERROR) && (recordTrack == 0)); diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 1ccef24..4df0921 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -120,6 +120,7 @@ public: IAudioFlinger::track_flags_t *flags, pid_t tid, int *sessionId, + size_t *notificationFrames, sp<IMemory>& cblk, sp<IMemory>& buffers, status_t *status /*non-NULL*/); diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 324f3ae..11d13a8 100755 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -5443,6 +5443,7 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe audio_channel_mask_t channelMask, size_t *pFrameCount, int sessionId, + size_t *notificationFrames, int uid, IAudioFlinger::track_flags_t *flags, pid_t tid, @@ -5512,6 +5513,7 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe } } *pFrameCount = frameCount; + *notificationFrames = 0; // FIXME implement lStatus = initCheck(); if (lStatus != NO_ERROR) { diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h index 3eb1eb9..c265833 100644 --- a/services/audioflinger/Threads.h +++ b/services/audioflinger/Threads.h @@ -1072,6 +1072,7 @@ public: audio_channel_mask_t channelMask, size_t *pFrameCount, int sessionId, + size_t *notificationFrames, int uid, IAudioFlinger::track_flags_t *flags, pid_t tid, |