third_party/WebKit/Source/core/html/HTMLMediaElement.cpp - Issue 2050043002: Generate and assign media track ids in demuxers.

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: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

Issue 2050043002: Generate and assign media track ids in demuxers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-streamparser-trackid

Patch Set: Created 4 years, 6 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

« media/filters/ffmpeg_demuxer.cc ('K') | « media/test/pipeline_integration_test_base.cc ('k') | third_party/WebKit/Source/core/html/track/TrackBase.h » ('j') | third_party/WebKit/Source/core/html/track/TrackBase.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

index c938c39946b299731088bc3646a3cd1c29398fb9..881b3f24ea563e101ceaf9bb395d3078de622816 100644

--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

@@ -2363,7 +2363,7 @@ AudioTrackList& HTMLMediaElement::audioTracks()

void HTMLMediaElement::audioTrackChanged(WebMediaPlayer::TrackId trackId, bool enabled)

{

- DVLOG(MEDIA_LOG_LEVEL) << "audioTrackChanged(" << (void*)this << ") trackId= " << trackId << " enabled=" << boolString(enabled);

+ DVLOG(MEDIA_LOG_LEVEL) << "audioTrackChanged(" << (void*)this << ") trackId= " << (String)trackId << " enabled=" << boolString(enabled);

DCHECK(RuntimeEnabledFeatures::audioVideoTracksEnabled());

audioTracks().scheduleChangeEvent();

@@ -2393,7 +2393,7 @@ WebMediaPlayer::TrackId HTMLMediaElement::addAudioTrack(const WebString& id, Web

<< "', '" << (String)label << "', '" << (String)language << "', " << boolString(enabled) << ")";

if (!RuntimeEnabledFeatures::audioVideoTracksEnabled())

- return 0;

+ return blink::WebString();

AudioTrack* audioTrack = AudioTrack::create(id, kindString, label, language, enabled);

audioTracks().add(audioTrack);

@@ -2419,7 +2419,7 @@ VideoTrackList& HTMLMediaElement::videoTracks()

void HTMLMediaElement::selectedVideoTrackChanged(WebMediaPlayer::TrackId* selectedTrackId)

{

- DVLOG(MEDIA_LOG_LEVEL) << "selectedVideoTrackChanged(" << (void*)this << ") selectedTrackId=" << (selectedTrackId ? String::format("%u", *selectedTrackId) : "none");

+ DVLOG(MEDIA_LOG_LEVEL) << "selectedVideoTrackChanged(" << (void*)this << ") selectedTrackId=" << (selectedTrackId ? ((String)*selectedTrackId) : "none");

DCHECK(RuntimeEnabledFeatures::audioVideoTracksEnabled());

if (selectedTrackId)

@@ -2437,7 +2437,7 @@ WebMediaPlayer::TrackId HTMLMediaElement::addVideoTrack(const WebString& id, Web

<< "', '" << (String)label << "', '" << (String)language << "', " << boolString(selected) << ")";

if (!RuntimeEnabledFeatures::audioVideoTracksEnabled())

- return 0;

+ return blink::WebString();

// If another track was selected (potentially by the user), leave it selected.

if (selected && videoTracks().selectedIndex() != -1)