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

Side by Side Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.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 4 years, 12 months 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/cdm/ppapi/external_clear_key/clear_key_cdm.h" 5 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cstring> 8 #include <cstring>
9 #include <sstream> 9 #include <sstream>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h"
13 #include "base/time/time.h" 14 #include "base/time/time.h"
14 #include "base/trace_event/trace_event.h" 15 #include "base/trace_event/trace_event.h"
15 #include "media/base/cdm_callback_promise.h" 16 #include "media/base/cdm_callback_promise.h"
16 #include "media/base/cdm_key_information.h" 17 #include "media/base/cdm_key_information.h"
17 #include "media/base/decoder_buffer.h" 18 #include "media/base/decoder_buffer.h"
18 #include "media/base/decrypt_config.h" 19 #include "media/base/decrypt_config.h"
19 #include "media/base/key_systems.h" 20 #include "media/base/key_systems.h"
20 #include "media/cdm/json_web_key.h" 21 #include "media/cdm/json_web_key.h"
21 #include "media/cdm/ppapi/cdm_file_io_test.h" 22 #include "media/cdm/ppapi/cdm_file_io_test.h"
22 #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h" 23 #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
(...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 void ClearKeyCdm::OnFileIOTestComplete(bool success) { 903 void ClearKeyCdm::OnFileIOTestComplete(bool success) {
903 DVLOG(1) << __FUNCTION__ << ": " << success; 904 DVLOG(1) << __FUNCTION__ << ": " << success;
904 std::string message = GetFileIOTestResultMessage(success); 905 std::string message = GetFileIOTestResultMessage(success);
905 host_->OnSessionMessage(last_session_id_.data(), last_session_id_.length(), 906 host_->OnSessionMessage(last_session_id_.data(), last_session_id_.length(),
906 cdm::kLicenseRequest, message.data(), 907 cdm::kLicenseRequest, message.data(),
907 message.length(), NULL, 0); 908 message.length(), NULL, 0);
908 file_io_test_runner_.reset(); 909 file_io_test_runner_.reset();
909 } 910 }
910 911
911 } // namespace media 912 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/ppapi/external_clear_key/cdm_video_decoder.h ('k') | media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698