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

Side by Side Diff: webkit/media/webmediaplayer_impl.cc

Issue 10539150: Add Decryptor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « webkit/media/webmediaplayer_impl.h ('k') | webkit/media/webmediaplayer_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "webkit/media/webmediaplayer_impl.h" 5 #include "webkit/media/webmediaplayer_impl.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 DCHECK_EQ(main_loop_, MessageLoop::current()); 886 DCHECK_EQ(main_loop_, MessageLoop::current());
887 887
888 GetClient()->keyNeeded(WebString::fromUTF8(key_system), 888 GetClient()->keyNeeded(WebString::fromUTF8(key_system),
889 WebString::fromUTF8(session_id), 889 WebString::fromUTF8(session_id),
890 init_data.get(), 890 init_data.get(),
891 init_data_size); 891 init_data_size);
892 } 892 }
893 893
894 void WebMediaPlayerImpl::OnKeyError(const std::string& key_system, 894 void WebMediaPlayerImpl::OnKeyError(const std::string& key_system,
895 const std::string& session_id, 895 const std::string& session_id,
896 media::AesDecryptor::KeyError error_code, 896 media::Decryptor::KeyError error_code,
897 int system_code) { 897 int system_code) {
898 DCHECK_EQ(main_loop_, MessageLoop::current()); 898 DCHECK_EQ(main_loop_, MessageLoop::current());
899 899
900 GetClient()->keyError( 900 GetClient()->keyError(
901 WebString::fromUTF8(key_system), 901 WebString::fromUTF8(key_system),
902 WebString::fromUTF8(session_id), 902 WebString::fromUTF8(session_id),
903 static_cast<WebKit::WebMediaPlayerClient::MediaKeyErrorCode>(error_code), 903 static_cast<WebKit::WebMediaPlayerClient::MediaKeyErrorCode>(error_code),
904 system_code); 904 system_code);
905 } 905 }
906 906
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1021 return audio_source_provider_; 1021 return audio_source_provider_;
1022 } 1022 }
1023 1023
1024 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { 1024 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
1025 DCHECK_EQ(main_loop_, MessageLoop::current()); 1025 DCHECK_EQ(main_loop_, MessageLoop::current());
1026 incremented_externally_allocated_memory_ = true; 1026 incremented_externally_allocated_memory_ = true;
1027 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); 1027 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
1028 } 1028 }
1029 1029
1030 } // namespace webkit_media 1030 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/webmediaplayer_impl.h ('k') | webkit/media/webmediaplayer_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698