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

Run git-clang-format

Browse Source 
Bug: 168341163
Test: build
Change-Id: Icf8bd644ee5e87cd499ee017c8c522a96d385d4c
This commit is contained in:
Robert Shih
2021-02-11 08:37:11 -08:00
parent e77b029214
commit fa49fdade0
5 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -1922,10 +1922,10 @@ CdmResponseType CdmEngine::ValidateServiceCertificate(const std::string& cert) {
return certificate.Init(cert); return certificate.Init(cert);
} }
CdmResponseType CdmEngine::SetPlaybackId( CdmResponseType CdmEngine::SetPlaybackId(const CdmSessionId& session_id,
const CdmSessionId& session_id, const std::string& playback_id) { const std::string& playback_id) {
LOGI("Setting session_id = %s playback_id = %s", LOGI("Setting session_id = %s playback_id = %s", session_id.c_str(),
session_id.c_str(), playback_id.c_str()); playback_id.c_str());
std::shared_ptr<CdmSession> session; std::shared_ptr<CdmSession> session;
if (!session_map_.FindSession(session_id, &session)) { if (!session_map_.FindSession(session_id, &session)) {
LOGE("Session ID not found: %s", session_id.c_str()); LOGE("Session ID not found: %s", session_id.c_str());

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

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

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

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

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

@@ -610,10 +610,9 @@ CdmResponseType WvContentDecryptionModule::RemoveOfflineLicense(
} }
CdmResponseType WvContentDecryptionModule::SetPlaybackId( CdmResponseType WvContentDecryptionModule::SetPlaybackId(
const CdmSessionId& session_id, const CdmSessionId& session_id, const std::string& playback_id) {
const std::string& playback_id) { LOGV("Setting session ID %s playback ID %s", session_id.c_str(),
LOGV("Setting session ID %s playback ID %s", playback_id.c_str());
session_id.c_str(), playback_id.c_str());
CdmEngine* cdm_engine = GetCdmForSessionId(session_id); CdmEngine* cdm_engine = GetCdmForSessionId(session_id);
if (!cdm_engine) return SESSION_NOT_FOUND_23; if (!cdm_engine) return SESSION_NOT_FOUND_23;
return cdm_engine->SetPlaybackId(session_id, playback_id); return cdm_engine->SetPlaybackId(session_id, playback_id);