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

Side by Side Diff: third_party/WebKit/Source/core/html/track/TrackBase.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: 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 16 matching lines...) Expand all
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "core/html/track/TrackBase.h" 31 #include "core/html/track/TrackBase.h"
32 32
33 #include "core/html/HTMLMediaElement.h" 33 #include "core/html/HTMLMediaElement.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 static WebMediaPlayer::TrackId nextTrackId()
38 {
39 static WebMediaPlayer::TrackId next = 0;
40 return ++next;
41 }
42
43 TrackBase::TrackBase(WebMediaPlayer::TrackType type, const AtomicString& kind, c onst AtomicString& label, const AtomicString& language, const String& id) 37 TrackBase::TrackBase(WebMediaPlayer::TrackType type, const AtomicString& kind, c onst AtomicString& label, const AtomicString& language, const String& id)
44 : m_trackId(nextTrackId()) 38 : m_type(type)
45 , m_type(type)
46 , m_kind(kind) 39 , m_kind(kind)
47 , m_label(label) 40 , m_label(label)
48 , m_language(language) 41 , m_language(language)
49 , m_id(id) 42 , m_id(id)
50 , m_mediaElement(nullptr) 43 , m_mediaElement(nullptr)
51 { 44 {
52 } 45 }
53 46
54 TrackBase::~TrackBase() 47 TrackBase::~TrackBase()
55 { 48 {
56 } 49 }
57 50
58 Node* TrackBase::owner() const 51 Node* TrackBase::owner() const
59 { 52 {
60 return m_mediaElement; 53 return m_mediaElement;
61 } 54 }
62 55
63 DEFINE_TRACE(TrackBase) 56 DEFINE_TRACE(TrackBase)
64 { 57 {
65 Supplementable<TrackBase>::trace(visitor); 58 Supplementable<TrackBase>::trace(visitor);
66 visitor->trace(m_mediaElement); 59 visitor->trace(m_mediaElement);
67 } 60 }
68 61
69 } // namespace blink 62 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/track/TrackBase.h ('k') | third_party/WebKit/Source/core/html/track/TrackListBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698