Revert "Log MediaExtractor entry point to MediaMetrics"
This reverts commit 17c72bb0966dd410c32ab0fd186408cb7f966515.
Reason for revert: b/174768641
Change-Id: Ic62927415db5fe0b428faf607c9e1d66bfaf8366
diff --git a/media/libmedia/IMediaExtractor.cpp b/media/libmedia/IMediaExtractor.cpp
index 7ed76d8..39caf53 100644
--- a/media/libmedia/IMediaExtractor.cpp
+++ b/media/libmedia/IMediaExtractor.cpp
@@ -38,8 +38,7 @@
FLAGS,
SETMEDIACAS,
NAME,
- GETMETRICS,
- SETENTRYPOINT
+ GETMETRICS
};
class BpMediaExtractor : public BpInterface<IMediaExtractor> {
@@ -143,13 +142,6 @@
}
return nm;
}
-
- virtual status_t setEntryPoint(EntryPoint entryPoint) {
- Parcel data, reply;
- data.writeInterfaceToken(BpMediaExtractor::getInterfaceDescriptor());
- data.writeInt32(static_cast<int32_t>(entryPoint));
- return remote()->transact(SETENTRYPOINT, data, &reply);
- }
};
IMPLEMENT_META_INTERFACE(MediaExtractor, "android.media.IMediaExtractor");
@@ -240,16 +232,6 @@
reply->writeString8(nm);
return NO_ERROR;
}
- case SETENTRYPOINT: {
- ALOGV("setEntryPoint");
- CHECK_INTERFACE(IMediaExtractor, data, reply);
- int32_t entryPoint;
- status_t err = data.readInt32(&entryPoint);
- if (err == OK) {
- setEntryPoint(EntryPoint(entryPoint));
- }
- return err;
- }
default:
return BBinder::onTransact(code, data, reply, flags);
}
diff --git a/media/libmedia/include/android/IMediaExtractor.h b/media/libmedia/include/android/IMediaExtractor.h
index f9cafde..3e035ad 100644
--- a/media/libmedia/include/android/IMediaExtractor.h
+++ b/media/libmedia/include/android/IMediaExtractor.h
@@ -63,15 +63,6 @@
virtual status_t setMediaCas(const HInterfaceToken &casToken) = 0;
virtual String8 name() = 0;
-
- enum class EntryPoint {
- SDK = 1,
- NDK_WITH_JVM = 2,
- NDK_NO_JVM = 3,
- OTHER = 4,
- };
-
- virtual status_t setEntryPoint(EntryPoint entryPoint) = 0;
};
diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp
index f2c7dd6..6245014 100644
--- a/media/libstagefright/NuMediaExtractor.cpp
+++ b/media/libstagefright/NuMediaExtractor.cpp
@@ -50,9 +50,8 @@
mSampleTimeUs(timeUs) {
}
-NuMediaExtractor::NuMediaExtractor(EntryPoint entryPoint)
- : mEntryPoint(entryPoint),
- mTotalBitrate(-1LL),
+NuMediaExtractor::NuMediaExtractor()
+ : mTotalBitrate(-1LL),
mDurationUs(-1LL) {
}
@@ -94,7 +93,6 @@
if (mImpl == NULL) {
return ERROR_UNSUPPORTED;
}
- setEntryPointToRemoteMediaExtractor();
status_t err = OK;
if (!mCasToken.empty()) {
@@ -136,7 +134,6 @@
if (mImpl == NULL) {
return ERROR_UNSUPPORTED;
}
- setEntryPointToRemoteMediaExtractor();
if (!mCasToken.empty()) {
err = mImpl->setMediaCas(mCasToken);
@@ -171,7 +168,6 @@
if (mImpl == NULL) {
return ERROR_UNSUPPORTED;
}
- setEntryPointToRemoteMediaExtractor();
if (!mCasToken.empty()) {
err = mImpl->setMediaCas(mCasToken);
@@ -493,16 +489,6 @@
}
}
-void NuMediaExtractor::setEntryPointToRemoteMediaExtractor() {
- if (mImpl == NULL) {
- return;
- }
- status_t err = mImpl->setEntryPoint(mEntryPoint);
- if (err != OK) {
- ALOGW("Failed to set entry point with error %d.", err);
- }
-}
-
ssize_t NuMediaExtractor::fetchAllTrackSamples(
int64_t seekTimeUs, MediaSource::ReadOptions::SeekMode mode) {
TrackInfo *minInfo = NULL;
diff --git a/media/libstagefright/RemoteMediaExtractor.cpp b/media/libstagefright/RemoteMediaExtractor.cpp
index 62ba73b..25e43c2 100644
--- a/media/libstagefright/RemoteMediaExtractor.cpp
+++ b/media/libstagefright/RemoteMediaExtractor.cpp
@@ -36,14 +36,9 @@
// NB: these are matched with public Java API constants defined
// in frameworks/base/media/java/android/media/MediaExtractor.java
// These must be kept synchronized with the constants there.
-const char *RemoteMediaExtractor::kExtractorFormat =
- "android.media.mediaextractor.fmt";
-const char *RemoteMediaExtractor::kExtractorMime =
- "android.media.mediaextractor.mime";
-const char *RemoteMediaExtractor::kExtractorTracks =
- "android.media.mediaextractor.ntrk";
-const char *RemoteMediaExtractor::kExtractorEntryPoint =
- "android.media.mediaextractor.entry";
+static const char *kExtractorFormat = "android.media.mediaextractor.fmt";
+static const char *kExtractorMime = "android.media.mediaextractor.mime";
+static const char *kExtractorTracks = "android.media.mediaextractor.ntrk";
RemoteMediaExtractor::RemoteMediaExtractor(
MediaExtractor *extractor,
@@ -79,9 +74,6 @@
}
// what else is interesting and not already available?
}
- // By default, we set the entry point to be "other". Clients of this
- // class will overwrite this value by calling setEntryPoint.
- setEntryPoint(EntryPoint::OTHER);
}
}
@@ -151,12 +143,6 @@
return String8(mExtractor->name());
}
-status_t RemoteMediaExtractor::setEntryPoint(EntryPoint entryPoint) {
- mMetricsItem->setInt32(kExtractorEntryPoint,
- static_cast<int32_t>(entryPoint));
- return OK;
-}
-
////////////////////////////////////////////////////////////////////////////////
// static
diff --git a/media/libstagefright/include/media/stagefright/NuMediaExtractor.h b/media/libstagefright/include/media/stagefright/NuMediaExtractor.h
index d8f2b00..227cead 100644
--- a/media/libstagefright/include/media/stagefright/NuMediaExtractor.h
+++ b/media/libstagefright/include/media/stagefright/NuMediaExtractor.h
@@ -47,14 +47,12 @@
SAMPLE_FLAG_ENCRYPTED = 2,
};
- typedef IMediaExtractor::EntryPoint EntryPoint;
-
// identical to IMediaExtractor::GetTrackMetaDataFlags
enum GetTrackFormatFlags {
kIncludeExtensiveMetaData = 1, // reads sample table and possibly stream headers
};
- explicit NuMediaExtractor(EntryPoint entryPoint);
+ NuMediaExtractor();
status_t setDataSource(
const sp<MediaHTTPService> &httpService,
@@ -130,8 +128,6 @@
uint32_t mTrackFlags; // bitmask of "TrackFlags"
};
- const EntryPoint mEntryPoint;
-
mutable Mutex mLock;
sp<DataSource> mDataSource;
@@ -143,8 +139,6 @@
int64_t mTotalBitrate; // in bits/sec
int64_t mDurationUs;
- void setEntryPointToRemoteMediaExtractor();
-
ssize_t fetchAllTrackSamples(
int64_t seekTimeUs = -1ll,
MediaSource::ReadOptions::SeekMode mode =
diff --git a/media/libstagefright/include/media/stagefright/RemoteMediaExtractor.h b/media/libstagefright/include/media/stagefright/RemoteMediaExtractor.h
index 6975e63..2ce7bc7 100644
--- a/media/libstagefright/include/media/stagefright/RemoteMediaExtractor.h
+++ b/media/libstagefright/include/media/stagefright/RemoteMediaExtractor.h
@@ -28,12 +28,6 @@
// IMediaExtractor wrapper to the MediaExtractor.
class RemoteMediaExtractor : public BnMediaExtractor {
public:
-
- static const char *kExtractorFormat;
- static const char *kExtractorMime;
- static const char *kExtractorTracks;
- static const char *kExtractorEntryPoint;
-
static sp<IMediaExtractor> wrap(
MediaExtractor *extractor,
const sp<DataSource> &source,
@@ -48,7 +42,6 @@
virtual uint32_t flags() const;
virtual status_t setMediaCas(const HInterfaceToken &casToken);
virtual String8 name();
- virtual status_t setEntryPoint(EntryPoint entryPoint);
private:
MediaExtractor *mExtractor;
diff --git a/media/ndk/NdkMediaExtractor.cpp b/media/ndk/NdkMediaExtractor.cpp
index 0c65e9e..0da0740 100644
--- a/media/ndk/NdkMediaExtractor.cpp
+++ b/media/ndk/NdkMediaExtractor.cpp
@@ -22,7 +22,6 @@
#include <media/NdkMediaExtractor.h>
#include <media/NdkMediaErrorPriv.h>
#include <media/NdkMediaFormatPriv.h>
-#include "NdkJavaVMHelperPriv.h"
#include "NdkMediaDataSourcePriv.h"
@@ -64,10 +63,7 @@
AMediaExtractor* AMediaExtractor_new() {
ALOGV("ctor");
AMediaExtractor *mData = new AMediaExtractor();
- mData->mImpl = new NuMediaExtractor(
- NdkJavaVMHelper::getJNIEnv() != nullptr
- ? NuMediaExtractor::EntryPoint::NDK_WITH_JVM
- : NuMediaExtractor::EntryPoint::NDK_NO_JVM );
+ mData->mImpl = new NuMediaExtractor();
return mData;
}