Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(830)

Unified Diff: media/cdm/cdm_adapter.cc

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/cdm/cdm_adapter.cc
diff --git a/media/cdm/cdm_adapter.cc b/media/cdm/cdm_adapter.cc
index 2a2068065501bed2ff767f5a9ddb4af534649654..0bce8b54d58047b0062ad165e914b77fb0a67603 100644
--- a/media/cdm/cdm_adapter.cc
+++ b/media/cdm/cdm_adapter.cc
@@ -256,10 +256,10 @@ void ToCdmInputBuffer(const scoped_refptr<DecoderBuffer>& encrypted_buffer,
const DecryptConfig* decrypt_config = encrypted_buffer->decrypt_config();
input_buffer->key_id =
- reinterpret_cast<const uint8*>(decrypt_config->key_id().data());
+ reinterpret_cast<const uint8_t*>(decrypt_config->key_id().data());
input_buffer->key_id_size = decrypt_config->key_id().size();
input_buffer->iv =
- reinterpret_cast<const uint8*>(decrypt_config->iv().data());
+ reinterpret_cast<const uint8_t*>(decrypt_config->iv().data());
input_buffer->iv_size = decrypt_config->iv().size();
DCHECK(subsamples->empty());
@@ -772,7 +772,7 @@ void CdmAdapter::OnSessionMessage(const char* session_id,
verified_gurl = GURL::EmptyGURL(); // Replace invalid destination_url.
}
- const uint8_t* message_ptr = reinterpret_cast<const uint8*>(message);
+ const uint8_t* message_ptr = reinterpret_cast<const uint8_t*>(message);
session_message_cb_.Run(
std::string(session_id, session_id_size),
ToMediaMessageType(message_type),

Powered by Google App Engine
This is Rietveld 408576698