From c85df82b1e8b05714268926a8bb3deb9c65f9a22 Mon Sep 17 00:00:00 2001
From: Glenn Kasten <gkasten@google.com>
Date: Mon, 24 Feb 2014 15:13:40 -0800
Subject: Permit AudioRecord to support non-linear formats in future

But still restricted to 16-bit PCM currently

Change-Id: I5df0e5033da9144ca73e44addf14a63d31406034
---
 media/libmedia/AudioRecord.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'media/libmedia/AudioRecord.cpp')

diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index b6b6d14..e18819c 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -211,8 +211,11 @@ status_t AudioRecord::set(
     uint32_t channelCount = popcount(channelMask);
     mChannelCount = channelCount;
 
-    // Assumes audio_is_linear_pcm(format), else sizeof(uint8_t)
-    mFrameSize = channelCount * audio_bytes_per_sample(format);
+    if (audio_is_linear_pcm(format)) {
+        mFrameSize = channelCount * audio_bytes_per_sample(format);
+    } else {
+        mFrameSize = sizeof(uint8_t);
+    }
 
     // validate framecount
     size_t minFrameCount = 0;
-- 
cgit v1.1