Modular DRM for MediaPlayer/Removing mimes report
Bug: 34559906
Test: GTS Tests
Change-Id: I6877b9ac4ffd36f0ed476c3b4bbb0770da5abaf6
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index aedca3f..def078e 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -1952,12 +1952,12 @@
size_t psshsize;
if (!mFileMeta->findData(kKeyPssh, &type, &pssh, &psshsize)) {
- ALOGE("checkDrmInfo: No PSSH");
+ ALOGV("checkDrmInfo: No PSSH");
return OK; // source without DRM info
}
Parcel parcel;
- NuPlayerDrm::retrieveDrmInfo(pssh, psshsize, mMimes, &parcel);
+ NuPlayerDrm::retrieveDrmInfo(pssh, psshsize, &parcel);
ALOGV("checkDrmInfo: MEDIA_DRM_INFO PSSH size: %d Parcel size: %d objects#: %d",
(int)psshsize, (int)parcel.dataSize(), (int)parcel.objectsCount());
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp
index ce6cedc..b7c9db7 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp
@@ -205,26 +205,8 @@
}
// Parcel has only private copy constructor so passing it in rather than returning
-void NuPlayerDrm::retrieveDrmInfo(const void *pssh, size_t psshsize,
- const Vector<String8> &mimes_in, Parcel *parcel)
+void NuPlayerDrm::retrieveDrmInfo(const void *pssh, size_t psshsize, Parcel *parcel)
{
- // 0) Make mimes a vector of unique items while keeping the original order; video first
- Vector<String8> mimes;
- for (size_t j = 0; j < mimes_in.size(); j++) {
- String8 mime = mimes_in[j];
- bool exists = false;
- for (size_t i = 0; i < mimes.size() && !exists; i++) {
- if (mimes[i] == mime) {
- exists = true;
- }
- } // for i
-
- if (!exists) {
- mimes.add(mime);
- }
- } // for j
-
-
// 1) PSSH bytes
parcel->writeUint32(psshsize);
parcel->writeByteArray(psshsize, (const uint8_t*)pssh);
@@ -242,18 +224,6 @@
ALOGV("retrieveDrmInfo: MEDIA_DRM_INFO supportedScheme[%zu] %s", i,
uuid.toHexString().string());
}
-
- // TODO: remove mimes after it's removed from Java DrmInfo
- // 3) mimes
- parcel->writeUint32(mimes.size());
- for (size_t i = 0; i < mimes.size(); i++) {
- // writing as String16 so the Java framework side can unpack it to Java String
- String16 mime(mimes[i]);
- parcel->writeString16(mime);
-
- ALOGV("retrieveDrmInfo: MEDIA_DRM_INFO MIME[%zu] %s",
- i, mimes[i].string());
- }
}
////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDrm.h b/media/libmediaplayerservice/nuplayer/NuPlayerDrm.h
index 6704bd1..6b8a2d9 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDrm.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDrm.h
@@ -84,8 +84,7 @@
static sp<ICrypto> createCryptoAndPlugin(const uint8_t uuid[16],
const Vector<uint8_t> &drmSessionId, status_t &status);
// Parcel has only private copy constructor so passing it in rather than returning
- static void retrieveDrmInfo(const void *pssh, size_t psshsize,
- const Vector<String8> &mimes_in, Parcel *parcel);
+ static void retrieveDrmInfo(const void *pssh, size_t psshsize, Parcel *parcel);
////////////////////////////////////////////////////////////////////////////////////////////
/// Helpers for NuPlayerDecoder