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

Side by Side 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: 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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 22 matching lines...) Expand all
33 #include "wtf/text/AtomicString.h" 33 #include "wtf/text/AtomicString.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 class HTMLMediaElement; 37 class HTMLMediaElement;
38 38
39 class CORE_EXPORT TrackBase : public Supplementable<TrackBase> { 39 class CORE_EXPORT TrackBase : public Supplementable<TrackBase> {
40 public: 40 public:
41 virtual ~TrackBase(); 41 virtual ~TrackBase();
42 42
43 WebMediaPlayer::TrackId trackId() const { return m_trackId; } 43 WebMediaPlayer::TrackId trackId() const { return m_id; }
44 44
45 WebMediaPlayer::TrackType type() const { return m_type; } 45 WebMediaPlayer::TrackType type() const { return m_type; }
46 46
47 const AtomicString& kind() const { return m_kind; } 47 const AtomicString& kind() const { return m_kind; }
48 AtomicString label() const { return m_label; } 48 AtomicString label() const { return m_label; }
49 AtomicString language() const { return m_language; } 49 AtomicString language() const { return m_language; }
50 String id() const { return m_id; } 50 String id() const { return m_id; }
51 51
52 void setMediaElement(HTMLMediaElement* mediaElement) { m_mediaElement = medi aElement; } 52 void setMediaElement(HTMLMediaElement* mediaElement) { m_mediaElement = medi aElement; }
53 HTMLMediaElement* mediaElement() const { return m_mediaElement; } 53 HTMLMediaElement* mediaElement() const { return m_mediaElement; }
54 Node* owner() const; 54 Node* owner() const;
55 55
56 DECLARE_VIRTUAL_TRACE(); 56 DECLARE_VIRTUAL_TRACE();
57 57
58 protected: 58 protected:
59 TrackBase(WebMediaPlayer::TrackType, const AtomicString& kind, const AtomicS tring& label, const AtomicString& language, const String& id); 59 TrackBase(WebMediaPlayer::TrackType, const AtomicString& kind, const AtomicS tring& label, const AtomicString& language, const String& id);
60 60
61 WebMediaPlayer::TrackId m_trackId;
62 WebMediaPlayer::TrackType m_type; 61 WebMediaPlayer::TrackType m_type;
63 AtomicString m_kind; 62 AtomicString m_kind;
64 AtomicString m_label; 63 AtomicString m_label;
65 AtomicString m_language; 64 AtomicString m_language;
66 String m_id; 65 String m_id;
xhwang 2016/06/09 06:06:02 Shall this be WebMediaPlayer::TrackId m_trackId?
67 Member<HTMLMediaElement> m_mediaElement; 66 Member<HTMLMediaElement> m_mediaElement;
68 }; 67 };
69 68
70 #define DEFINE_TRACK_TYPE_CASTS(thisType, predicate) \ 69 #define DEFINE_TRACK_TYPE_CASTS(thisType, predicate) \
71 DEFINE_TYPE_CASTS(thisType, TrackBase, track, track->type() == predicate, tr ack.type() == predicate) 70 DEFINE_TYPE_CASTS(thisType, TrackBase, track, track->type() == predicate, tr ack.type() == predicate)
72 71
73 } // namespace blink 72 } // namespace blink
74 73
75 #endif // TrackBase_h 74 #endif // TrackBase_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698