diff options
| -rw-r--r-- | include/media/AudioSystem.h | 2 | ||||
| -rwxr-xr-x | services/audioflinger/Threads.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index c89ceaa..e1aab41 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -108,7 +108,7 @@ public: static status_t getSamplingRate(audio_io_handle_t output, uint32_t* samplingRate); // returns the number of frames per audio HAL write buffer. Corresponds to - // audio_stream->get_buffer_size()/audio_stream_frame_size() + // audio_stream->get_buffer_size()/audio_stream_out_frame_size() static status_t getFrameCount(audio_io_handle_t output, size_t* frameCount); // returns the audio output stream latency in ms. Corresponds to diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 67a0119..324f3ae 100755 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1815,7 +1815,7 @@ void AudioFlinger::PlaybackThread::readOutputParameters_l() LOG_FATAL("HAL format %#x not supported for mixed output", mFormat); } - mFrameSize = audio_stream_frame_size(&mOutput->stream->common); + mFrameSize = audio_stream_out_frame_size(mOutput->stream); mBufferSize = mOutput->stream->common.get_buffer_size(&mOutput->stream->common); mFrameCount = mBufferSize / mFrameSize; if (mFrameCount & 15) { @@ -4466,7 +4466,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::OffloadThread::prepareTr size_t audioHALFrames = (mOutput->stream->get_latency(mOutput->stream)*mSampleRate) / 1000; size_t framesWritten = - mBytesWritten / audio_stream_frame_size(&mOutput->stream->common); + mBytesWritten / audio_stream_out_frame_size(mOutput->stream); track->presentationComplete(framesWritten, audioHALFrames); track->reset(); tracksToRemove->add(track); @@ -6011,7 +6011,7 @@ void AudioFlinger::RecordThread::readInputParameters_l() if (mFormat != AUDIO_FORMAT_PCM_16_BIT) { ALOGE("HAL format %#x not supported; must be AUDIO_FORMAT_PCM_16_BIT", mFormat); } - mFrameSize = audio_stream_frame_size(&mInput->stream->common); + mFrameSize = audio_stream_in_frame_size(mInput->stream); mBufferSize = mInput->stream->common.get_buffer_size(&mInput->stream->common); mFrameCount = mBufferSize / mFrameSize; // This is the formula for calculating the temporary buffer size. |