media/base/android/audio_decoder_job.cc - Issue 1512173003: media: Refactor MediaCrypto creation and notification.

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: media/base/android/audio_decoder_job.cc

Issue 1512173003: media: Refactor MediaCrypto creation and notification. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | media/base/android/java/src/org/chromium/media/MediaDrmBridge.java » ('j') | media/base/android/java/src/org/chromium/media/MediaDrmBridge.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/audio_decoder_job.cc

diff --git a/media/base/android/audio_decoder_job.cc b/media/base/android/audio_decoder_job.cc

index 4ef622a7e803af6432a4584fc138a81f972db922..4e4a705d6e0fffeb4d15b38362d0e87344f2fb20 100644

--- a/media/base/android/audio_decoder_job.cc

+++ b/media/base/android/audio_decoder_job.cc

@@ -161,10 +161,11 @@ MediaDecoderJob::MediaDecoderJobStatus

if (!media_codec_bridge_)

return STATUS_FAILURE;

- if (!(static_cast<AudioCodecBridge*>(media_codec_bridge_.get()))->Start(

- audio_codec_, config_sampling_rate_, num_channels_, &audio_extra_data_[0],

- audio_extra_data_.size(), audio_codec_delay_ns_, audio_seek_preroll_ns_,

- true, GetMediaCrypto().obj())) {

+ if (!(static_cast<AudioCodecBridge*>(media_codec_bridge_.get()))

+ ->Start(audio_codec_, config_sampling_rate_, num_channels_,

+ &audio_extra_data_[0], audio_extra_data_.size(),

+ audio_codec_delay_ns_, audio_seek_preroll_ns_, true,

+ GetMediaCrypto())) {

media_codec_bridge_.reset();

return STATUS_FAILURE;

}