content/renderer/media/android/media_source_delegate.cc - Issue 23072043: Change NeedKeyCB to use std::vector.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/android/media_source_delegate.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:

Index: content/renderer/media/android/media_source_delegate.cc

diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc

index 56002850d41fa7bbfaa55af068982dd60a35b5c3..fac5699455084eec7a95e99603fbad37c47ec402 100644

--- a/content/renderer/media/android/media_source_delegate.cc

+++ b/content/renderer/media/android/media_source_delegate.cc

@@ -739,13 +739,12 @@ void MediaSourceDelegate::OnDemuxerOpened() {

void MediaSourceDelegate::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) {

DCHECK(main_loop_->BelongsToCurrentThread());

if (need_key_cb_.is_null())

return;

- need_key_cb_.Run(session_id, type, init_data.Pass(), init_data_size);

+ need_key_cb_.Run(session_id, type, init_data);

}

scoped_ptr<media::TextTrack> MediaSourceDelegate::OnAddTextTrack(