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

Unified Diff: third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp

Issue 2532233003: [Video] Add dummy video/audio tracks inactive to select them later. (Closed)
Patch Set: Extracted checks into HTMLMediaElement Created 4 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 | « third_party/WebKit/Source/modules/mediasource/MediaSource.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp
diff --git a/third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp b/third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp
index 99dd8a4216d0dc46a8bd81bc17c869ad0195e874..7a87c4a9ef9b840115a14ed9ee6f19542d41ed1e 100644
--- a/third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp
+++ b/third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp
@@ -269,12 +269,12 @@ void SourceBuffer::setTimestampOffset(double offset,
}
AudioTrackList& SourceBuffer::audioTracks() {
- DCHECK(RuntimeEnabledFeatures::audioVideoTracksEnabled());
+ DCHECK(HTMLMediaElement::mediaTracksEnabledInternally());
return *m_audioTracks;
}
VideoTrackList& SourceBuffer::videoTracks() {
- DCHECK(RuntimeEnabledFeatures::audioVideoTracksEnabled());
+ DCHECK(HTMLMediaElement::mediaTracksEnabledInternally());
return *m_videoTracks;
}
@@ -569,7 +569,7 @@ void SourceBuffer::removedFromMediaSource() {
abortIfUpdating();
}
- if (RuntimeEnabledFeatures::audioVideoTracksEnabled()) {
+ if (HTMLMediaElement::mediaTracksEnabledInternally()) {
DCHECK(m_source);
if (m_source->mediaElement()->audioTracks().length() > 0 ||
m_source->mediaElement()->videoTracks().length() > 0) {
@@ -592,7 +592,7 @@ double SourceBuffer::highestPresentationTimestamp() {
}
void SourceBuffer::removeMediaTracks() {
- DCHECK(RuntimeEnabledFeatures::audioVideoTracksEnabled());
+ DCHECK(HTMLMediaElement::mediaTracksEnabledInternally());
// Spec:
// http://w3c.github.io/media-source/#widl-MediaSource-removeSourceBuffer-void-SourceBuffer-sourceBuffer
DCHECK(m_source);
@@ -756,7 +756,7 @@ bool SourceBuffer::initializationSegmentReceived(
DCHECK(m_source->mediaElement());
DCHECK(m_updating);
- if (!RuntimeEnabledFeatures::audioVideoTracksEnabled()) {
+ if (!HTMLMediaElement::mediaTracksEnabledInternally()) {
if (!m_firstInitializationSegmentReceived) {
m_source->setSourceBufferActive(this, true);
m_firstInitializationSegmentReceived = true;
« no previous file with comments | « third_party/WebKit/Source/modules/mediasource/MediaSource.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698