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

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 23072043: Change NeedKeyCB to use std::vector. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix seek_tester, demuxer_bench, and player_x11 Created 7 years, 4 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: content/renderer/media/android/webmediaplayer_android.cc
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index f8eea96504bf4453bd55891ac09988d01dcd8b95..6f5f06b0cb948be1bdf9e33219a984da32b2c392 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -1131,8 +1131,7 @@ void WebMediaPlayerAndroid::OnMediaSourceOpened(
void WebMediaPlayerAndroid::OnNeedKey(const std::string& session_id,
const std::string& type,
- scoped_ptr<uint8[]> init_data,
- int init_data_size) {
+ const std::vector<uint8>& init_data) {
// Do not fire NeedKey event if encrypted media is not enabled.
if (!WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled() &&
!WebKit::WebRuntimeFeatures::isLegacyEncryptedMediaEnabled()) {
@@ -1145,10 +1144,11 @@ void WebMediaPlayerAndroid::OnNeedKey(const std::string& session_id,
if (init_data_type_.empty())
init_data_type_ = type;
+ const uint8* init_data_ptr = init_data.empty() ? NULL : &init_data[0];
client_->keyNeeded(WebString(),
WebString::fromUTF8(session_id),
- init_data.get(),
- init_data_size);
+ init_data_ptr,
+ init_data.size());
}
#if defined(GOOGLE_TV)
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.h ('k') | content/renderer/media/webmediaplayer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698