Reland: Use actual audio channel count in Spitzer audio decoder

media/base/android/media_codec_bridge.h

Index: media/base/android/media_codec_bridge.h
diff --git a/media/base/android/media_codec_bridge.h b/media/base/android/media_codec_bridge.h
index f45f873bfc74d230b7862167e801739d38593d75..434f1806761705aa803a334caf1c390cdee24b45 100644
--- a/media/base/android/media_codec_bridge.h
+++ b/media/base/android/media_codec_bridge.h
@@ -156,14 +156,23 @@ class MEDIA_EXPORT MediaCodecBridge {
                                           uint8_t** data,
                                           size_t* capacity) = 0;
 
-  // Copy |num| bytes from output buffer |index|'s |offset| into the memory
+  // Gives the access to buffer's data which is referenced by |index| and
+  // |offset|. The size of available data for reading is written to |*capacity|
+  // and the address is written to |*addr|.
+  // Returns MEDIA_CODEC_ERROR if a error occurs, or MEDIA_CODEC_OK otherwise.
+  virtual MediaCodecStatus GetOutputBufferAddress(int index,
+                                                  size_t offset,
+                                                  const uint8_t** addr,
+                                                  size_t* capacity) = 0;
+
+  // Copies |num| bytes from output buffer |index|'s |offset| into the memory
   // region pointed to by |dst|. To avoid overflows, the size of both source
   // and destination must be at least |num| bytes, and should not overlap.
   // Returns MEDIA_CODEC_ERROR if an error occurs, or MEDIA_CODEC_OK otherwise.
-  virtual MediaCodecStatus CopyFromOutputBuffer(int index,
-                                                size_t offset,
-                                                void* dst,
-                                                size_t num) = 0;
+  MediaCodecStatus CopyFromOutputBuffer(int index,
+                                        size_t offset,
+                                        void* dst,
+                                        size_t num);
 
  protected:
   MediaCodecBridge();