diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-26 20:44:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-26 20:44:49 +0000 |
| commit | 8c7b9fb41585fccb06573252823b929c82a40999 (patch) | |
| tree | b15b9c23c2440bf1df24350f1034064016110897 /media/libmedia | |
| parent | f7f21b93bfce562784ee8f632fb01a2f8e4ffa6b (diff) | |
| parent | 241618f1b286f9e7e02fe61e96d9194e2e1e8a7a (diff) | |
| download | frameworks_av-8c7b9fb41585fccb06573252823b929c82a40999.zip frameworks_av-8c7b9fb41585fccb06573252823b929c82a40999.tar.gz frameworks_av-8c7b9fb41585fccb06573252823b929c82a40999.tar.bz2 | |
Merge "Remove streamType parameter from AudioSystem::getLatency()"
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 5 | ||||
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index c418466..195aadf 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 62fd7b9..6bb8118 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -868,7 +868,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; |