corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1207546 - Integrate WebRTC with audio channels, r=roc

Browse Source
This commit is contained in:
Andrea Marchesini
2015-10-14 11:32:23 +05:30
parent 687f930aed
commit 838597d936
3 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/test/mochitest.ini
View File

@@ -269,6 +269,8 @@ support-files =
[test_audioWindowUtils.html] [test_audioWindowUtils.html]
[test_audioNotification.html] [test_audioNotification.html]
skip-if = buildapp == 'mulet' skip-if = buildapp == 'mulet'
[test_audioNotificationStream.html]
skip-if = buildapp == 'mulet'
[test_audioNotificationStopOnNavigation.html] [test_audioNotificationStopOnNavigation.html]
skip-if = buildapp == 'mulet' skip-if = buildapp == 'mulet'
[test_audioNotificationWithEarlyPlay.html] [test_audioNotificationWithEarlyPlay.html]

71
dom/base/test/test_audioNotificationStream.html Normal file
View File

@@ -0,0 +1,71 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test for audio controller in windows</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<pre id="test">
</pre>
<script type="application/javascript">
SimpleTest.waitForExplicitFinish();
var expectedNotification = null;
var observer = {
observe: function(subject, topic, data) {
is(topic, "audio-playback", "audio-playback received");
is(data, expectedNotification, "This is the right notification");
runTest();
}
};
var observerService = SpecialPowers.Cc["@mozilla.org/observer-service;1"]
.getService(SpecialPowers.Ci.nsIObserverService);
var audio = new Audio();
audio.srcObject = (new AudioContext()).createMediaStreamDestination().stream;
var tests = [
function() {
observerService.addObserver(observer, "audio-playback", false);
ok(true, "Observer set");
runTest();
},
function() {
expectedNotification = 'active';
audio.play();
},
function() {
expectedNotification = 'inactive';
audio.pause();
},
function() {
observerService.removeObserver(observer, "audio-playback");
ok(true, "Observer removed");
runTest();
}
];
function runTest() {
if (!tests.length) {
SimpleTest.finish();
return;
}
var test = tests.shift();
test();
}
runTest();
</script>
</body>
</html>

3
dom/html/HTMLMediaElement.cpp
View File

@@ -4730,7 +4730,8 @@ HTMLMediaElement::UpdateAudioChannelPlayingState()
(HasAttr(kNameSpaceID_None, nsGkAtoms::loop) || (HasAttr(kNameSpaceID_None, nsGkAtoms::loop) ||
(mReadyState >= nsIDOMHTMLMediaElement::HAVE_CURRENT_DATA && (mReadyState >= nsIDOMHTMLMediaElement::HAVE_CURRENT_DATA &&
!IsPlaybackEnded()) || !IsPlaybackEnded()) ||
mPlayingThroughTheAudioChannelBeforeSeek)); mPlayingThroughTheAudioChannelBeforeSeek ||
mSrcAttrStream));
if (playingThroughTheAudioChannel != mPlayingThroughTheAudioChannel) { if (playingThroughTheAudioChannel != mPlayingThroughTheAudioChannel) {
mPlayingThroughTheAudioChannel = playingThroughTheAudioChannel; mPlayingThroughTheAudioChannel = playingThroughTheAudioChannel;