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

Unified Diff: media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.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/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc
diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc
index 29b29a53d6341a8e6491e1ac7c0be015b5d2dc9b..2c82f0a4d384041e63517f9538384b2507142432 100644
--- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc
+++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc
@@ -351,7 +351,7 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
// If we've exhausted the packet in the first decode we can write directly
// into the frame buffer instead of a multistep serialization approach.
if (serialized_audio_frames_.empty() && !packet.size) {
- const uint32_t buffer_size = decoded_audio_size + sizeof(int64) * 2;
+ const uint32_t buffer_size = decoded_audio_size + sizeof(int64_t) * 2;
decoded_frames->SetFrameBuffer(host_->Allocate(buffer_size));
if (!decoded_frames->FrameBuffer()) {
LOG(ERROR) << "DecodeBuffer() ClearKeyCdmHost::Allocate failed.";
@@ -360,11 +360,11 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
decoded_frames->FrameBuffer()->SetSize(buffer_size);
uint8_t* output_buffer = decoded_frames->FrameBuffer()->Data();
- const int64 timestamp = output_timestamp.InMicroseconds();
+ const int64_t timestamp = output_timestamp.InMicroseconds();
memcpy(output_buffer, &timestamp, sizeof(timestamp));
output_buffer += sizeof(timestamp);
- const int64 output_size = decoded_audio_size;
+ const int64_t output_size = decoded_audio_size;
memcpy(output_buffer, &output_size, sizeof(output_size));
output_buffer += sizeof(output_size);
@@ -420,7 +420,7 @@ void FFmpegCdmAudioDecoder::ReleaseFFmpegResources() {
av_frame_.reset();
}
-void FFmpegCdmAudioDecoder::SerializeInt64(int64 value) {
+void FFmpegCdmAudioDecoder::SerializeInt64(int64_t value) {
const size_t previous_size = serialized_audio_frames_.size();
serialized_audio_frames_.resize(previous_size + sizeof(value));
memcpy(&serialized_audio_frames_[0] + previous_size, &value, sizeof(value));

Powered by Google App Engine
This is Rietveld 408576698