Refactor MediaCodecBridge to add support for NDK APIs

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
new file mode 100644
index 0000000000000000000000000000000000000000..33bd51a4386847eea915fd13fc79dc9c9ede6464
--- /dev/null
+++ b/media/base/android/ndk_media_codec_bridge.h
@@ -0,0 +1,79 @@
+// 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>

[xhwang, 2015/12/04 18:07:58]

hmm, without any reference page. How are people supposed to maintain this code?

[qinmin, 2015/12/04 20:26:04]

like what happened to opensles_output.cc code, there is no reference for
OpenSLES_Android. But the header file included here should provide good
information for developers to understand how to use the calls. 

+
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/time/time.h"
+#include "media/base/android/media_codec_bridge.h"
+#include "media/base/media_export.h"
+
+namespace media {
+
+class MEDIA_EXPORT NdkMediaCodecBridge : public MediaCodecBridge {
+ public:
+  ~NdkMediaCodecBridge() override;
+
+  // MediaCodecBridge implementation.
+  MediaCodecStatus Reset() override;
+  bool Start() override;
+  void Stop() override;
+  void GetOutputFormat(int* width, int* height) override;
+  int GetOutputSamplingRate() override;
+  MediaCodecStatus QueueInputBuffer(
+      int index,
+      const uint8* data,
+      size_t data_size,
+      const base::TimeDelta& presentation_time) override;
+  using MediaCodecBridge::QueueSecureInputBuffer;
+  MediaCodecStatus QueueSecureInputBuffer(
+      int index,
+      const uint8* data,
+      size_t data_size,
+      std::vector<char> key_id,
+      std::vector<char> iv,
+      const SubsampleEntry* subsamples,
+      int subsamples_size,
+      const base::TimeDelta& presentation_time) override;
+  void QueueEOS(int input_buffer_index);
+  MediaCodecStatus DequeueInputBuffer(const base::TimeDelta& timeout,
+                                      int* index) override;
+  MediaCodecStatus DequeueOutputBuffer(const base::TimeDelta& timeout,
+                                       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;
+  void GetInputBuffer(int input_buffer_index,
+                      uint8** data,
+                      size_t* capacity) override;
+  bool CopyFromOutputBuffer(int index,
+                            size_t offset,
+                            void* dst,
+                            int dst_size) override;
+
+ protected:
+  NdkMediaCodecBridge(const std::string& mime,
+                      bool is_secure,
+                      MediaCodecDirection direction);
+
+ private:
+  struct AMediaCodecDeleter {
+    inline void operator()(AMediaCodec* ptr) const { AMediaCodec_delete(ptr); }
+  };
+
+  scoped_ptr<AMediaCodec, AMediaCodecDeleter> media_codec_;
+
+  DISALLOW_COPY_AND_ASSIGN(NdkMediaCodecBridge);
+};
+
+}  // namespace media
+
+#endif  // MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_