widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libwvhidl: implement setPlaybackId

Browse Source 
Bug: 159337195
Bug: 168341163
Test: GtsMediaTestCases MediaDrmTest#testSetPlaybackId
Change-Id: I4fc687892c9dd3b8077b3ecdfd9bbc355b298571
This commit is contained in:
Robert Shih
2021-01-18 00:10:54 -08:00
parent 56195b41c6
commit e0a1e459a2
14 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/cdm/core/include/cdm_engine.h
View File

@@ -348,6 +348,9 @@ class CdmEngine {
}
virtual const std::string& GetAppPackageName() { return app_package_name_; }
virtual void SetSpoid(const std::string& spoid) { spoid_ = spoid; }
virtual CdmResponseType SetPlaybackId(
const CdmSessionId& session_id,
const std::string& playback_id);
protected:
friend class CdmEngineFactory;

1
libwvdrmengine/cdm/core/include/wv_cdm_types.h
View File

@@ -416,6 +416,7 @@ enum CdmResponseType : int32_t {
LOAD_USAGE_ENTRY_INVALID_SESSION = 361,
RESTORE_OFFLINE_LICENSE_ERROR_3 = 362,
NO_SRM_VERSION = 363,
SESSION_NOT_FOUND_23 = 364,
// Don't forget to add new values to
// * core/test/test_printers.cpp.
// * android/include/mapErrors-inl.h

13
libwvdrmengine/cdm/core/src/cdm_engine.cpp
View File

@@ -1922,6 +1922,19 @@ CdmResponseType CdmEngine::ValidateServiceCertificate(const std::string& cert) {
return certificate.Init(cert);
}
CdmResponseType CdmEngine::SetPlaybackId(
const CdmSessionId& session_id, const std::string& playback_id) {
LOGI("Setting session_id = %s playback_id = %s",
session_id.c_str(), playback_id.c_str());
std::shared_ptr<CdmSession> session;
if (!session_map_.FindSession(session_id, &session)) {
LOGE("Session ID not found: %s", session_id.c_str());
return SESSION_NOT_FOUND_23;
}
session->GetMetrics()->playback_id_.Record(playback_id);
return NO_ERROR;
}
std::string CdmEngine::MapHdcpVersion(CryptoSession::HdcpCapability version) {
switch (version) {
case HDCP_NONE:

3
libwvdrmengine/cdm/core/test/test_printers.cpp
View File

@@ -812,6 +812,9 @@ void PrintTo(const enum CdmResponseType& value, ::std::ostream* os) {
case SESSION_NOT_FOUND_22:
*os << "SESSION_NOT_FOUND_22";
break;
case SESSION_NOT_FOUND_23:
*os << "SESSION_NOT_FOUND_23";
break;
case SESSION_NOT_FOUND_FOR_DECRYPT:
*os << "SESSION_NOT_FOUND_FOR_DECRYPT";
break;

4
libwvdrmengine/cdm/include/wv_content_decryption_module.h
View File

@@ -180,6 +180,10 @@ class WvContentDecryptionModule : public android::RefBase, public TimerHandler {
CdmSecurityLevel security_level,
const CdmIdentifier& identifier);
virtual CdmResponseType SetPlaybackId(
const CdmSessionId& session_id,
const std::string& playback_id);
private:
struct CdmInfo {
CdmInfo();

1
libwvdrmengine/cdm/metrics/include/metrics_collections.h
View File

@@ -337,6 +337,7 @@ class SessionMetrics {
ValueMetric<std::string> oemcrypto_build_info_;
ValueMetric<std::string> license_sdk_version_;
ValueMetric<std::string> license_service_version_;
ValueMetric<std::string> playback_id_;
// Serialize the session metrics to the provided |metric_group|.
// |metric_group| is owned by the caller and must not be null.

2
libwvdrmengine/cdm/metrics/src/metrics_collections.cpp
View File

@@ -246,6 +246,8 @@ void SessionMetrics::SerializeSessionMetrics(
license_sdk_version_.ToProto());
session_metrics->set_allocated_license_service_version(
license_service_version_.ToProto());
session_metrics->set_allocated_playback_id(
playback_id_.ToProto());
}
OemCryptoDynamicAdapterMetrics::OemCryptoDynamicAdapterMetrics()

1
libwvdrmengine/cdm/metrics/src/wv_metrics.proto
View File

@@ -211,6 +211,7 @@ message WvCdmMetrics {
optional ValueMetric oemcrypto_build_info = 8;
optional ValueMetric license_sdk_version = 9;
optional ValueMetric license_service_version = 10;
optional ValueMetric playback_id = 11;
}
// These are metrics recorded at the Engine level. This includes CryptoSession

9
libwvdrmengine/cdm/src/wv_content_decryption_module.cpp
View File

@@ -609,4 +609,13 @@ CdmResponseType WvContentDecryptionModule::RemoveOfflineLicense(
return cdm_engine->RemoveOfflineLicense(key_set_id, security_level);
}
CdmResponseType WvContentDecryptionModule::SetPlaybackId(
const CdmSessionId& session_id,
const std::string& playback_id) {
LOGV("Setting session ID %s playback ID %s",
session_id.c_str(), playback_id.c_str());
CdmEngine* cdm_engine = GetCdmForSessionId(session_id);
if (!cdm_engine) return SESSION_NOT_FOUND_23;
return cdm_engine->SetPlaybackId(session_id, playback_id);
}
} // namespace wvcdm

1
libwvdrmengine/include/mapErrors-inl.h
View File

@@ -64,6 +64,7 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::SESSION_NOT_FOUND_20:
case wvcdm::SESSION_NOT_FOUND_21:
case wvcdm::SESSION_NOT_FOUND_22:
case wvcdm::SESSION_NOT_FOUND_23:
case wvcdm::SESSION_NOT_FOUND_FOR_DECRYPT:
return android::ERROR_DRM_SESSION_NOT_OPENED;
case wvcdm::UNKNOWN_ERROR:

1
libwvdrmengine/include_hidl/mapErrors-inl.h
View File

@@ -65,6 +65,7 @@ static Status mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::SESSION_NOT_FOUND_20:
case wvcdm::SESSION_NOT_FOUND_21:
case wvcdm::SESSION_NOT_FOUND_22:
case wvcdm::SESSION_NOT_FOUND_23:
return Status::ERROR_DRM_SESSION_NOT_OPENED;
case wvcdm::DECRYPT_ERROR:

4
libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h
View File

@@ -225,6 +225,10 @@ struct WVDrmPlugin : public ::drm::V1_4::IDrmPlugin, IDrmPluginListener,
Return<bool> requiresSecureDecoderDefault(const hidl_string& mime) override;
Return<::drm::V1_0::Status> setPlaybackId(
const hidl_vec<uint8_t>& sessionId,
const hidl_string& playbackId) override;
// The following methods do not use hidl interface, it is used internally.
virtual Status unprovisionDevice();

10
libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
View File

@@ -1955,6 +1955,16 @@ Return<bool> WVDrmPlugin::requiresSecureDecoderDefault(const hidl_string& mime)
}
}
Return<::drm::V1_0::Status> WVDrmPlugin::setPlaybackId(
const hidl_vec<uint8_t>& sessionId,
const hidl_string& playbackId) {
const std::vector<uint8_t> sId = toVector(sessionId);
CdmSessionId cdmSessionId(sId.begin(), sId.end());
std::string cdmPlaybackId = playbackId;
CdmResponseType res = mCDM->SetPlaybackId(cdmSessionId, cdmPlaybackId);
return mapCdmResponseType(res);
}
void WVDrmPlugin::OnSessionRenewalNeeded(const CdmSessionId& cdmSessionId) {
const std::vector<uint8_t> sessionId = StrToVector(cdmSessionId);
const hidl_vec<uint8_t> data; // data is ignored

5
libwvdrmengine/mediadrm/src_hidl/hidl_metrics_adapter.cpp
View File

@@ -412,6 +412,11 @@ void HidlMetricsAdapter::AddSessionMetrics(
"license_service_version",
proto_metrics.license_service_version());
}
if (proto_metrics.has_playback_id()) {
group_builder.AddValue(
"playback_id",
proto_metrics.playback_id());
}
group_vector_.emplace_back(group_builder.Build());
}