Chromium Code Reviews| 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 58f83cf70ca2b10351234242c41770ca26edb674..090b344b185a8ca1444d586082ecf7bb134bcedd 100644 |
| --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp |
| +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp |
| @@ -2400,14 +2400,15 @@ AudioTrackList& HTMLMediaElement::audioTracks() |
| return *m_audioTracks; |
| } |
| -void HTMLMediaElement::audioTrackChanged(WebMediaPlayer::TrackId trackId, bool enabled) |
| +void HTMLMediaElement::audioTrackChanged(AudioTrack* track, bool enabled) |
|
mlamouri (slow - plz ping)
2016/08/23 13:12:27
Do you still need `enabled`? It sounds like you co
servolk
2016/08/23 17:25:02
Done.
|
| { |
| - BLINK_MEDIA_LOG << "audioTrackChanged(" << (void*)this << ") trackId= " << String(trackId) << " enabled=" << boolString(enabled); |
| + BLINK_MEDIA_LOG << "audioTrackChanged(" << (void*)this << ") trackId= " << String(track->id()) << " enabled=" << boolString(enabled); |
| DCHECK(RuntimeEnabledFeatures::audioVideoTracksEnabled()); |
| audioTracks().scheduleChangeEvent(); |
| - // FIXME: Add call on m_mediaSource to notify it of track changes once the SourceBuffer.audioTracks attribute is added. |
| + if (m_mediaSource) |
| + m_mediaSource->onTrackChanged(track); |
| if (!m_audioTracksTimer.isActive()) |
| m_audioTracksTimer.startOneShot(0, BLINK_FROM_HERE); |
| @@ -2456,17 +2457,21 @@ VideoTrackList& HTMLMediaElement::videoTracks() |
| return *m_videoTracks; |
| } |
| -void HTMLMediaElement::selectedVideoTrackChanged(WebMediaPlayer::TrackId* selectedTrackId) |
| +void HTMLMediaElement::selectedVideoTrackChanged(VideoTrack* track, bool selected) |
|
mlamouri (slow - plz ping)
2016/08/23 13:12:27
ditto for `selected`
servolk
2016/08/23 17:25:02
Done.
|
| { |
| - BLINK_MEDIA_LOG << "selectedVideoTrackChanged(" << (void*)this << ") selectedTrackId=" << (selectedTrackId ? String(*selectedTrackId) : "none"); |
| + BLINK_MEDIA_LOG << "selectedVideoTrackChanged(" << (void*)this << ") selectedTrackId=" << (selected ? String(track->id()) : "none"); |
| DCHECK(RuntimeEnabledFeatures::audioVideoTracksEnabled()); |
| - if (selectedTrackId) |
| - videoTracks().trackSelected(*selectedTrackId); |
| + if (selected) |
| + videoTracks().trackSelected(track->id()); |
| + |
| + videoTracks().scheduleChangeEvent(); |
| - // FIXME: Add call on m_mediaSource to notify it of track changes once the SourceBuffer.videoTracks attribute is added. |
| + if (m_mediaSource) |
| + m_mediaSource->onTrackChanged(track); |
| - webMediaPlayer()->selectedVideoTrackChanged(selectedTrackId); |
| + WebMediaPlayer::TrackId id = track->id(); |
| + webMediaPlayer()->selectedVideoTrackChanged(selected ? &id : nullptr); |
| } |
| WebMediaPlayer::TrackId HTMLMediaElement::addVideoTrack(const WebString& id, WebMediaPlayerClient::VideoTrackKind kind, const WebString& label, const WebString& language, bool selected) |