Switch CdmWrapper to use uint32_t for size types per style guide.
BUG=none
TEST=compiles
Review URL: https://codereview.chromium.org/26592003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230385 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/DEPS b/DEPS
index f69bee9..bc9c191 100644
--- a/DEPS
+++ b/DEPS
@@ -241,7 +241,7 @@
"/trunk/deps/third_party/opus@185324",
"src/media/cdm/ppapi/api":
- "/trunk/deps/cdm@229868",
+ "/trunk/deps/cdm@230180",
"src/third_party/mesa/src":
"/trunk/deps/third_party/mesa@229994",
diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc
index 92bb326..a60f402 100644
--- a/media/cdm/ppapi/cdm_adapter.cc
+++ b/media/cdm/ppapi/cdm_adapter.cc
@@ -46,8 +46,7 @@
input_buffer->data = static_cast<uint8_t*>(encrypted_buffer.data());
input_buffer->data_size = encrypted_block_info.data_size;
- PP_DCHECK(encrypted_buffer.size() >=
- static_cast<uint32_t>(input_buffer->data_size));
+ PP_DCHECK(encrypted_buffer.size() >= input_buffer->data_size);
input_buffer->data_offset = encrypted_block_info.data_offset;
PP_DCHECK(encrypted_block_info.key_id_size <=
@@ -283,12 +282,12 @@
}
const uint8_t* key_ptr = static_cast<const uint8_t*>(key.Map());
- int key_size = key.ByteLength();
+ const uint32_t key_size = key.ByteLength();
const uint8_t* init_data_ptr = static_cast<const uint8_t*>(init_data.Map());
- int init_data_size = init_data.ByteLength();
+ const uint32_t init_data_size = init_data.ByteLength();
PP_DCHECK(!init_data_ptr == !init_data_size);
- if (!key_ptr || key_size <= 0) {
+ if (!key_ptr || !key_size) {
SendUnknownKeyError(key_system_, session_id);
return;
}
@@ -364,8 +363,7 @@
cdm_decoder_config.samples_per_second = decoder_config.samples_per_second;
cdm_decoder_config.extra_data =
static_cast<uint8_t*>(extra_data_buffer.data());
- cdm_decoder_config.extra_data_size =
- static_cast<int32_t>(extra_data_buffer.size());
+ cdm_decoder_config.extra_data_size = extra_data_buffer.size();
status = cdm_->InitializeAudioDecoder(cdm_decoder_config);
}
@@ -392,8 +390,7 @@
cdm_decoder_config.coded_size.height = decoder_config.height;
cdm_decoder_config.extra_data =
static_cast<uint8_t*>(extra_data_buffer.data());
- cdm_decoder_config.extra_data_size =
- static_cast<int32_t>(extra_data_buffer.size());
+ cdm_decoder_config.extra_data_size = extra_data_buffer.size();
status = cdm_->InitializeVideoDecoder(cdm_decoder_config);
}
@@ -481,7 +478,7 @@
}
}
-cdm::Buffer* CdmAdapter::Allocate(int32_t capacity) {
+cdm::Buffer* CdmAdapter::Allocate(uint32_t capacity) {
return allocator_.Allocate(capacity);
}
@@ -505,9 +502,9 @@
}
void CdmAdapter::SendKeyMessage(
- const char* session_id, int32_t session_id_length,
- const char* message, int32_t message_length,
- const char* default_url, int32_t default_url_length) {
+ const char* session_id, uint32_t session_id_length,
+ const char* message, uint32_t message_length,
+ const char* default_url, uint32_t default_url_length) {
PP_DCHECK(!key_system_.empty());
PostOnMain(callback_factory_.NewCallback(
&CdmAdapter::KeyMessage,
@@ -518,7 +515,7 @@
}
void CdmAdapter::SendKeyError(const char* session_id,
- int32_t session_id_length,
+ uint32_t session_id_length,
cdm::MediaKeyError error_code,
uint32_t system_code) {
SendKeyErrorInternal(key_system_,
@@ -733,7 +730,7 @@
PpbBuffer* ppb_buffer = static_cast<PpbBuffer*>(video_frame->FrameBuffer());
- for (int i = 0; i < cdm::VideoFrame::kMaxPlanes; ++i) {
+ for (uint32_t i = 0; i < cdm::VideoFrame::kMaxPlanes; ++i) {
int plane_height = (i == cdm::VideoFrame::kYPlane) ?
video_frame->Size().height : (video_frame->Size().height + 1) / 2;
cdm::VideoFrame::VideoPlane plane =
@@ -747,9 +744,14 @@
return true;
}
+void CdmAdapter::OnDeferredInitializationDone(cdm::StreamType stream_type,
+ cdm::Status decoder_status) {
+ PP_NOTREACHED();
+}
+
void CdmAdapter::SendPlatformChallenge(
- const char* service_id, int32_t service_id_length,
- const char* challenge, int32_t challenge_length) {
+ const char* service_id, uint32_t service_id_length,
+ const char* challenge, uint32_t challenge_length) {
#if defined(OS_CHROMEOS)
PP_DCHECK(!challenge_in_progress_);
@@ -832,13 +834,13 @@
cdm::PlatformChallengeResponse response = {
static_cast<uint8_t*>(signed_data_var.Map()),
- static_cast<int32_t>(signed_data_var.ByteLength()),
+ signed_data_var.ByteLength(),
static_cast<uint8_t*>(signed_data_signature_var.Map()),
- static_cast<int32_t>(signed_data_signature_var.ByteLength()),
+ signed_data_signature_var.ByteLength(),
reinterpret_cast<const uint8_t*>(platform_key_certificate_string.c_str()),
- static_cast<int32_t>(platform_key_certificate_string.length())
+ static_cast<uint32_t>(platform_key_certificate_string.length())
};
cdm_->OnPlatformChallengeResponse(response);
diff --git a/media/cdm/ppapi/cdm_adapter.h b/media/cdm/ppapi/cdm_adapter.h
index d2edefb9..d5cc9730 100644
--- a/media/cdm/ppapi/cdm_adapter.h
+++ b/media/cdm/ppapi/cdm_adapter.h
@@ -79,15 +79,15 @@
const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE;
// cdm::Host implementation.
- virtual cdm::Buffer* Allocate(int32_t capacity) OVERRIDE;
+ virtual cdm::Buffer* Allocate(uint32_t capacity) OVERRIDE;
virtual void SetTimer(int64_t delay_ms, void* context) OVERRIDE;
virtual double GetCurrentWallTimeInSeconds() OVERRIDE;
virtual void SendKeyMessage(
- const char* session_id, int32_t session_id_length,
- const char* message, int32_t message_length,
- const char* default_url, int32_t default_url_length) OVERRIDE;
+ const char* session_id, uint32_t session_id_length,
+ const char* message, uint32_t message_length,
+ const char* default_url, uint32_t default_url_length) OVERRIDE;
virtual void SendKeyError(const char* session_id,
- int32_t session_id_length,
+ uint32_t session_id_length,
cdm::MediaKeyError error_code,
uint32_t system_code) OVERRIDE;
virtual void GetPrivateData(int32_t* instance,
@@ -95,11 +95,14 @@
// cdm::Host_2 implementation.
virtual void SendPlatformChallenge(
- const char* service_id, int32_t service_id_length,
- const char* challenge, int32_t challenge_length) OVERRIDE;
+ const char* service_id, uint32_t service_id_length,
+ const char* challenge, uint32_t challenge_length) OVERRIDE;
virtual void EnableOutputProtection(
uint32_t desired_protection_mask) OVERRIDE;
virtual void QueryOutputProtectionStatus() OVERRIDE;
+ virtual void OnDeferredInitializationDone(
+ cdm::StreamType stream_type,
+ cdm::Status decoder_status) OVERRIDE;
private:
struct SessionInfo {
diff --git a/media/cdm/ppapi/cdm_helpers.cc b/media/cdm/ppapi/cdm_helpers.cc
index c0db2ed4..36b95021 100644
--- a/media/cdm/ppapi/cdm_helpers.cc
+++ b/media/cdm/ppapi/cdm_helpers.cc
@@ -20,10 +20,10 @@
namespace media {
-cdm::Buffer* PpbBufferAllocator::Allocate(int32_t capacity) {
+cdm::Buffer* PpbBufferAllocator::Allocate(uint32_t capacity) {
PP_DCHECK(pp::Module::Get()->core()->IsMainThread());
- if (capacity <= 0)
+ if (!capacity)
return NULL;
pp::Buffer_Dev buffer;
@@ -64,19 +64,19 @@
allocated_buffers_.erase(found);
}
-pp::Buffer_Dev PpbBufferAllocator::AllocateNewBuffer(int32_t capacity) {
+pp::Buffer_Dev PpbBufferAllocator::AllocateNewBuffer(uint32_t capacity) {
// Always pad new allocated buffer so that we don't need to reallocate
// buffers frequently if requested sizes fluctuate slightly.
- static const int kBufferPadding = 512;
+ static const uint32_t kBufferPadding = 512;
// Maximum number of free buffers we can keep when allocating new buffers.
- static const int kFreeLimit = 3;
+ static const uint32_t kFreeLimit = 3;
// Destroy the smallest buffer before allocating a new bigger buffer if the
// number of free buffers exceeds a limit. This mechanism helps avoid ending
// up with too many small buffers, which could happen if the size to be
// allocated keeps increasing.
- if (free_buffers_.size() >= static_cast<uint32_t>(kFreeLimit))
+ if (free_buffers_.size() >= kFreeLimit)
free_buffers_.erase(free_buffers_.begin());
// Creation of pp::Buffer_Dev is expensive! It involves synchronous IPC calls.
@@ -88,7 +88,7 @@
: format_(cdm::kUnknownVideoFormat),
frame_buffer_(NULL),
timestamp_(0) {
- for (int32_t i = 0; i < kMaxPlanes; ++i) {
+ for (uint32_t i = 0; i < kMaxPlanes; ++i) {
plane_offsets_[i] = 0;
strides_[i] = 0;
}
diff --git a/media/cdm/ppapi/cdm_helpers.h b/media/cdm/ppapi/cdm_helpers.h
index 67ebf86c7..3d517599 100644
--- a/media/cdm/ppapi/cdm_helpers.h
+++ b/media/cdm/ppapi/cdm_helpers.h
@@ -37,16 +37,15 @@
// cdm::Buffer implementation.
virtual void Destroy() OVERRIDE { delete this; }
- virtual int32_t Capacity() const OVERRIDE { return buffer_.size(); }
+ virtual uint32_t Capacity() const OVERRIDE { return buffer_.size(); }
virtual uint8_t* Data() OVERRIDE {
return static_cast<uint8_t*>(buffer_.data());
}
- virtual void SetSize(int32_t size) OVERRIDE {
- PP_DCHECK(size >= 0);
+ virtual void SetSize(uint32_t size) OVERRIDE {
PP_DCHECK(size < Capacity());
- if (size < 0 || size > Capacity()) {
+ if (size > Capacity()) {
size_ = 0;
return;
}
@@ -54,7 +53,7 @@
size_ = size;
}
- virtual int32_t Size() const OVERRIDE { return size_; }
+ virtual uint32_t Size() const OVERRIDE { return size_; }
pp::Buffer_Dev buffer_dev() const { return buffer_; }
@@ -69,7 +68,7 @@
pp::Buffer_Dev buffer_;
uint32_t buffer_id_;
- int32_t size_;
+ uint32_t size_;
DISALLOW_COPY_AND_ASSIGN(PpbBuffer);
};
@@ -81,7 +80,7 @@
next_buffer_id_(1) {}
~PpbBufferAllocator() {}
- cdm::Buffer* Allocate(int32_t capacity);
+ cdm::Buffer* Allocate(uint32_t capacity);
// Releases the buffer with |buffer_id|. A buffer can be recycled after
// it is released.
@@ -89,10 +88,10 @@
private:
typedef std::map<uint32_t, pp::Buffer_Dev> AllocatedBufferMap;
- typedef std::multimap<int, std::pair<uint32_t, pp::Buffer_Dev> >
+ typedef std::multimap<uint32_t, std::pair<uint32_t, pp::Buffer_Dev> >
FreeBufferMap;
- pp::Buffer_Dev AllocateNewBuffer(int capacity);
+ pp::Buffer_Dev AllocateNewBuffer(uint32_t capacity);
pp::Instance* const instance_;
uint32_t next_buffer_id_;
@@ -143,22 +142,21 @@
virtual cdm::Buffer* FrameBuffer() OVERRIDE { return frame_buffer_; }
virtual void SetPlaneOffset(cdm::VideoFrame::VideoPlane plane,
- int32_t offset) OVERRIDE {
- PP_DCHECK(0 <= plane && plane < kMaxPlanes);
- PP_DCHECK(offset >= 0);
+ uint32_t offset) OVERRIDE {
+ PP_DCHECK(plane < kMaxPlanes);
plane_offsets_[plane] = offset;
}
- virtual int32_t PlaneOffset(VideoPlane plane) OVERRIDE {
- PP_DCHECK(0 <= plane && plane < kMaxPlanes);
+ virtual uint32_t PlaneOffset(VideoPlane plane) OVERRIDE {
+ PP_DCHECK(plane < kMaxPlanes);
return plane_offsets_[plane];
}
- virtual void SetStride(VideoPlane plane, int32_t stride) OVERRIDE {
- PP_DCHECK(0 <= plane && plane < kMaxPlanes);
+ virtual void SetStride(VideoPlane plane, uint32_t stride) OVERRIDE {
+ PP_DCHECK(plane < kMaxPlanes);
strides_[plane] = stride;
}
- virtual int32_t Stride(VideoPlane plane) OVERRIDE {
- PP_DCHECK(0 <= plane && plane < kMaxPlanes);
+ virtual uint32_t Stride(VideoPlane plane) OVERRIDE {
+ PP_DCHECK(plane < kMaxPlanes);
return strides_[plane];
}
@@ -178,12 +176,12 @@
PpbBuffer* frame_buffer_;
// Array of data pointers to each plane in the video frame buffer.
- int32_t plane_offsets_[kMaxPlanes];
+ uint32_t plane_offsets_[kMaxPlanes];
// Array of strides for each plane, typically greater or equal to the width
// of the surface divided by the horizontal sampling period. Note that
// strides can be negative.
- int32_t strides_[kMaxPlanes];
+ uint32_t strides_[kMaxPlanes];
// Presentation timestamp in microseconds.
int64_t timestamp_;
diff --git a/media/cdm/ppapi/cdm_wrapper.h b/media/cdm/ppapi/cdm_wrapper.h
index 370eecc..f54d0d65 100644
--- a/media/cdm/ppapi/cdm_wrapper.h
+++ b/media/cdm/ppapi/cdm_wrapper.h
@@ -31,24 +31,24 @@
class CdmWrapper {
public:
static CdmWrapper* Create(const char* key_system,
- int key_system_size,
+ uint32_t key_system_size,
GetCdmHostFunc get_cdm_host_func,
void* user_data);
virtual ~CdmWrapper() {};
virtual cdm::Status GenerateKeyRequest(const char* type,
- int type_size,
+ uint32_t type_size,
const uint8_t* init_data,
- int init_data_size) = 0;
+ uint32_t init_data_size) = 0;
virtual cdm::Status AddKey(const char* session_id,
- int session_id_size,
+ uint32_t session_id_size,
const uint8_t* key,
- int key_size,
+ uint32_t key_size,
const uint8_t* key_id,
- int key_id_size) = 0;
+ uint32_t key_id_size) = 0;
virtual cdm::Status CancelKeyRequest(const char* session_id,
- int session_id_size) = 0;
+ uint32_t session_id_size) = 0;
virtual void TimerExpired(void* context) = 0;
virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer,
cdm::DecryptedBlock* decrypted_buffer) = 0;
@@ -84,7 +84,7 @@
class CdmWrapperImpl : public CdmWrapper {
public:
static CdmWrapper* Create(const char* key_system,
- int key_system_size,
+ uint32_t key_system_size,
GetCdmHostFunc get_cdm_host_func,
void* user_data) {
void* cdm_instance = ::CreateCdmInstance(
@@ -102,24 +102,24 @@
}
virtual cdm::Status GenerateKeyRequest(const char* type,
- int type_size,
+ uint32_t type_size,
const uint8_t* init_data,
- int init_data_size) OVERRIDE {
+ uint32_t init_data_size) OVERRIDE {
return cdm_->GenerateKeyRequest(type, type_size, init_data, init_data_size);
}
virtual cdm::Status AddKey(const char* session_id,
- int session_id_size,
+ uint32_t session_id_size,
const uint8_t* key,
- int key_size,
+ uint32_t key_size,
const uint8_t* key_id,
- int key_id_size) OVERRIDE {
+ uint32_t key_id_size) OVERRIDE {
return cdm_->AddKey(
session_id, session_id_size, key, key_size, key_id, key_id_size);
}
virtual cdm::Status CancelKeyRequest(const char* session_id,
- int session_id_size) OVERRIDE {
+ uint32_t session_id_size) OVERRIDE {
return cdm_->CancelKeyRequest(session_id, session_id_size);
}
@@ -212,7 +212,7 @@
}
CdmWrapper* CdmWrapper::Create(const char* key_system,
- int key_system_size,
+ uint32_t key_system_size,
GetCdmHostFunc get_cdm_host_func,
void* user_data) {
// Try to create the CDM using the latest CDM interface version.
diff --git a/media/cdm/ppapi/clear_key_cdm.cc b/media/cdm/ppapi/clear_key_cdm.cc
index 071b2b3..d7cd206 100644
--- a/media/cdm/ppapi/clear_key_cdm.cc
+++ b/media/cdm/ppapi/clear_key_cdm.cc
@@ -74,7 +74,7 @@
static scoped_refptr<media::DecoderBuffer> CopyDecoderBufferFrom(
const cdm::InputBuffer& input_buffer) {
if (!input_buffer.data) {
- DCHECK_EQ(input_buffer.data_size, 0);
+ DCHECK(!input_buffer.data_size);
return media::DecoderBuffer::CreateEOSBuffer();
}
@@ -83,7 +83,7 @@
media::DecoderBuffer::CopyFrom(input_buffer.data, input_buffer.data_size);
std::vector<media::SubsampleEntry> subsamples;
- for (int32_t i = 0; i < input_buffer.num_subsamples; ++i) {
+ for (uint32_t i = 0; i < input_buffer.num_subsamples; ++i) {
media::SubsampleEntry subsample;
subsample.clear_bytes = input_buffer.subsamples[i].clear_bytes;
subsample.cypher_bytes = input_buffer.subsamples[i].cipher_bytes;
@@ -127,7 +127,7 @@
void* CreateCdmInstance(
int cdm_interface_version,
- const char* key_system, int key_system_size,
+ const char* key_system, uint32_t key_system_size,
GetCdmHostFunc get_cdm_host_func, void* user_data) {
DVLOG(1) << "CreateCdmInstance()";
@@ -139,8 +139,9 @@
if (cdm_interface_version != cdm::ContentDecryptionModule_2::kVersion)
return NULL;
- cdm::Host* host = static_cast<cdm::Host*>(
- get_cdm_host_func(cdm::ContentDecryptionModule_2::kVersion, user_data));
+ cdm::ContentDecryptionModule_2::Host* host =
+ static_cast<cdm::ContentDecryptionModule_2::Host*>(get_cdm_host_func(
+ cdm::ContentDecryptionModule_2::Host::kVersion, user_data));
if (!host)
return NULL;
@@ -203,9 +204,10 @@
ClearKeyCdm::~ClearKeyCdm() {}
-cdm::Status ClearKeyCdm::GenerateKeyRequest(const char* type, int type_size,
+cdm::Status ClearKeyCdm::GenerateKeyRequest(const char* type,
+ uint32_t type_size,
const uint8_t* init_data,
- int init_data_size) {
+ uint32_t init_data_size) {
DVLOG(1) << "GenerateKeyRequest()";
base::AutoLock auto_lock(client_lock_);
ScopedResetter<Client> auto_resetter(&client_);
@@ -230,11 +232,11 @@
}
cdm::Status ClearKeyCdm::AddKey(const char* session_id,
- int session_id_size,
+ uint32_t session_id_size,
const uint8_t* key,
- int key_size,
+ uint32_t key_size,
const uint8_t* key_id,
- int key_id_size) {
+ uint32_t key_id_size) {
DVLOG(1) << "AddKey()";
base::AutoLock auto_lock(client_lock_);
ScopedResetter<Client> auto_resetter(&client_);
@@ -253,7 +255,7 @@
}
cdm::Status ClearKeyCdm::CancelKeyRequest(const char* session_id,
- int session_id_size) {
+ uint32_t session_id_size) {
DVLOG(1) << "CancelKeyRequest()";
base::AutoLock auto_lock(client_lock_);
ScopedResetter<Client> auto_resetter(&client_);
diff --git a/media/cdm/ppapi/clear_key_cdm.h b/media/cdm/ppapi/clear_key_cdm.h
index a0d951c0..5702905 100644
--- a/media/cdm/ppapi/clear_key_cdm.h
+++ b/media/cdm/ppapi/clear_key_cdm.h
@@ -35,13 +35,16 @@
// ContentDecryptionModule implementation.
virtual cdm::Status GenerateKeyRequest(
- const char* type, int type_size,
- const uint8_t* init_data, int init_data_size) OVERRIDE;
- virtual cdm::Status AddKey(const char* session_id, int session_id_size,
- const uint8_t* key, int key_size,
- const uint8_t* key_id, int key_id_size) OVERRIDE;
+ const char* type, uint32_t type_size,
+ const uint8_t* init_data, uint32_t init_data_size) OVERRIDE;
+ virtual cdm::Status AddKey(const char* session_id,
+ uint32_t session_id_size,
+ const uint8_t* key,
+ uint32_t key_size,
+ const uint8_t* key_id,
+ uint32_t key_id_size) OVERRIDE;
virtual cdm::Status CancelKeyRequest(const char* session_id,
- int session_id_size) OVERRIDE;
+ uint32_t session_id_size) OVERRIDE;
virtual void TimerExpired(void* context) OVERRIDE;
virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer,
cdm::DecryptedBlock* decrypted_block) OVERRIDE;
