Merge "libmediadrm: handle hidl txn failures" into sc-dev (8122166d) · Commits · e / os / android_frameworks_av

drm/libmediadrm/CryptoHal.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -382,7 +382,8 @@ void CryptoHal::notifyResolution(uint32_t width, uint32_t height) {
		return;
		}

		mPlugin->notifyResolution(width, height);
		auto hResult = mPlugin->notifyResolution(width, height);
		ALOGE_IF(!hResult.isOk(), "notifyResolution txn failed %s", hResult.description().c_str());
		}

		status_t CryptoHal::setMediaDrmSession(const Vector<uint8_t> &sessionId) {
		@@ -392,7 +393,8 @@ status_t CryptoHal::setMediaDrmSession(const Vector<uint8_t> &sessionId) {
		return mInitCheck;
		}

		return toStatusT(mPlugin->setMediaDrmSession(toHidlVec(sessionId)));
		auto err = mPlugin->setMediaDrmSession(toHidlVec(sessionId));
		return err.isOk() ? toStatusT(err) : DEAD_OBJECT;
		}

		status_t CryptoHal::getLogMessages(Vector<drm::V1_4::LogMessage> &logs) const {

drm/libmediadrm/DrmHal.cpp

+25 −11

Original line number	Diff line number	Diff line
		@@ -888,7 +888,7 @@ status_t DrmHal::getProvisionRequest(String8 const &certType,
		Return<void> hResult;

		if (mPluginV1_2 != NULL) {
		Return<void> hResult = mPluginV1_2->getProvisionRequest_1_2(
		hResult = mPluginV1_2->getProvisionRequest_1_2(
		toHidlString(certType), toHidlString(certAuthority),
		[&](Status_V1_2 status, const hidl_vec<uint8_t>& hRequest,
		const hidl_string& hDefaultUrl) {
		@@ -900,7 +900,7 @@ status_t DrmHal::getProvisionRequest(String8 const &certType,
		}
		);
		} else {
		Return<void> hResult = mPlugin->getProvisionRequest(
		hResult = mPlugin->getProvisionRequest(
		toHidlString(certType), toHidlString(certAuthority),
		[&](Status status, const hidl_vec<uint8_t>& hRequest,
		const hidl_string& hDefaultUrl) {
		@@ -1522,22 +1522,38 @@ std::string DrmHal::reportPluginMetrics() const
		return metricsString;
		}

		bool DrmHal::requiresSecureDecoder(const char *mime) const {
		status_t DrmHal::requiresSecureDecoder(const char mime, bool required) const {
		Mutex::Autolock autoLock(mLock);
		if (mPluginV1_4 == NULL) {
		return false;
		}
		return mPluginV1_4->requiresSecureDecoderDefault(hidl_string(mime));
		auto hResult = mPluginV1_4->requiresSecureDecoderDefault(hidl_string(mime));
		if (!hResult.isOk()) {
		DrmUtils::LOG2BE("requiresSecureDecoder txn failed: %s", hResult.description().c_str());
		return DEAD_OBJECT;
		}
		if (required) {
		*required = hResult;
		}
		return OK;
		}

		bool DrmHal::requiresSecureDecoder(const char *mime,
		DrmPlugin::SecurityLevel securityLevel) const {
		status_t DrmHal::requiresSecureDecoder(const char *mime, DrmPlugin::SecurityLevel securityLevel,
		bool *required) const {
		Mutex::Autolock autoLock(mLock);
		if (mPluginV1_4 == NULL) {
		return false;
		}
		auto hLevel = toHidlSecurityLevel(securityLevel);
		return mPluginV1_4->requiresSecureDecoder(hidl_string(mime), hLevel);
		auto hResult = mPluginV1_4->requiresSecureDecoder(hidl_string(mime), hLevel);
		if (!hResult.isOk()) {
		DrmUtils::LOG2BE("requiresSecureDecoder txn failed: %s", hResult.description().c_str());
		return DEAD_OBJECT;
		}
		if (required) {
		*required = hResult;
		}
		return OK;
		}

		status_t DrmHal::setPlaybackId(Vector<uint8_t> const &sessionId, const char *playbackId) {
		@@ -1545,10 +1561,8 @@ status_t DrmHal::setPlaybackId(Vector<uint8_t> const &sessionId, const char *pla
		if (mPluginV1_4 == NULL) {
		return ERROR_UNSUPPORTED;
		}
		drm::V1_0::Status err = mPluginV1_4->setPlaybackId(
		toHidlVec(sessionId),
		hidl_string(playbackId));
		return toStatusT(err);
		auto err = mPluginV1_4->setPlaybackId(toHidlVec(sessionId), hidl_string(playbackId));
		return err.isOk() ? toStatusT(err) : DEAD_OBJECT;
		}

		status_t DrmHal::getLogMessages(Vector<drm::V1_4::LogMessage> &logs) const {

drm/libmediadrm/DrmUtils.cpp

+41 −19

Original line number	Diff line number	Diff line
		@@ -82,7 +82,17 @@ void MakeHidlFactories(const uint8_t uuid[16], V &factories, M& instances) {
		auto factory = Hal::getService(instance);
		if (factory != nullptr) {
		instances[instance.c_str()] = Hal::descriptor;
		if (!uuid \|\| factory->isCryptoSchemeSupported(uuid)) {
		if (!uuid) {
		factories.push_back(factory);
		continue;
		}
		auto supported = factory->isCryptoSchemeSupported(uuid);
		if (!supported.isOk()) {
		LOG2BE(uuid, "isCryptoSchemeSupported txn failed: %s",
		supported.description().c_str());
		continue;
		}
		if (supported) {
		factories.push_back(factory);
		}
		}
		@@ -114,7 +124,8 @@ hidl_array<uint8_t, 16> toHidlArray16(const uint8_t *ptr) {
		sp<::V1_0::IDrmPlugin> MakeDrmPlugin(const sp<::V1_0::IDrmFactory> &factory,
		const uint8_t uuid[16], const char *appPackageName) {
		sp<::V1_0::IDrmPlugin> plugin;
		factory->createPlugin(toHidlArray16(uuid), hidl_string(appPackageName),
		auto err = factory->createPlugin(
		toHidlArray16(uuid), hidl_string(appPackageName),
		[&](::V1_0::Status status, const sp<::V1_0::IDrmPlugin> &hPlugin) {
		if (status != ::V1_0::Status::OK) {
		LOG2BE(uuid, "MakeDrmPlugin failed: %d", status);
		@@ -122,14 +133,20 @@ sp<::V1_0::IDrmPlugin> MakeDrmPlugin(const sp<::V1_0::IDrmFactory> &factory,
		}
		plugin = hPlugin;
		});
		if (err.isOk()) {
		return plugin;
		} else {
		LOG2BE(uuid, "MakeDrmPlugin txn failed: %s", err.description().c_str());
		return nullptr;
		}
		}

		sp<::V1_0::ICryptoPlugin> MakeCryptoPlugin(const sp<::V1_0::ICryptoFactory> &factory,
		const uint8_t uuid[16], const void *initData,
		size_t initDataSize) {
		sp<::V1_0::ICryptoPlugin> plugin;
		factory->createPlugin(toHidlArray16(uuid), toHidlVec(initData, initDataSize),
		auto err = factory->createPlugin(
		toHidlArray16(uuid), toHidlVec(initData, initDataSize),
		[&](::V1_0::Status status, const sp<::V1_0::ICryptoPlugin> &hPlugin) {
		if (status != ::V1_0::Status::OK) {
		LOG2BE(uuid, "MakeCryptoPlugin failed: %d", status);
		@@ -137,7 +154,12 @@ sp<::V1_0::ICryptoPlugin> MakeCryptoPlugin(const sp<::V1_0::ICryptoFactory> &fac
		}
		plugin = hPlugin;
		});
		if (err.isOk()) {
		return plugin;
		} else {
		LOG2BE(uuid, "MakeCryptoPlugin txn failed: %s", err.description().c_str());
		return nullptr;
		}
		}

		} // namespace

drm/libmediadrm/include/mediadrm/DrmHal.h

+3 −4

Original line number	Diff line number	Diff line
		@@ -179,11 +179,10 @@ struct DrmHal : public IDrm,

		virtual status_t setListener(const sp<IDrmClient>& listener);

		virtual bool requiresSecureDecoder(const char *mime) const;
		virtual status_t requiresSecureDecoder(const char mime, bool required) const;

		virtual bool requiresSecureDecoder(
		const char *mime,
		DrmPlugin::SecurityLevel securityLevel) const;
		virtual status_t requiresSecureDecoder(const char *mime, DrmPlugin::SecurityLevel securityLevel,
		bool *required) const;

		virtual status_t setPlaybackId(
		Vector<uint8_t> const &sessionId,

drm/libmediadrm/include/mediadrm/IDrm.h

+3 −5

Original line number	Diff line number	Diff line
		@@ -154,12 +154,10 @@ struct IDrm : public virtual RefBase {

		virtual status_t setListener(const sp<IDrmClient>& listener) = 0;

		virtual bool requiresSecureDecoder(
		const char *mime) const = 0;
		virtual status_t requiresSecureDecoder(const char mime, bool required) const = 0;

		virtual bool requiresSecureDecoder(
		const char *mime,
		DrmPlugin::SecurityLevel securityLevel) const = 0;
		virtual status_t requiresSecureDecoder(const char *mime, DrmPlugin::SecurityLevel securityLevel,
		bool *required) const = 0;

		virtual status_t setPlaybackId(
		Vector<uint8_t> const &sessionId,