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

Side by Side Diff: media/cdm/ppapi/cdm_adapter.cc

Issue 93243003: Add CDM FileIO tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 7 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 | Annotate | Revision Log
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/cdm_adapter.h" 5 #include "media/cdm/ppapi/cdm_adapter.h"
6 6
7 #include "media/cdm/ppapi/cdm_file_io_impl.h"
7 #include "media/cdm/ppapi/cdm_helpers.h" 8 #include "media/cdm/ppapi/cdm_helpers.h"
8 #include "media/cdm/ppapi/supported_cdm_versions.h" 9 #include "media/cdm/ppapi/supported_cdm_versions.h"
9 10
10 #if defined(CHECK_DOCUMENT_URL) 11 #if defined(CHECK_DOCUMENT_URL)
11 #include "ppapi/cpp/dev/url_util_dev.h" 12 #include "ppapi/cpp/dev/url_util_dev.h"
12 #include "ppapi/cpp/instance_handle.h" 13 #include "ppapi/cpp/instance_handle.h"
13 #endif // defined(CHECK_DOCUMENT_URL) 14 #endif // defined(CHECK_DOCUMENT_URL)
14 15
15 namespace { 16 namespace {
16 17
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 callback_factory_.NewCallback(&CdmAdapter::DecoderInitializeDone, 888 callback_factory_.NewCallback(&CdmAdapter::DecoderInitializeDone,
888 PP_DECRYPTORSTREAMTYPE_VIDEO, 889 PP_DECRYPTORSTREAMTYPE_VIDEO,
889 deferred_video_decoder_config_id_, 890 deferred_video_decoder_config_id_,
890 decoder_status == cdm::kSuccess)); 891 decoder_status == cdm::kSuccess));
891 deferred_initialize_video_decoder_ = false; 892 deferred_initialize_video_decoder_ = false;
892 deferred_video_decoder_config_id_ = 0; 893 deferred_video_decoder_config_id_ = 0;
893 break; 894 break;
894 } 895 }
895 } 896 }
896 897
898 // The CDM owns the returned object and must call FileIO::Close() to release it.
899 cdm::FileIO* CdmAdapter::CreateFileIO(cdm::FileIOClient* client) {
900 return new CdmFileIOImpl(client, pp_instance());
901 }
902
897 #if defined(OS_CHROMEOS) 903 #if defined(OS_CHROMEOS)
898 void CdmAdapter::SendPlatformChallengeDone(int32_t result) { 904 void CdmAdapter::SendPlatformChallengeDone(int32_t result) {
899 challenge_in_progress_ = false; 905 challenge_in_progress_ = false;
900 906
901 if (result != PP_OK) { 907 if (result != PP_OK) {
902 cdm::PlatformChallengeResponse response = {}; 908 cdm::PlatformChallengeResponse response = {};
903 cdm_->OnPlatformChallengeResponse(response); 909 cdm_->OnPlatformChallengeResponse(response);
904 return; 910 return;
905 } 911 }
906 912
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
1003 } // namespace media 1009 } // namespace media
1004 1010
1005 namespace pp { 1011 namespace pp {
1006 1012
1007 // Factory function for your specialization of the Module object. 1013 // Factory function for your specialization of the Module object.
1008 Module* CreateModule() { 1014 Module* CreateModule() {
1009 return new media::CdmAdapterModule(); 1015 return new media::CdmAdapterModule();
1010 } 1016 }
1011 1017
1012 } // namespace pp 1018 } // namespace pp
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698