Reland: Use actual audio channel count in Spitzer audio decoder

media/base/android/ndk_media_codec_bridge.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
 
 #include <media/NdkMediaCodec.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 41 matching lines @@
                                        int* index,
                                        size_t* offset,
                                        size_t* size,
                                        base::TimeDelta* presentation_time,
                                        bool* end_of_stream,
                                        bool* key_frame) override;
   void ReleaseOutputBuffer(int index, bool render) override;
   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,
                       bool is_secure,
                       MediaCodecDirection direction);
 
  private:
   struct AMediaCodecDeleter {
     inline void operator()(AMediaCodec* ptr) const { AMediaCodec_delete(ptr); }
   };
 
   std::unique_ptr<AMediaCodec, AMediaCodecDeleter> media_codec_;
 
   DISALLOW_COPY_AND_ASSIGN(NdkMediaCodecBridge);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_