commit d4faf9e7cec12cf85e5901e81b7e05301012351c
author Robert Shih <robertshih@google.com> Sun Jan 21 17:52:25 2018 -0800
committer Robert Shih <robertshih@google.com> Mon Feb 12 12:03:54 2018 -0800
tree 4d43046bd139d994757622b751e4ded3bd6b8cfc
parent 9111804e9051b2888c66e26ee1a872bb3ef7a988

Ndk wrapper: wrap new Ndk datasource/extractor APIs

Bug: 63934228
Change-Id: Id6200b5b5be3c7fa22cfb0233f749fc0e8ef2bc4

media/ndk/NdkMediaDataSource.cpp

diff --git a/media/ndk/NdkMediaDataSource.cpp b/media/ndk/NdkMediaDataSource.cpp
index 0cae6f4..ba72164 100644
--- a/media/ndk/NdkMediaDataSource.cpp
+++ b/media/ndk/NdkMediaDataSource.cpp
@@ -43,7 +43,15 @@
 };
 
 NdkDataSource::NdkDataSource(AMediaDataSource *dataSource)
-    : mDataSource(dataSource) {
+    : mDataSource(AMediaDataSource_new()) {
+      AMediaDataSource_setReadAt(mDataSource, dataSource->readAt);
+      AMediaDataSource_setGetSize(mDataSource, dataSource->getSize);
+      AMediaDataSource_setClose(mDataSource, dataSource->close);
+      AMediaDataSource_setUserdata(mDataSource, dataSource->userdata);
+}
+
+NdkDataSource::~NdkDataSource() {
+    AMediaDataSource_delete(mDataSource);
 }
 
 status_t NdkDataSource::initCheck() const {

media/ndk/NdkMediaDataSourcePriv.h

diff --git a/media/ndk/NdkMediaDataSourcePriv.h b/media/ndk/NdkMediaDataSourcePriv.h
index a1cb331..7bb3a26 100644
--- a/media/ndk/NdkMediaDataSourcePriv.h
+++ b/media/ndk/NdkMediaDataSourcePriv.h
@@ -48,6 +48,9 @@
     virtual String8 toString();
     virtual String8 getMIMEType() const;
 
+protected:
+    virtual ~NdkDataSource();
+
 private:
 
     Mutex mLock;