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

Side by Side Diff: media/mojo/services/mojo_decryptor_service.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/mojo/services/mojo_decryptor_service.h" 5 #include "media/mojo/services/mojo_decryptor_service.h"
6 6
7 #include <stdint.h>
8
7 #include <utility> 9 #include <utility>
8 10
9 #include "base/bind.h" 11 #include "base/bind.h"
10 #include "media/base/audio_decoder_config.h" 12 #include "media/base/audio_decoder_config.h"
11 #include "media/base/cdm_context.h" 13 #include "media/base/cdm_context.h"
12 #include "media/base/decoder_buffer.h" 14 #include "media/base/decoder_buffer.h"
13 #include "media/base/decryptor.h" 15 #include "media/base/decryptor.h"
14 #include "media/base/media_keys.h" 16 #include "media/base/media_keys.h"
15 #include "media/base/video_decoder_config.h" 17 #include "media/base/video_decoder_config.h"
16 #include "media/base/video_frame.h" 18 #include "media/base/video_frame.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 uint32_t num_bytes = media_buffer->data_size(); 197 uint32_t num_bytes = media_buffer->data_size();
196 DCHECK_GT(num_bytes, 0u); 198 DCHECK_GT(num_bytes, 0u);
197 CHECK_EQ(ReadDataRaw(consumer_handle_.get(), media_buffer->writable_data(), 199 CHECK_EQ(ReadDataRaw(consumer_handle_.get(), media_buffer->writable_data(),
198 &num_bytes, MOJO_READ_DATA_FLAG_ALL_OR_NONE), 200 &num_bytes, MOJO_READ_DATA_FLAG_ALL_OR_NONE),
199 MOJO_RESULT_OK); 201 MOJO_RESULT_OK);
200 CHECK_EQ(num_bytes, static_cast<uint32_t>(media_buffer->data_size())); 202 CHECK_EQ(num_bytes, static_cast<uint32_t>(media_buffer->data_size()));
201 return media_buffer; 203 return media_buffer;
202 } 204 }
203 205
204 } // namespace media 206 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_decryptor.cc ('k') | media/mojo/services/mojo_demuxer_stream_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698