Changeset 206209 in webkit
- Timestamp:
- Sep 21, 2016 9:13:57 AM (8 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r206208 r206209 1 2016-09-19 Jer Noble <jer.noble@apple.com> 2 3 [media-source] Fix imported/w3c/web-platform-tests/media-source/mediasource-activesourcebuffers.html 4 https://bugs.webkit.org/show_bug.cgi?id=162257 5 6 Reviewed by Eric Carlson. 7 8 * platform/mac/TestExpectations: 9 1 10 2016-09-20 Jer Noble <jer.noble@apple.com> 2 11 -
trunk/LayoutTests/platform/mac/TestExpectations
r206208 r206209 1045 1045 [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/URL-createObjectURL.html [ Pass ] 1046 1046 [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/URL-createObjectURL-null.html [ Pass ] 1047 [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-activesourcebuffers.html [ Pass ] 1047 1048 [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-addsourcebuffer-mode.html [ Pass ] 1048 1049 [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-addsourcebuffer.html [ Pass ] -
trunk/Source/WebCore/ChangeLog
r206208 r206209 1 2016-09-19 Jer Noble <jer.noble@apple.com> 2 3 [media-source] Fix imported/w3c/web-platform-tests/media-source/mediasource-activesourcebuffers.html 4 https://bugs.webkit.org/show_bug.cgi?id=162257 5 6 Reviewed by Eric Carlson. 7 8 Some of the conditions in the track changed methods were reversed, and all failed to schedule 9 a change event. 10 11 * Modules/mediasource/SourceBuffer.cpp: 12 (WebCore::SourceBuffer::videoTrackSelectedChanged): 13 (WebCore::SourceBuffer::audioTrackEnabledChanged): 14 (WebCore::SourceBuffer::textTrackModeChanged): 15 1 16 2016-09-20 Jer Noble <jer.noble@apple.com> 2 17 -
trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp
r206186 r206209 1696 1696 // 1. If the SourceBuffer associated with the previously selected video track is not associated with 1697 1697 // any other enabled tracks, run the following steps: 1698 if ( track->selected()1698 if (!track->selected() 1699 1699 && (!m_videoTracks || !m_videoTracks->isAnyTrackEnabled()) 1700 1700 && (!m_audioTracks || !m_audioTracks->isAnyTrackEnabled()) … … 1703 1703 // 1.2 Queue a task to fire a simple event named removesourcebuffer at activeSourceBuffers 1704 1704 setActive(false); 1705 } else if ( !track->selected()) {1705 } else if (track->selected()) { 1706 1706 // 2. If the SourceBuffer associated with the newly selected video track is not already in activeSourceBuffers, 1707 1707 // run the following steps: … … 1711 1711 } 1712 1712 1713 if (m_videoTracks && m_videoTracks->contains(*track)) 1714 m_videoTracks->scheduleChangeEvent(); 1715 1713 1716 if (!isRemoved()) 1714 1717 m_source->mediaElement()->videoTrackSelectedChanged(track); … … 1720 1723 // If an audio track becomes disabled and the SourceBuffer associated with this track is not 1721 1724 // associated with any other enabled or selected track, then run the following steps: 1722 if ( track->enabled()1725 if (!track->enabled() 1723 1726 && (!m_videoTracks || !m_videoTracks->isAnyTrackEnabled()) 1724 1727 && (!m_audioTracks || !m_audioTracks->isAnyTrackEnabled()) … … 1727 1730 // 2. Queue a task to fire a simple event named removesourcebuffer at activeSourceBuffers 1728 1731 setActive(false); 1729 } else if ( !track->enabled()) {1732 } else if (track->enabled()) { 1730 1733 // If an audio track becomes enabled and the SourceBuffer associated with this track is 1731 1734 // not already in activeSourceBuffers, then run the following steps: … … 1734 1737 setActive(true); 1735 1738 } 1739 1740 if (m_audioTracks && m_audioTracks->contains(*track)) 1741 m_audioTracks->scheduleChangeEvent(); 1736 1742 1737 1743 if (!isRemoved()) … … 1759 1765 } 1760 1766 1767 if (m_textTracks && m_textTracks->contains(*track)) 1768 m_textTracks->scheduleChangeEvent(); 1769 1761 1770 if (!isRemoved()) 1762 1771 m_source->mediaElement()->textTrackModeChanged(track);
Note: See TracChangeset
for help on using the changeset viewer.