From c7a2b008e4e490be01bc6ed46c75400077a2fc52 Mon Sep 17 00:00:00 2001
From: Phil Burk <philburk@google.com>
Date: Fri, 15 Dec 2017 11:47:56 -0800
Subject: [PATCH] oboe: make chanCountToChanMask non-virtual

---
 src/opensles/AudioInputStreamOpenSLES.h  | 3 ++-
 src/opensles/AudioOutputStreamOpenSLES.h | 2 +-
 src/opensles/AudioStreamOpenSLES.h       | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/opensles/AudioInputStreamOpenSLES.h b/src/opensles/AudioInputStreamOpenSLES.h
index 9fb79f576..89c03d07d 100644
--- a/src/opensles/AudioInputStreamOpenSLES.h
+++ b/src/opensles/AudioInputStreamOpenSLES.h
@@ -49,7 +49,8 @@ class AudioInputStreamOpenSLES : public AudioStreamOpenSLES {
                               StreamState *nextState,
                               int64_t timeoutNanoseconds) override;
 
-    int chanCountToChanMask(int chanCount) override;
+    int chanCountToChanMask(int chanCount);
+
 private:
 
     Result setRecordState(SLuint32 newState);
diff --git a/src/opensles/AudioOutputStreamOpenSLES.h b/src/opensles/AudioOutputStreamOpenSLES.h
index 9e73f2ae3..f8b83de9f 100644
--- a/src/opensles/AudioOutputStreamOpenSLES.h
+++ b/src/opensles/AudioOutputStreamOpenSLES.h
@@ -48,7 +48,7 @@ class AudioOutputStreamOpenSLES : public AudioStreamOpenSLES {
                               StreamState *nextState,
                               int64_t timeoutNanoseconds) override;
 
-    int chanCountToChanMask(int chanCount) override;
+    int chanCountToChanMask(int chanCount);
 
 private:
 
diff --git a/src/opensles/AudioStreamOpenSLES.h b/src/opensles/AudioStreamOpenSLES.h
index da4a9adeb..7056e57b4 100644
--- a/src/opensles/AudioStreamOpenSLES.h
+++ b/src/opensles/AudioStreamOpenSLES.h
@@ -57,8 +57,6 @@ class AudioStreamOpenSLES : public AudioStreamBuffered {
 
     int32_t getFramesPerBurst() override;
 
-    virtual int chanCountToChanMask(int chanCount) = 0;
-
     /**
      * Process next OpenSL ES buffer.
      * Called by by OpenSL ES framework.