commit c3385fc598be35e7db57265283ba867cac07d19c
author Phil Burk <philburk@google.com> Tue Jan 19 12:21:55 2016 -0800
committer Phil Burk <philburk@google.com> Thu Feb 11 19:35:26 2016 +0000
tree be9198cc86d12713fdd40a3cde25382bfa8beccd
parent 670e28e238f0b3617d7eced17cfb5f3414ab3572

Audio passthrough: call audio_has_proportional_frames() for IEC61937

Bug: 24541671
Bug: 20891646
Bug: 26373761
Change-Id: I44351cfb7cfae16e6b3500add727a2c41b0f4e81
Signed-off-by: Phil Burk <philburk@google.com>

include/hardware/audio.h

diff --git a/include/hardware/audio.h b/include/hardware/audio.h
index 49cc0fe..36bfa86 100644
--- a/include/hardware/audio.h
+++ b/include/hardware/audio.h
@@ -462,7 +462,7 @@
     size_t chan_samp_sz;
     audio_format_t format = s->get_format(s);
 
-    if (audio_is_linear_pcm(format)) {
+    if (audio_has_proportional_frames(format)) {
         chan_samp_sz = audio_bytes_per_sample(format);
         return popcount(s->get_channels(s)) * chan_samp_sz;
     }
@@ -478,7 +478,7 @@
     size_t chan_samp_sz;
     audio_format_t format = s->common.get_format(&s->common);
 
-    if (audio_is_linear_pcm(format)) {
+    if (audio_has_proportional_frames(format)) {
         chan_samp_sz = audio_bytes_per_sample(format);
         return audio_channel_count_from_out_mask(s->common.get_channels(&s->common)) * chan_samp_sz;
     }
@@ -494,7 +494,7 @@
     size_t chan_samp_sz;
     audio_format_t format = s->common.get_format(&s->common);
 
-    if (audio_is_linear_pcm(format)) {
+    if (audio_has_proportional_frames(format)) {
         chan_samp_sz = audio_bytes_per_sample(format);
         return audio_channel_count_from_in_mask(s->common.get_channels(&s->common)) * chan_samp_sz;
     }