Merge "Remove parcel reference from NuPlayer2Drm::retrieveDrmInfo" (a6020341) · Commits · e / os / android_frameworks_av

media/libmedia/nuplayer2/GenericSource.cpp

+5 −9

Original line number	Diff line number	Diff line
		@@ -1647,19 +1647,15 @@ status_t NuPlayer2::GenericSource::checkDrmInfo()
		return OK; // source without DRM info
		}

		Parcel parcel;
		NuPlayer2Drm::retrieveDrmInfo(pssh, psshsize, &parcel);
		ALOGV("checkDrmInfo: MEDIA2_DRM_INFO PSSH size: %d Parcel size: %d objects#: %d",
		(int)psshsize, (int)parcel.dataSize(), (int)parcel.objectsCount());
		sp<ABuffer> drmInfoBuffer = NuPlayer2Drm::retrieveDrmInfo(pssh, psshsize);
		ALOGV("checkDrmInfo: MEDIA2_DRM_INFO PSSH size: %d drmInfoBuffer size: %d",
		(int)psshsize, (int)drmInfoBuffer->size());

		if (parcel.dataSize() == 0) {
		ALOGE("checkDrmInfo: Unexpected parcel size: 0");
		if (drmInfoBuffer->size() == 0) {
		ALOGE("checkDrmInfo: Unexpected drmInfoBuffer size: 0");
		return UNKNOWN_ERROR;
		}

		// Can't pass parcel as a message to the player. Converting Parcel->ABuffer to pass it
		// to the Player's onSourceNotify then back to Parcel for calling driver's notifyListener.
		sp<ABuffer> drmInfoBuffer = ABuffer::CreateAsCopy(parcel.data(), parcel.dataSize());
		notifyDrmInfo(drmInfoBuffer);

		return OK;

media/libmedia/nuplayer2/NuPlayer2Drm.cpp

+53 −9

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@

		#include <media/NdkWrapper.h>
		#include <utils/Log.h>

		#include <sstream>

		namespace android {

		@@ -105,26 +105,70 @@ Vector<DrmUUID> NuPlayer2Drm::getSupportedDrmSchemes(const void *pssh, size_t ps
		return supportedDRMs;
		}

		// Parcel has only private copy constructor so passing it in rather than returning
		void NuPlayer2Drm::retrieveDrmInfo(const void pssh, size_t psshsize, Parcel parcel)
		sp<ABuffer> NuPlayer2Drm::retrieveDrmInfo(const void *pssh, uint32_t psshsize)
		{
		std::ostringstream buf;

		// 1) PSSH bytes
		parcel->writeUint32(psshsize);
		parcel->writeByteArray(psshsize, (const uint8_t*)pssh);
		buf.write(reinterpret_cast<const char *>(&psshsize), sizeof(psshsize));
		buf.write(reinterpret_cast<const char *>(pssh), psshsize);

		ALOGV("retrieveDrmInfo: MEDIA2_DRM_INFO PSSH: size: %zu %s", psshsize,
		ALOGV("retrieveDrmInfo: MEDIA2_DRM_INFO PSSH: size: %u %s", psshsize,
		DrmUUID::arrayToHex((uint8_t*)pssh, psshsize).string());

		// 2) supportedDRMs
		Vector<DrmUUID> supportedDRMs = getSupportedDrmSchemes(pssh, psshsize);
		parcel->writeUint32(supportedDRMs.size());
		for (size_t i = 0; i < supportedDRMs.size(); i++) {
		uint32_t n = supportedDRMs.size();
		buf.write(reinterpret_cast<char *>(&n), sizeof(n));
		for (size_t i = 0; i < n; i++) {
		DrmUUID uuid = supportedDRMs[i];
		parcel->writeByteArray(DrmUUID::UUID_SIZE, uuid.ptr());
		buf.write(reinterpret_cast<const char *>(&n), sizeof(n));
		buf.write(reinterpret_cast<const char *>(uuid.ptr()), DrmUUID::UUID_SIZE);

		ALOGV("retrieveDrmInfo: MEDIA2_DRM_INFO supportedScheme[%zu] %s", i,
		uuid.toHexString().string());
		}

		sp<ABuffer> drmInfoBuffer = ABuffer::CreateAsCopy(buf.str().c_str(), buf.tellp());
		return drmInfoBuffer;
		}

		sp<ABuffer> NuPlayer2Drm::retrieveDrmInfo(PsshInfo *psshInfo)
		{

		std::ostringstream pssh, drmInfo;

		// 0) Generate PSSH bytes
		for (size_t i = 0; i < psshInfo->numentries; i++) {
		PsshEntry *entry = &psshInfo->entries[i];
		uint32_t datalen = entry->datalen;
		pssh.write(reinterpret_cast<const char *>(&entry->uuid), sizeof(entry->uuid));
		pssh.write(reinterpret_cast<const char *>(&datalen), sizeof(datalen));
		pssh.write(reinterpret_cast<const char *>(entry->data), datalen);
		}

		uint32_t psshSize = pssh.tellp();
		const uint8_t* psshPtr = reinterpret_cast<const uint8_t*>(pssh.str().c_str());
		const char *psshHex = DrmUUID::arrayToHex(psshPtr, psshSize).string();
		ALOGV("retrieveDrmInfo: MEDIA_DRM_INFO PSSH: size: %u %s", psshSize, psshHex);

		// 1) Write PSSH bytes
		drmInfo.write(reinterpret_cast<const char *>(&psshSize), sizeof(psshSize));
		drmInfo.write(reinterpret_cast<const char *>(pssh.str().c_str()), psshSize);

		// 2) Write supportedDRMs
		uint32_t numentries = psshInfo->numentries;
		drmInfo.write(reinterpret_cast<const char *>(&numentries), sizeof(numentries));
		for (size_t i = 0; i < numentries; i++) {
		PsshEntry *entry = &psshInfo->entries[i];
		drmInfo.write(reinterpret_cast<const char *>(&entry->uuid), sizeof(entry->uuid));
		ALOGV("retrieveDrmInfo: MEDIA_DRM_INFO supportedScheme[%zu] %s", i,
		DrmUUID::arrayToHex((const uint8_t*)&entry->uuid, sizeof(AMediaUUID)).string());
		}

		sp<ABuffer> drmInfoBuf = ABuffer::CreateAsCopy(drmInfo.str().c_str(), drmInfo.tellp());
		drmInfoBuf->setRange(0, drmInfo.tellp());
		return drmInfoBuf;
		}

		} // namespace android

media/libmedia/nuplayer2/NuPlayer2Drm.h

+6 −3

Original line number	Diff line number	Diff line
		@@ -17,8 +17,11 @@
		#ifndef NUPLAYER2_DRM_H_
		#define NUPLAYER2_DRM_H_

		#include <binder/Parcel.h>
		#include <media/NdkMediaExtractor.h>
		#include <media/stagefright/foundation/ABuffer.h>

		#include <utils/String8.h>
		#include <utils/Vector.h>

		namespace android {

		@@ -76,8 +79,8 @@ namespace android {
		// static helpers - public

		public:
		// Parcel has only private copy constructor so passing it in rather than returning
		static void retrieveDrmInfo(const void pssh, size_t psshsize, Parcel parcel);
		static sp<ABuffer> retrieveDrmInfo(const void *pssh, uint32_t psshsize);
		static sp<ABuffer> retrieveDrmInfo(PsshInfo *);

		}; // NuPlayer2Drm