diff options
author | Glenn Kasten <gkasten@google.com> | 2012-04-02 11:19:11 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-02 11:19:11 -0700 |
commit | dca856f5cb849b8feab2d24f3248f25d887211ee (patch) | |
tree | 7310d419fe1dd1805cfe4d07aaeeae17de938d4e | |
parent | 49a692c3a659aee0a065304d1f845ee1290687ca (diff) | |
parent | 4a4a0959bca78e03e3c3f486ba17829c28314d8c (diff) | |
download | frameworks_av-dca856f5cb849b8feab2d24f3248f25d887211ee.zip frameworks_av-dca856f5cb849b8feab2d24f3248f25d887211ee.tar.gz frameworks_av-dca856f5cb849b8feab2d24f3248f25d887211ee.tar.bz2 |
Merge "AudioTrack client fast policy"
-rw-r--r-- | include/media/AudioTrack.h | 8 | ||||
-rw-r--r-- | media/libmedia/AudioTrack.cpp | 23 |
2 files changed, 25 insertions, 6 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 7d5d772..6de6486 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -139,13 +139,15 @@ public: * latency of the track. The actual size selected by the AudioTrack could be * larger if the requested size is not compatible with current audio HAL * latency. - * flags: Reserved for future use. + * flags: See comments on audio_policy_output_flags_t in <system/audio_policy.h>. * cbf: Callback function. If not null, this function is called periodically * to request new PCM data. * user: Context for use by the callback receiver. * notificationFrames: The callback function is called each time notificationFrames PCM * frames have been consumed from track input buffer. * sessionId: Specific session ID, or zero to use default. + * threadCanCallJava: Whether callbacks are made from an attached thread and thus can call JNI. + * If not present in parameter list, then fixed at false. */ AudioTrack( audio_stream_type_t streamType, @@ -157,7 +159,7 @@ public: callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, - int sessionId = 0); + int sessionId = 0); // DEPRECATED explicit AudioTrack( int streamType, @@ -189,7 +191,7 @@ public: callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, - int sessionId = 0); + int sessionId = 0); /* Terminates the AudioTrack and unregisters it from AudioFlinger. * Also destroys all resources associated with the AudioTrack. diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index d73eabd..c619ad7 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -226,7 +226,8 @@ status_t AudioTrack::set( // force direct flag if format is not linear PCM if (!audio_is_linear_pcm(format)) { - flags = (audio_policy_output_flags_t) (flags | AUDIO_POLICY_OUTPUT_FLAG_DIRECT); + flags = (audio_policy_output_flags_t) + ((flags | AUDIO_POLICY_OUTPUT_FLAG_DIRECT) & ~AUDIO_POLICY_OUTPUT_FLAG_FAST); } if (!audio_is_output_channel(channelMask)) { @@ -252,6 +253,7 @@ status_t AudioTrack::set( mNotificationFramesReq = notificationFrames; mSessionId = sessionId; mAuxEffectId = 0; + mCbf = cbf; // create the IAudioTrack status_t status = createTrack_l(streamType, @@ -280,7 +282,6 @@ status_t AudioTrack::set( mSharedBuffer = sharedBuffer; mMuted = false; mActive = false; - mCbf = cbf; mUserData = user; mLoopCount = 0; mMarkerPosition = 0; @@ -762,6 +763,18 @@ status_t AudioTrack::createTrack_l( return NO_INIT; } + // Client decides whether the track is TIMED (see below), but can only express a preference + // for FAST. Server will perform additional tests. + if ((flags & AUDIO_POLICY_OUTPUT_FLAG_FAST) && !( + // either of these use cases: + // use case 1: shared buffer + (sharedBuffer != 0) || + // use case 2: callback handler + (mCbf != NULL))) { + ALOGW("AUDIO_POLICY_OUTPUT_FLAG_FAST denied"); + flags = (audio_policy_output_flags_t) (flags & ~AUDIO_POLICY_OUTPUT_FLAG_FAST); + } + mNotificationFramesAct = mNotificationFramesReq; if (!audio_is_linear_pcm(format)) { if (sharedBuffer != 0) { @@ -786,7 +799,7 @@ status_t AudioTrack::createTrack_l( if (mNotificationFramesAct > (uint32_t)frameCount/2) { mNotificationFramesAct = frameCount/2; } - if (frameCount < minFrameCount) { + if (frameCount < minFrameCount && !(flags & AUDIO_POLICY_OUTPUT_FLAG_FAST)) { // not ALOGW because it happens all the time when playing key clicks over A2DP ALOGV("Minimum buffer size corrected from %d to %d", frameCount, minFrameCount); @@ -807,6 +820,10 @@ status_t AudioTrack::createTrack_l( if (mIsTimed) { trackFlags |= IAudioFlinger::TRACK_TIMED; } + if (flags & AUDIO_POLICY_OUTPUT_FLAG_FAST) { + trackFlags |= IAudioFlinger::TRACK_FAST; + } + sp<IAudioTrack> track = audioFlinger->createTrack(getpid(), streamType, sampleRate, |