commit 1349f47fdb96e0347075b7f6f6ff453e97caba17
author Santiago Seifert <aquilescanta@google.com> Wed Nov 11 23:49:28 2020 +0000
committer Santiago Seifert <aquilescanta@google.com> Tue Dec 15 22:27:51 2020 +0000
tree fde4f3762f714a441d05f0108acb6820b6327480
parent 89715382dcdb87aca5737b0954cdd844bcc58267

Log MediaExtractor entry point to MediaMetrics

Bug: 170386720
Test: atest libctsmediav2extractor_jni
Test: atest CtsMediaTestCases
Change-Id: I648e27b1b483a646df77e2a88ec5ac8af01a0bb9
Merged-In: I648e27b1b483a646df77e2a88ec5ac8af01a0bb9

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;
 }