diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-26 21:13:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-26 21:13:18 +0000 |
| commit | b8f8d231685afdec472136b45c527a71bfb8bcc4 (patch) | |
| tree | 8f5afcbeec0aa0e9c441c5fc1c42a8a8b35d77f3 /include | |
| parent | 9b6fcc2f8294d21b859b4cbcff84107a499e221f (diff) | |
| parent | 0ed19594452c901c3c8665d06610fffe46895d06 (diff) | |
| download | frameworks_av-b8f8d231685afdec472136b45c527a71bfb8bcc4.zip frameworks_av-b8f8d231685afdec472136b45c527a71bfb8bcc4.tar.gz frameworks_av-b8f8d231685afdec472136b45c527a71bfb8bcc4.tar.bz2 | |
Merge "Remove stream type from AudioSystem::getRenderPosition()"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 862f919..402b479 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -124,8 +124,7 @@ public: static status_t setVoiceVolume(float volume); // return the number of audio frames written by AudioFlinger to audio HAL and - // audio dsp to DAC since the output on which the specified stream is playing - // has exited standby. + // audio dsp to DAC since the specified output I/O handle has exited standby. // returned status (from utils/Errors.h) can be: // - NO_ERROR: successful operation, halFrames and dspFrames point to valid data // - INVALID_OPERATION: Not supported on current hardware platform @@ -134,8 +133,7 @@ public: // necessary to check returned status before using the returned values. static status_t getRenderPosition(audio_io_handle_t output, uint32_t *halFrames, - uint32_t *dspFrames, - audio_stream_type_t stream = AUDIO_STREAM_DEFAULT); + uint32_t *dspFrames); // return the number of input frames lost by HAL implementation, or 0 if the handle is invalid static uint32_t getInputFramesLost(audio_io_handle_t ioHandle); |