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

Fix CE CDM warnings.

Browse Source 
Patch from Dennis Liang.  (djjliang@)

Change-Id: I9e9323232ef55b3f20405ddb8a837c70561db37b
This commit is contained in:
Joey Parrish
2015-05-01 09:33:17 -07:00
parent bd448c6252
commit c913e58900
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cdm/include/cdm_host_file.h
View File

@@ -62,7 +62,7 @@ class File::Impl {
explicit Impl(cdm::Host_4* const host_4) : explicit Impl(cdm::Host_4* const host_4) :
file_api_(new File4Impl(host_4)) {} file_api_(new File4Impl(host_4)) {}
~Impl() {} virtual ~Impl() {}
static void RegisterFileFactory(IFileFactory* factory) { factory_ = factory; } static void RegisterFileFactory(IFileFactory* factory) { factory_ = factory; }

4
cdm/src/wv_content_decryption_module_1.cpp
View File

@@ -299,7 +299,7 @@ cdm::Status WvContentDecryptionModule_1::DoSubsampleDecrypt(
return cdm::kDecryptError; return cdm::kDecryptError;
size_t output_size = 0; size_t output_size = 0;
for (int i = 0; i < encrypted_buffer.num_subsamples; ++i) { for (uint32_t i = 0; i < encrypted_buffer.num_subsamples; ++i) {
const cdm::SubsampleEntry& subsample = encrypted_buffer.subsamples[i]; const cdm::SubsampleEntry& subsample = encrypted_buffer.subsamples[i];
output_size += subsample.cipher_bytes + subsample.clear_bytes; output_size += subsample.cipher_bytes + subsample.clear_bytes;
} }
@@ -313,7 +313,7 @@ cdm::Status WvContentDecryptionModule_1::DoSubsampleDecrypt(
uint32_t block_ctr = 0; uint32_t block_ctr = 0;
const cdm::SubsampleEntry* subsamples = encrypted_buffer.subsamples; const cdm::SubsampleEntry* subsamples = encrypted_buffer.subsamples;
for (int i = 0; i < encrypted_buffer.num_subsamples; ++i) { for (uint32_t i = 0; i < encrypted_buffer.num_subsamples; ++i) {
const cdm::SubsampleEntry& subsample = subsamples[i]; const cdm::SubsampleEntry& subsample = subsamples[i];
for (int is_encrypted = 0; is_encrypted < 2; ++is_encrypted) { for (int is_encrypted = 0; is_encrypted < 2; ++is_encrypted) {

4
cdm/src/wv_content_decryption_module_4.cpp
View File

@@ -353,7 +353,7 @@ cdm::Status WvContentDecryptionModule_4::DoSubsampleDecrypt(
if (!encrypted_buffer.subsamples) return cdm::kDecryptError; if (!encrypted_buffer.subsamples) return cdm::kDecryptError;
size_t output_size = 0; size_t output_size = 0;
for (int i = 0; i < encrypted_buffer.num_subsamples; ++i) { for (uint32_t i = 0; i < encrypted_buffer.num_subsamples; ++i) {
const cdm::SubsampleEntry& subsample = encrypted_buffer.subsamples[i]; const cdm::SubsampleEntry& subsample = encrypted_buffer.subsamples[i];
output_size += subsample.cipher_bytes + subsample.clear_bytes; output_size += subsample.cipher_bytes + subsample.clear_bytes;
} }
@@ -367,7 +367,7 @@ cdm::Status WvContentDecryptionModule_4::DoSubsampleDecrypt(
uint32_t block_ctr = 0; uint32_t block_ctr = 0;
const cdm::SubsampleEntry* subsamples = encrypted_buffer.subsamples; const cdm::SubsampleEntry* subsamples = encrypted_buffer.subsamples;
for (int i = 0; i < encrypted_buffer.num_subsamples; ++i) { for (uint32_t i = 0; i < encrypted_buffer.num_subsamples; ++i) {
const cdm::SubsampleEntry& subsample = subsamples[i]; const cdm::SubsampleEntry& subsample = subsamples[i];
for (int is_encrypted = 0; is_encrypted < 2; ++is_encrypted) { for (int is_encrypted = 0; is_encrypted < 2; ++is_encrypted) {