commit fda30476da2d799f21b5c02664a9e1c135b84ecd
author Mikhail Naganov <mnaganov@google.com> Mon Nov 11 18:29:09 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 11 18:29:09 2019 -0800
tree f5ba1816b2dac674e64247a32160a63d5678bb87
parent 93aa2fa353fbc926f06b05579f9f3cfce2abbfbb
parent 3fe18ca38f1c6b6d27b9322dab9f0c77eb1000b2

Merge "r_submix: Fix get_next_write_timestamp and get_input_buffer_size"
am: 3fe18ca38f

Change-Id: Ib7e151867daf46959a0996145f293143921bbb8f

modules/audio_remote_submix/audio_hw.cpp

diff --git a/modules/audio_remote_submix/audio_hw.cpp b/modules/audio_remote_submix/audio_hw.cpp
index f778693..dda0d0e 100644
--- a/modules/audio_remote_submix/audio_hw.cpp
+++ b/modules/audio_remote_submix/audio_hw.cpp
@@ -962,7 +962,7 @@
 {
     (void)stream;
     (void)timestamp;
-    return -EINVAL;
+    return -ENOSYS;
 }
 
 /** audio_stream_in implementation **/
@@ -1554,6 +1554,9 @@
         }
         const size_t frame_size_in_bytes = audio_channel_count_from_in_mask(config->channel_mask) *
                 audio_bytes_per_sample(config->format);
+        if (max_buffer_period_size_frames == 0) {
+            max_buffer_period_size_frames = DEFAULT_PIPE_SIZE_IN_FRAMES;
+        }
         const size_t buffer_size = max_buffer_period_size_frames * frame_size_in_bytes;
         SUBMIX_ALOGV("adev_get_input_buffer_size() returns %zu bytes, %zu frames",
                  buffer_size, max_buffer_period_size_frames);