From 50affa2ca6d8fdb42952afab5d482ef1c56ccc10 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Sun, 4 Nov 2018 17:23:59 -0800 Subject: Revert "Adapt to google::protobuf::uint64 type change" This reverts commit 3feee7ee05ab0227435515a07d3bb5907f17715a. Change-Id: I32c1aefdf37f9c93c640f78410164975e337028f --- drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp | 2 +- drm/mediacas/plugins/clearkey/ecm.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'drm') diff --git a/drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp b/drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp index cb69f911ff..eaa3390d0b 100644 --- a/drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp +++ b/drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp @@ -89,7 +89,7 @@ status_t ClearKeyFetcher::ObtainKey(const sp& buffer, // asset_id change. If it sends an EcmContainer with 2 Ecms with different // asset_ids (old and new) then it might be best to prefetch the Emm. if ((asset_.id() != 0) && (*asset_id != asset_.id())) { - ALOGW("Asset_id change from %" PRIu64 " to %" PRIu64, asset_.id(), *asset_id); + ALOGW("Asset_id change from %llu to %" PRIu64, asset_.id(), *asset_id); asset_.Clear(); } diff --git a/drm/mediacas/plugins/clearkey/ecm.cpp b/drm/mediacas/plugins/clearkey/ecm.cpp index b3b521807e..9fde13aea1 100644 --- a/drm/mediacas/plugins/clearkey/ecm.cpp +++ b/drm/mediacas/plugins/clearkey/ecm.cpp @@ -17,8 +17,6 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "ecm" -#include - #include "ecm.h" #include "ecm_generator.h" #include "protos/license_protos.pb.h" @@ -78,7 +76,7 @@ status_t Ecm::Decrypt( return status; } if (asset.id() != asset_from_emm.id()) { - ALOGE("Asset_id from Emm (%" PRIu64 ") does not match asset_id from Ecm (%" PRIu64 ").", + ALOGE("Asset_id from Emm (%llu) does not match asset_id from Ecm (%llu).", asset_from_emm.id(), asset.id()); return CLEARKEY_STATUS_INVALID_PARAMETER; } -- cgit v1.2.3