summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andy Hung <hunga@google.com> 2014-06-18 17:56:12 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-06-17 21:46:58 +0000
commit1ae1fd4692b475e8bec8f2a45b55463a967f2d40 (patch)
tree783c8deae0d1c4321a60f5061e33cf39c340450b
parent7d4769c18358f6d51bd77d45afe72040f073ab6f (diff)
parent2854ed50254f06c9da21b8fe028b300b6ab267e2 (diff)
Merge "Fix AudioFormat getBytesPerSample to recognize float"
-rw-r--r--media/java/android/media/AudioFormat.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java
index 4b4be1bbcb65..e05aef06e238 100644
--- a/media/java/android/media/AudioFormat.java
+++ b/media/java/android/media/AudioFormat.java
@@ -152,6 +152,8 @@ public class AudioFormat {
switch (audioFormat) {
case ENCODING_PCM_8BIT:
return 1;
+ case ENCODING_PCM_FLOAT:
+ return 4;
case ENCODING_PCM_16BIT:
case ENCODING_DEFAULT:
return 2;