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

Side by Side Diff: third_party/WebKit/Source/core/html/track/TrackBase.cpp

Issue 1659653002: Pass MSE media track info from ChunkDemuxer to blink::SourceBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-media-tracks-in-media
Patch Set: nit Created 4 years, 8 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 22 matching lines...) Expand all
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() 37 static WebMediaPlayer::TrackId nextTrackId()
38 { 38 {
39 static WebMediaPlayer::TrackId next = 0; 39 static WebMediaPlayer::TrackId next = 0;
40 return ++next; 40 return ++next;
41 } 41 }
42 42
43 TrackBase::TrackBase(TrackType type, const AtomicString& label, const AtomicStri ng& language, const String& id) 43 TrackBase::TrackBase(WebMediaPlayer::TrackType type, const AtomicString& label, const AtomicString& language, const String& id)
44 : m_trackId(nextTrackId()) 44 : m_trackId(nextTrackId())
45 , m_type(type) 45 , m_type(type)
46 , m_label(label) 46 , m_label(label)
47 , m_language(language) 47 , m_language(language)
48 , m_id(id) 48 , m_id(id)
49 , m_mediaElement(nullptr) 49 , m_mediaElement(nullptr)
50 { 50 {
51 } 51 }
52 52
53 TrackBase::~TrackBase() 53 TrackBase::~TrackBase()
(...skipping 15 matching lines...) Expand all
69 69
70 void TrackBase::setKind(const AtomicString& kind) 70 void TrackBase::setKind(const AtomicString& kind)
71 { 71 {
72 if (isValidKind(kind)) 72 if (isValidKind(kind))
73 m_kind = kind; 73 m_kind = kind;
74 else 74 else
75 m_kind = defaultKind(); 75 m_kind = defaultKind();
76 } 76 }
77 77
78 } // namespace blink 78 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698