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

Issue 1659013002: MediaSourceDelegate: Fix DecryptingDemuxerStream initialization logic. (Closed)

Created:
4 years, 10 months ago by xhwang
Modified:
4 years, 10 months ago
Reviewers:
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@2623
Target Ref:
refs/pending/branch-heads/2623
Project:
chromium
Visibility:
Public.

Description

MediaSourceDelegate: Fix DecryptingDemuxerStream initialization logic. Different CDMs are supported differently. For CDMs that support a Decryptor, we'll try to use DecryptingDemuxerStream in the render side. Otherwise, we'll try to use the CDMs in the browser side. Therefore, if DecryptingDemuxerStream initialization failed, it's still possible that we can handle the audio with a CDM in the browser. Declare demuxer ready now to try that path. Note there's no need to try DecryptingDemuxerStream for video here since it is impossible to handle audio in the browser and handle video in the render process. This also fixes the issue where CdmAttachedCB is fired twice with "false". BUG=578203 TEST=No DCHECK when playing media/L3_audio_L3_video.mp4.mpd. Review URL: https://codereview.chromium.org/1613793002 Cr-Commit-Position: refs/heads/master@{#372842} (cherry picked from commit e261467104d141089906fd02e1230306cb8d0040) Committed: https://chromium.googlesource.com/chromium/src/+/3f1b97b0b74f2540704caba24943b681fd6aaa2f

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+23 lines, -8 lines) Patch
M content/renderer/media/android/media_source_delegate.cc View 4 chunks +23 lines, -8 lines 0 comments Download

Messages

Total messages: 2 (1 generated)
xhwang
4 years, 10 months ago (2016-02-02 06:20:30 UTC) #2
Message was sent while issue was closed.
Committed patchset #1 (id:1) manually as
3f1b97b0b74f2540704caba24943b681fd6aaa2f.

Powered by Google App Engine
This is Rietveld 408576698