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

Address review comments

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/54540

Addressing comments in http://go/ag/4448747

Test: tested as part of http://go/ag/4674759
Change-Id: I29005397efcc2e982e635581cc68c8293cea6243
This commit is contained in:
Fred Gylys-Colwell
2018-07-10 15:06:58 -07:00
parent 72e260da48
commit 60d010d18d
40 changed files with 68 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/include/cdm_session.h
View File

@@ -10,8 +10,8 @@
#include <vector>
#include "crypto_session.h"
#include "disallow_copy_and_assign.h"
#include "device_files.h"
#include "disallow_copy_and_assign.h"
#include "file_store.h"
#include "initialization_data.h"
#include "license.h"

6
libwvdrmengine/cdm/core/include/content_key_session.h
View File

@@ -2,8 +2,8 @@
// source code may only be used and distributed under the Widevine Master
// License Agreement.
#ifndef WVCDM_CORE_CONTENT_KEY_SESSSION_H_
#define WVCDM_CORE_CONTENT_KEY_SESSSION_H_
#ifndef WVCDM_CORE_CONTENT_KEY_SESSION_H_
#define WVCDM_CORE_CONTENT_KEY_SESSION_H_
#include "key_session.h"
#include "metrics_collections.h"
@@ -73,4 +73,4 @@ class ContentKeySession : public KeySession {
} // namespace wvcdm
#endif // WVCDM_CORE_CONTENT_KEY_SESSSION_H_
#endif // WVCDM_CORE_CONTENT_KEY_SESSION_H_

6
libwvdrmengine/cdm/core/include/crypto_session.h
View File

@@ -2,8 +2,8 @@
// source code may only be used and distributed under the Widevine Master
// License Agreement.
#ifndef WVCDM_CORE_CRYPTO_SESSSION_H_
#define WVCDM_CORE_CRYPTO_SESSSION_H_
#ifndef WVCDM_CORE_CRYPTO_SESSION_H_
#define WVCDM_CORE_CRYPTO_SESSION_H_
#include <map>
#include <string>
@@ -296,4 +296,4 @@ class CryptoSession {
} // namespace wvcdm
#endif // WVCDM_CORE_CRYPTO_SESSSION_H_
#endif // WVCDM_CORE_CRYPTO_SESSION_H_

6
libwvdrmengine/cdm/core/include/entitlement_key_session.h
View File

@@ -2,8 +2,8 @@
// source code may only be used and distributed under the Widevine Master
// License Agreement.
#ifndef WVCDM_CORE_ENTITLEMENT_KEY_SESSSION_H_
#define WVCDM_CORE_ENTITLEMENT_KEY_SESSSION_H_
#ifndef WVCDM_CORE_ENTITLEMENT_KEY_SESSION_H_
#define WVCDM_CORE_ENTITLEMENT_KEY_SESSION_H_
#include <map>
#include <string>
@@ -50,4 +50,4 @@ class EntitlementKeySession : public ContentKeySession {
} // namespace wvcdm
#endif // WVCDM_CORE_ENTITLEMENT_KEY_SESSSION_H_
#endif // WVCDM_CORE_ENTITLEMENT_KEY_SESSION_H_

6
libwvdrmengine/cdm/core/include/key_session.h
View File

@@ -2,8 +2,8 @@
// source code may only be used and distributed under the Widevine Master
// License Agreement.
#ifndef WVCDM_CORE_KEY_SESSSION_H_
#define WVCDM_CORE_KEY_SESSSION_H_
#ifndef WVCDM_CORE_KEY_SESSION_H_
#define WVCDM_CORE_KEY_SESSION_H_
#include "metrics_collections.h"
@@ -47,4 +47,4 @@ typedef std::map<std::string, CryptoSessionId> SubLicenseSessionMap;
} // namespace wvcdm
#endif // WVCDM_CORE_KEY_SESSSION_H_
#endif // WVCDM_CORE_KEY_SESSION_H_

6
libwvdrmengine/cdm/core/include/sublicense_key_session.h
View File

@@ -1,5 +1,5 @@
#ifndef WVCDM_CORE_SUBLICENSE_KEY_SESSSION_H_
#define WVCDM_CORE_SUBLICENSE_KEY_SESSSION_H_
#ifndef WVCDM_CORE_SUBLICENSE_KEY_SESSION_H_
#define WVCDM_CORE_SUBLICENSE_KEY_SESSION_H_
#include "crypto_key.h"
#include "key_session.h"
@@ -92,4 +92,4 @@ class SubLicenseKeySession : public KeySession {
} // namespace wvcdm
#endif // WVCDM_CORE_SUBLICENSE_KEY_SESSSION_H_
#endif // WVCDM_CORE_SUBLICENSE_KEY_SESSION_H_