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

Unified Diff: chromecast/media/cdm/browser_cdm_cast.cc

Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: overhaul: creates MediaClientAndroid (browser-side client), eliminates Java-based MediaDrmBridge ke… Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chromecast/media/cdm/browser_cdm_cast.cc
diff --git a/chromecast/media/cdm/browser_cdm_cast.cc b/chromecast/media/cdm/browser_cdm_cast.cc
index 33c10c5d90af02991a96a72fe62fd7d71c414dac..ff922a1c03f68dcd75474852f8cb6355fc624e79 100644
--- a/chromecast/media/cdm/browser_cdm_cast.cc
+++ b/chromecast/media/cdm/browser_cdm_cast.cc
@@ -102,7 +102,7 @@ void BrowserCdmCast::OnSessionKeysChange(
void BrowserCdmCast::SetServerCertificateHelper(
const std::vector<uint8>& certificate_data,
scoped_ptr<::media::SimpleCdmPromise> promise) {
- SetServerCertificate(certificate_data.data(),
+ SetServerCertificate(&certificate_data[0],
certificate_data.size(),
promise.Pass());
}
xhwang 2015/04/24 04:52:23 You need to rebase :)
@@ -113,7 +113,7 @@ void BrowserCdmCast::CreateSessionAndGenerateRequestHelper(
const std::vector<uint8>& init_data,
scoped_ptr<::media::NewSessionCdmPromise> promise) {
CreateSessionAndGenerateRequest(
- session_type, init_data_type, init_data.data(), init_data.size(),
+ session_type, init_data_type, &init_data[0], init_data.size(),
promise.Pass());
}
@@ -121,7 +121,7 @@ void BrowserCdmCast::UpdateSessionHelper(
const std::string& session_id,
const std::vector<uint8>& response,
scoped_ptr<::media::SimpleCdmPromise> promise) {
- UpdateSession(session_id, response.data(), response.size(), promise.Pass());
+ UpdateSession(session_id, &response[0], response.size(), promise.Pass());
}
// A macro runs current member function on |cdm_loop_| thread.

Powered by Google App Engine
This is Rietveld 408576698