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

override, Don't OVERRIDE

Browse Source 
(This is a merge of http://go/wvgerrit/65263)

Now that C++11 is mandatory, we can drop the OVERRIDE macro which was
inconsistently used in the codebase in favor of using the override
keyword directly.

Bug: 111851141
Test: CE CDM Unit Tests
Test: Android Build
Change-Id: I0b7559624b84feb19740afd63463dadd243412b0
This commit is contained in:
John W. Bruce
2018-11-14 10:45:57 -08:00
parent 3c42b91471
commit d902366ac8
3 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@
#include "key_session.h" #include "key_session.h"
#include "metrics_collections.h" #include "metrics_collections.h"
#include "override.h"
#include "timer_metric.h" #include "timer_metric.h"
namespace wvcdm { namespace wvcdm {
@@ -21,14 +20,14 @@ class ContentKeySession : public KeySession {
cipher_mode_(kCipherModeCtr) {} cipher_mode_(kCipherModeCtr) {}
virtual ~ContentKeySession() {} virtual ~ContentKeySession() {}
virtual KeySessionType Type() OVERRIDE { return kDefault; } virtual KeySessionType Type() override { return kDefault; }
// Generate Derived Keys for ContentKeySession // Generate Derived Keys for ContentKeySession
virtual bool GenerateDerivedKeys(const std::string& message) OVERRIDE; virtual bool GenerateDerivedKeys(const std::string& message) override;
// Generate Derived Keys (from session key) for ContentKeySession // Generate Derived Keys (from session key) for ContentKeySession
virtual bool GenerateDerivedKeys(const std::string& message, virtual bool GenerateDerivedKeys(const std::string& message,
const std::string& session_key) OVERRIDE; const std::string& session_key) override;
// Load Keys for ContentKeySession // Load Keys for ContentKeySession
virtual OEMCryptoResult LoadKeys(const std::string& message, virtual OEMCryptoResult LoadKeys(const std::string& message,
@@ -38,22 +37,22 @@ class ContentKeySession : public KeySession {
const std::vector<CryptoKey>& keys, const std::vector<CryptoKey>& keys,
const std::string& provider_session_token, const std::string& provider_session_token,
CdmCipherMode* cipher_mode, CdmCipherMode* cipher_mode,
const std::string& srm_requirement) OVERRIDE; const std::string& srm_requirement) override;
virtual OEMCryptoResult LoadEntitledContentKeys( virtual OEMCryptoResult LoadEntitledContentKeys(
const std::vector<CryptoKey>&) OVERRIDE { const std::vector<CryptoKey>&) override {
return OEMCrypto_ERROR_INVALID_CONTEXT; return OEMCrypto_ERROR_INVALID_CONTEXT;
} }
// Select Key for ContentKeySession // Select Key for ContentKeySession
virtual OEMCryptoResult SelectKey(const std::string& key_id, virtual OEMCryptoResult SelectKey(const std::string& key_id,
CdmCipherMode cipher_mode) OVERRIDE; CdmCipherMode cipher_mode) override;
// Decrypt for ContentKeySession // Decrypt for ContentKeySession
virtual OEMCryptoResult Decrypt( virtual OEMCryptoResult Decrypt(
const CdmDecryptionParameters& params, const CdmDecryptionParameters& params,
OEMCrypto_DestBufferDesc& buffer_descriptor, OEMCrypto_DestBufferDesc& buffer_descriptor,
OEMCrypto_CENCEncryptPatternDesc& pattern_descriptor) OVERRIDE; OEMCrypto_CENCEncryptPatternDesc& pattern_descriptor) override;
protected: protected:
virtual OEMCryptoResult LoadKeysAsLicenseType( virtual OEMCryptoResult LoadKeysAsLicenseType(

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

@@ -12,7 +12,6 @@
#include "content_key_session.h" #include "content_key_session.h"
#include "crypto_key.h" #include "crypto_key.h"
#include "metrics_collections.h" #include "metrics_collections.h"
#include "override.h"
namespace wvcdm { namespace wvcdm {
@@ -32,11 +31,11 @@ class EntitlementKeySession : public ContentKeySession {
const std::vector<CryptoKey>& keys, const std::vector<CryptoKey>& keys,
const std::string& provider_session_token, const std::string& provider_session_token,
CdmCipherMode* cipher_mode, CdmCipherMode* cipher_mode,
const std::string& srm_requirement) OVERRIDE; const std::string& srm_requirement) override;
virtual OEMCryptoResult LoadEntitledContentKeys( virtual OEMCryptoResult LoadEntitledContentKeys(
const std::vector<CryptoKey>& keys) OVERRIDE; const std::vector<CryptoKey>& keys) override;
virtual OEMCryptoResult SelectKey(const std::string& key_id, virtual OEMCryptoResult SelectKey(const std::string& key_id,
CdmCipherMode cipher_mode) OVERRIDE; CdmCipherMode cipher_mode) override;
private: private:
// The object returned by this function contains raw pointers to the passed-in // The object returned by this function contains raw pointers to the passed-in

20
libwvdrmengine/cdm/core/include/override.h
View File

@@ -1,20 +0,0 @@
// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine Master
// License Agreement.
// TODO: Import to core/, use everywhere.
#ifndef WVCDM_CDM_OVERRIDE_H_
#define WVCDM_CDM_OVERRIDE_H_
#define GCC_HAS_OVERRIDE ( \
(__GNUC__ > 4) || \
(__GNUC__ == 4 && __GNUC_MINOR__ >= 7) \
)
#if !defined(DISABLE_OVERRIDE_KEYWORD) && \
(defined(COMPILER_MSVC) || defined(__clang__) || GCC_HAS_OVERRIDE)
#define OVERRIDE override
#else
#define OVERRIDE
#endif
#endif // WVCDM_CDM_OVERRIDE_H_