diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-25 17:48:57 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-03-25 18:09:12 -0700 |
| commit | 241618f1b286f9e7e02fe61e96d9194e2e1e8a7a (patch) | |
| tree | fcec6a520e30f66bbb1b5e072f8aadb247724a67 | |
| parent | 1392eb3d1802e9f894f87d7a7387207d1b6faca1 (diff) | |
| download | frameworks_av-241618f1b286f9e7e02fe61e96d9194e2e1e8a7a.zip frameworks_av-241618f1b286f9e7e02fe61e96d9194e2e1e8a7a.tar.gz frameworks_av-241618f1b286f9e7e02fe61e96d9194e2e1e8a7a.tar.bz2 | |
Remove streamType parameter from AudioSystem::getLatency()
Change-Id: Ie7346e93436ddc215cad7d16be555dcb6c277d54
| -rw-r--r-- | include/media/AudioSystem.h | 1 | ||||
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 5 | ||||
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 28fdfd4..339a2a7 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -113,7 +113,6 @@ public: // returns the audio output stream latency in ms. Corresponds to // audio_stream_out->get_latency() static status_t getLatency(audio_io_handle_t output, - audio_stream_type_t stream, uint32_t* latency); static bool routedToA2dpOutput(audio_stream_type_t streamType); diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 140fb66..758e660 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -333,11 +333,10 @@ status_t AudioSystem::getOutputLatency(uint32_t* latency, audio_stream_type_t st return PERMISSION_DENIED; } - return getLatency(output, streamType, latency); + return getLatency(output, latency); } status_t AudioSystem::getLatency(audio_io_handle_t output, - audio_stream_type_t streamType __unused, uint32_t* latency) { OutputDescriptor *outputDesc; @@ -354,7 +353,7 @@ status_t AudioSystem::getLatency(audio_io_handle_t output, gLock.unlock(); } - ALOGV("getLatency() streamType %d, output %d, latency %d", streamType, output, *latency); + ALOGV("getLatency() output %d, latency %d", output, *latency); return NO_ERROR; } diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 20c1cdb..fa7249b 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -878,7 +878,7 @@ status_t AudioTrack::createTrack_l(size_t epoch) // Not all of these values are needed under all conditions, but it is easier to get them all uint32_t afLatency; - status = AudioSystem::getLatency(output, mStreamType, &afLatency); + status = AudioSystem::getLatency(output, &afLatency); if (status != NO_ERROR) { ALOGE("getLatency(%d) failed status %d", output, status); goto release; |