summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioSystem.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-06-11 10:05:30 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2014-06-11 10:05:30 -0700
commitb7f24b101d43139b4c747129bfbc4ecf5c468b86 (patch)
tree1d7cc6375adac742866973ab15d4d5caddf7f033 /media/libmedia/AudioSystem.cpp
parent1a93f0cbb99fc5a59c92bd913f29409022ae236d (diff)
downloadframeworks_av-b7f24b101d43139b4c747129bfbc4ecf5c468b86.zip
frameworks_av-b7f24b101d43139b4c747129bfbc4ecf5c468b86.tar.gz
frameworks_av-b7f24b101d43139b4c747129bfbc4ecf5c468b86.tar.bz2
AudioSystem: remove unused stream type
The audio stream type is not used in the getSampleRate() and getFrameCount() methods. Change-Id: I3d065ae272bd039204cd323cdab9b60460034f2d
Diffstat (limited to 'media/libmedia/AudioSystem.cpp')
-rw-r--r--media/libmedia/AudioSystem.cpp18
1 files changed, 6 insertions, 12 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp
index eafb3ad..15b32ff 100644
--- a/media/libmedia/AudioSystem.cpp
+++ b/media/libmedia/AudioSystem.cpp
@@ -242,11 +242,10 @@ status_t AudioSystem::getOutputSamplingRate(uint32_t* samplingRate, audio_stream
return PERMISSION_DENIED;
}
- return getSamplingRate(output, streamType, samplingRate);
+ return getSamplingRate(output, samplingRate);
}
status_t AudioSystem::getSamplingRate(audio_io_handle_t output,
- audio_stream_type_t streamType,
uint32_t* samplingRate)
{
OutputDescriptor *outputDesc;
@@ -265,13 +264,11 @@ status_t AudioSystem::getSamplingRate(audio_io_handle_t output,
gLock.unlock();
}
if (*samplingRate == 0) {
- ALOGE("AudioSystem::getSamplingRate failed for output %d stream type %d",
- output, streamType);
+ ALOGE("AudioSystem::getSamplingRate failed for output %d", output);
return BAD_VALUE;
}
- ALOGV("getSamplingRate() streamType %d, output %d, sampling rate %u", streamType, output,
- *samplingRate);
+ ALOGV("getSamplingRate() output %d, sampling rate %u", output, *samplingRate);
return NO_ERROR;
}
@@ -289,11 +286,10 @@ status_t AudioSystem::getOutputFrameCount(size_t* frameCount, audio_stream_type_
return PERMISSION_DENIED;
}
- return getFrameCount(output, streamType, frameCount);
+ return getFrameCount(output, frameCount);
}
status_t AudioSystem::getFrameCount(audio_io_handle_t output,
- audio_stream_type_t streamType,
size_t* frameCount)
{
OutputDescriptor *outputDesc;
@@ -310,13 +306,11 @@ status_t AudioSystem::getFrameCount(audio_io_handle_t output,
gLock.unlock();
}
if (*frameCount == 0) {
- ALOGE("AudioSystem::getFrameCount failed for output %d stream type %d",
- output, streamType);
+ ALOGE("AudioSystem::getFrameCount failed for output %d", output);
return BAD_VALUE;
}
- ALOGV("getFrameCount() streamType %d, output %d, frameCount %d", streamType, output,
- *frameCount);
+ ALOGV("getFrameCount() output %d, frameCount %d", output, *frameCount);
return NO_ERROR;
}