third_party/WebKit/Source/core/html/track/TrackBase.h - 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/track/TrackBase.h

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: rebase to ToT 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

« no previous file with comments | « third_party/WebKit/Source/core/html/track/TextTrackList.cpp ('k') | third_party/WebKit/Source/core/html/track/TrackBase.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/track/TrackBase.h

diff --git a/third_party/WebKit/Source/core/html/track/TrackBase.h b/third_party/WebKit/Source/core/html/track/TrackBase.h

index d622095798c74391032891f391871ecade7e6268..ea3d4bd732ec997126c570c0cfc92f9bd0ce8863 100644

--- a/third_party/WebKit/Source/core/html/track/TrackBase.h

+++ b/third_party/WebKit/Source/core/html/track/TrackBase.h

@@ -40,14 +40,13 @@ class CORE_EXPORT TrackBase : public Supplementable<TrackBase> {

public:

virtual ~TrackBase();

- WebMediaPlayer::TrackId trackId() const { return m_trackId; }

+ WebMediaPlayer::TrackId id() const { return m_id; }

WebMediaPlayer::TrackType type() const { return m_type; }

const AtomicString& kind() const { return m_kind; }

AtomicString label() const { return m_label; }

AtomicString language() const { return m_language; }

- String id() const { return m_id; }

void setMediaElement(HTMLMediaElement* mediaElement) { m_mediaElement = mediaElement; }

HTMLMediaElement* mediaElement() const { return m_mediaElement; }

@@ -58,7 +57,6 @@ public:

protected:

TrackBase(WebMediaPlayer::TrackType, const AtomicString& kind, const AtomicString& label, const AtomicString& language, const String& id);

- WebMediaPlayer::TrackId m_trackId;

WebMediaPlayer::TrackType m_type;

AtomicString m_kind;

AtomicString m_label;