Revert of Use actual audio channel count in Spitzer audio decoder

media/base/android/ndk_media_codec_bridge.cc

 // 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.
 
 #include "media/base/android/ndk_media_codec_bridge.h"
 
 #include <media/NdkMediaError.h>
 #include <media/NdkMediaFormat.h>
 
 #include <limits>
@@ skipping 219 matching lines @@
 }
 
 MediaCodecStatus NdkMediaCodecBridge::GetInputBuffer(int input_buffer_index,
                                                      uint8_t** data,
                                                      size_t* capacity) {
   *data = AMediaCodec_getInputBuffer(media_codec_.get(), input_buffer_index,
                                      capacity);
   return MEDIA_CODEC_OK;
 }
 
-MediaCodecStatus NdkMediaCodecBridge::GetOutputBufferAddress(
-    int index,
-    size_t offset,
-    const uint8_t** addr,
-    size_t* capacity) {
+MediaCodecStatus NdkMediaCodecBridge::CopyFromOutputBuffer(int index,
+                                                           size_t offset,
+                                                           void* dst,
+                                                           size_t num) {
+  size_t capacity;
   const uint8_t* src_data =
-      AMediaCodec_getOutputBuffer(media_codec_.get(), index, capacity);
-  *addr = src_data + offset;
-  *capacity -= offset;
+      AMediaCodec_getOutputBuffer(media_codec_.get(), index, &capacity);
+  CHECK_GE(capacity, offset + num);
+  memcpy(dst, src_data + offset, num);
   return MEDIA_CODEC_OK;
 }
 
 }  // namespace media