Reland: Use actual audio channel count in Spitzer audio decoder

media/base/android/ndk_media_codec_bridge.h

Index: media/base/android/ndk_media_codec_bridge.h
diff --git a/media/base/android/ndk_media_codec_bridge.h b/media/base/android/ndk_media_codec_bridge.h
index 8278a1ba5bd86357f7ce8fa58360989bc4fd6433..2e8c68e05a1de388a52a496b6ddcf916a5c47e38 100644
--- a/media/base/android/ndk_media_codec_bridge.h
+++ b/media/base/android/ndk_media_codec_bridge.h
@@ -59,10 +59,10 @@ class MEDIA_EXPORT NdkMediaCodecBridge : public MediaCodecBridge {
   MediaCodecStatus GetInputBuffer(int input_buffer_index,
                                   uint8_t** data,
                                   size_t* capacity) override;
-  MediaCodecStatus CopyFromOutputBuffer(int index,
-                                        size_t offset,
-                                        void* dst,
-                                        size_t num) override;
+  MediaCodecStatus GetOutputBufferAddress(int index,
+                                          size_t offset,
+                                          const uint8_t** addr,
+                                          size_t* capacity) override;
 
  protected:
   NdkMediaCodecBridge(const std::string& mime,