commit 17c72bb0966dd410c32ab0fd186408cb7f966515
author Santiago Seifert <aquilescanta@google.com> Wed Nov 11 23:49:28 2020 +0000
committer Santiago Seifert <aquilescanta@google.com> Wed Dec 02 22:48:10 2020 +0000
tree 389195017ed80f0ae7ce23ec3147a50fb4fece7c
parent 5e883d137fc9a23dd8336d32a6bf18eb3f2c43a2

Log MediaExtractor entry point to MediaMetrics

Bug: 170386720
Test: atest libctsmediav2extractor_jni
Test: atest CtsMediaTestCases
Change-Id: Ic08c681bd4b1c44764c464c2ce7e2ba4bf00400d

media/ndk/NdkMediaExtractor.cpp

diff --git a/media/ndk/NdkMediaExtractor.cpp b/media/ndk/NdkMediaExtractor.cpp
index 0da0740..0c65e9e 100644
--- a/media/ndk/NdkMediaExtractor.cpp
+++ b/media/ndk/NdkMediaExtractor.cpp
@@ -22,6 +22,7 @@
 #include <media/NdkMediaExtractor.h>
 #include <media/NdkMediaErrorPriv.h>
 #include <media/NdkMediaFormatPriv.h>
+#include "NdkJavaVMHelperPriv.h"
 #include "NdkMediaDataSourcePriv.h"
 
 
@@ -63,7 +64,10 @@
 AMediaExtractor* AMediaExtractor_new() {
     ALOGV("ctor");
     AMediaExtractor *mData = new AMediaExtractor();
-    mData->mImpl = new NuMediaExtractor();
+    mData->mImpl = new NuMediaExtractor(
+        NdkJavaVMHelper::getJNIEnv() != nullptr
+                ? NuMediaExtractor::EntryPoint::NDK_WITH_JVM
+                : NuMediaExtractor::EntryPoint::NDK_NO_JVM );
     return mData;
 }