Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 9e90a81b9e37 (bug 856361)

Browse Source
This commit is contained in:
Ed Morley 2013-07-29 09:55:06 +01:00
parent f2b94a0500
commit db383fb0bf
16 changed files with 7 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
content/media/MediaStreamGraph.cpp
View File

@ -22,7 +22,6 @@
#include "AudioChannelCommon.h"
#include "AudioNodeEngine.h"
#include "AudioNodeStream.h"
#include "AudioNodeExternalInputStream.h"
#include <algorithm>
#include "DOMMediaStream.h"
#include "GeckoProfiler.h"
@ -2305,21 +2304,6 @@ MediaStreamGraph::CreateTrackUnionStream(DOMMediaStream* aWrapper)
return stream;
}
AudioNodeExternalInputStream*
MediaStreamGraph::CreateAudioNodeExternalInputStream(AudioNodeEngine* aEngine, TrackRate aSampleRate)
{
MOZ_ASSERT(NS_IsMainThread());
if (!aSampleRate) {
aSampleRate = aEngine->NodeMainThread()->Context()->SampleRate();
}
AudioNodeExternalInputStream* stream = new AudioNodeExternalInputStream(aEngine, aSampleRate);
NS_ADDREF(stream);
MediaStreamGraphImpl* graph = static_cast<MediaStreamGraphImpl*>(this);
stream->SetGraphImpl(graph);
graph->AppendMessage(new CreateMessage(stream));
return stream;
}
AudioNodeStream*
MediaStreamGraph::CreateAudioNodeStream(AudioNodeEngine* aEngine,
AudioNodeStreamKind aKind,

9
content/media/MediaStreamGraph.h
View File

@ -191,9 +191,8 @@ class MediaStreamGraphImpl;
class SourceMediaStream;
class ProcessedMediaStream;
class MediaInputPort;
class AudioNodeEngine;
class AudioNodeExternalInputStream;
class AudioNodeStream;
class AudioNodeEngine;
struct AudioChunk;
/**
@ -361,7 +360,6 @@ public:
friend class MediaStreamGraphImpl;
friend class MediaInputPort;
friend class AudioNodeExternalInputStream;
virtual SourceMediaStream* AsSourceStream() { return nullptr; }
virtual ProcessedMediaStream* AsProcessedStream() { return nullptr; }
@ -970,11 +968,6 @@ public:
AudioNodeStream* CreateAudioNodeStream(AudioNodeEngine* aEngine,
AudioNodeStreamKind aKind,
TrackRate aSampleRate = 0);
AudioNodeExternalInputStream*
CreateAudioNodeExternalInputStream(AudioNodeEngine* aEngine,
TrackRate aSampleRate = 0);
/**
* Returns the number of graph updates sent. This can be used to track
* whether a given update has been processed by the graph thread and reflected

2
content/media/moz.build
View File

@ -53,7 +53,6 @@ EXPORTS += [
'AudioChannelFormat.h',
'AudioEventTimeline.h',
'AudioNodeEngine.h',
'AudioNodeExternalInputStream.h',
'AudioNodeStream.h',
'AudioSampleFormat.h',
'AudioSegment.h',
@ -98,7 +97,6 @@ CPP_SOURCES += [
'AudioAvailableEventManager.cpp',
'AudioChannelFormat.cpp',
'AudioNodeEngine.cpp',
'AudioNodeExternalInputStream.cpp',
'AudioNodeStream.cpp',
'AudioSegment.cpp',
'AudioStream.cpp',

13
content/media/webaudio/AudioContext.cpp
View File

@ -16,7 +16,6 @@
#include "AudioBufferSourceNode.h"
#include "AudioBuffer.h"
#include "GainNode.h"
#include "MediaStreamAudioSourceNode.h"
#include "DelayNode.h"
#include "PannerNode.h"
#include "AudioListener.h"
@ -254,18 +253,6 @@ AudioContext::CreateAnalyser()
return analyserNode.forget();
}
already_AddRefed<MediaStreamAudioSourceNode>
AudioContext::CreateMediaStreamSource(const DOMMediaStream& aMediaStream,
ErrorResult& aRv)
{
if (mIsOffline) {
aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
return nullptr;
}
nsRefPtr<MediaStreamAudioSourceNode> mediaStreamAudioSourceNode = new MediaStreamAudioSourceNode(this, &aMediaStream);
return mediaStreamAudioSourceNode.forget();
}
already_AddRefed<GainNode>
AudioContext::CreateGain()
{

4
content/media/webaudio/AudioContext.h
View File

@ -53,7 +53,6 @@ class DynamicsCompressorNode;
class GainNode;
class GlobalObject;
class MediaStreamAudioDestinationNode;
class MediaStreamAudioSourceNode;
class OfflineRenderSuccessCallback;
class PannerNode;
class ScriptProcessorNode;
@ -162,9 +161,6 @@ public:
return CreateGain();
}
already_AddRefed<MediaStreamAudioSourceNode>
CreateMediaStreamSource(const DOMMediaStream& aMediaStream, ErrorResult& aRv);
already_AddRefed<DelayNode>
CreateDelay(double aMaxDelayTime, ErrorResult& aRv);

48
content/media/webaudio/MediaStreamAudioSourceNode.cpp
View File

@ -1,48 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim:set ts=2 sw=2 sts=2 et cindent: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "MediaStreamAudioSourceNode.h"
#include "mozilla/dom/MediaStreamAudioSourceNodeBinding.h"
#include "AudioNodeEngine.h"
#include "AudioNodeExternalInputStream.h"
#include "DOMMediaStream.h"
namespace mozilla {
namespace dom {
MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AudioContext* aContext,
const DOMMediaStream* aMediaStream)
: AudioNode(aContext,
2,
ChannelCountMode::Max,
ChannelInterpretation::Speakers)
{
AudioNodeEngine* engine = new AudioNodeEngine(this);
mStream = aContext->Graph()->CreateAudioNodeExternalInputStream(engine);
ProcessedMediaStream* outputStream = static_cast<ProcessedMediaStream*>(mStream.get());
mInputPort = outputStream->AllocateInputPort(aMediaStream->GetStream(),
MediaInputPort::FLAG_BLOCK_INPUT);
}
void
MediaStreamAudioSourceNode::DestroyMediaStream()
{
if (mInputPort) {
mInputPort->Destroy();
mInputPort = nullptr;
}
AudioNode::DestroyMediaStream();
}
JSObject*
MediaStreamAudioSourceNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
{
return MediaStreamAudioSourceNodeBinding::Wrap(aCx, aScope, this);
}
}
}

34
content/media/webaudio/MediaStreamAudioSourceNode.h
View File

@ -1,34 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim:set ts=2 sw=2 sts=2 et cindent: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef MediaStreamAudioSourceNode_h_
#define MediaStreamAudioSourceNode_h_
#include "AudioNode.h"
namespace mozilla {
namespace dom {
class MediaStreamAudioSourceNode : public AudioNode
{
public:
MediaStreamAudioSourceNode(AudioContext* aContext, const DOMMediaStream* aMediaStream);
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual void DestroyMediaStream() MOZ_OVERRIDE;
virtual uint16_t NumberOfInputs() const MOZ_OVERRIDE { return 0; }
private:
nsRefPtr<MediaInputPort> mInputPort;
};
}
}
#endif

2
content/media/webaudio/moz.build
View File

@ -40,7 +40,6 @@ EXPORTS.mozilla.dom += [
'EnableWebAudioCheck.h',
'GainNode.h',
'MediaStreamAudioDestinationNode.h',
'MediaStreamAudioSourceNode.h',
'OfflineAudioCompletionEvent.h',
'PannerNode.h',
'PeriodicWave.h',
@ -68,7 +67,6 @@ CPP_SOURCES += [
'GainNode.cpp',
'MediaBufferDecoder.cpp',
'MediaStreamAudioDestinationNode.cpp',
'MediaStreamAudioSourceNode.cpp',
'OfflineAudioCompletionEvent.cpp',
'PannerNode.cpp',
'PeriodicWave.cpp',

3
content/media/webaudio/test/Makefile.in
View File

@ -68,9 +68,6 @@ MOCHITEST_FILES := \
test_maxChannelCount.html \
test_mediaDecoding.html \
test_mediaStreamAudioDestinationNode.html \
test_mediaStreamAudioSourceNode.html \
test_mediaStreamAudioSourceNodeCrossOrigin.html \
test_mediaStreamAudioSourceNodeResampling.html \
test_mixingRules.html \
test_nodeToParamConnection.html \
test_OfflineAudioContext.html \

44
content/media/webaudio/test/test_mediaStreamAudioSourceNode.html
View File

@ -1,44 +0,0 @@
<!DOCTYPE HTML>
<html>
<meta charset="utf-8">
<head>
<title>Test MediaStreamAudioSourceNode processing is correct</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="webaudio.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
var gTest = {
length: 2048,
skipOfflineContextTests: true,
createGraph: function(context) {
var sourceGraph = new AudioContext();
var source = sourceGraph.createBufferSource();
source.buffer = this.buffer;
var dest = sourceGraph.createMediaStreamDestination();
source.connect(dest);
source.start(0);
var mediaStreamSource = context.createMediaStreamSource(dest.stream);
return mediaStreamSource;
},
createExpectedBuffers: function(context) {
var buffer = context.createBuffer(2, 2048, context.sampleRate);
for (var i = 0; i < 2048; ++i) {
buffer.getChannelData(0)[i] = Math.sin(440 * 2 * Math.PI * i / context.sampleRate);
buffer.getChannelData(1)[i] = buffer.getChannelData(0)[i];
}
this.buffer = buffer;
return buffer;
},
};
runTest();
</script>
</pre>
</body>
</html>

57
content/media/webaudio/test/test_mediaStreamAudioSourceNodeCrossOrigin.html
View File

@ -1,57 +0,0 @@
<!DOCTYPE HTML>
<html>
<meta charset="utf-8">
<head>
<title>Test MediaStreamAudioSourceNode doesn't get data from cross-origin media resources</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
var audio = new Audio("http://example.org:80/tests/content/media/webaudio/test/small-shot.ogg");
var context = new AudioContext();
var node = context.createMediaStreamSource(audio.mozCaptureStreamUntilEnded());
var sp = context.createScriptProcessor(2048, 1);
node.connect(sp);
var nonzeroSampleCount = 0;
var complete = false;
var iterationCount = 0;
// This test ensures we receive at least expectedSampleCount nonzero samples
function processSamples(e) {
if (complete) {
return;
}
if (iterationCount == 0) {
// Don't start playing the audio until the AudioContext stuff is connected
// and running.
audio.play();
}
++iterationCount;
var buf = e.inputBuffer.getChannelData(0);
var nonzeroSamplesThisBuffer = 0;
for (var i = 0; i < buf.length; ++i) {
if (buf[i] != 0) {
++nonzeroSamplesThisBuffer;
}
}
is(nonzeroSamplesThisBuffer, 0,
"Checking all samples are zero");
if (iterationCount >= 20) {
SimpleTest.finish();
complete = true;
}
}
audio.oncanplaythrough = function() {
sp.onaudioprocess = processSamples;
};
</script>
</pre>
</body>
</html>

69
content/media/webaudio/test/test_mediaStreamAudioSourceNodeResampling.html
View File

@ -1,69 +0,0 @@
<!DOCTYPE HTML>
<html>
<meta charset="utf-8">
<head>
<title>Test MediaStreamAudioSourceNode processing is correct</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
var audio = new Audio("small-shot.ogg");
var context = new AudioContext();
var node = context.createMediaStreamSource(audio.mozCaptureStreamUntilEnded());
var sp = context.createScriptProcessor(2048, 1);
node.connect(sp);
var expectedMinNonzeroSampleCount;
var expectedMaxNonzeroSampleCount;
var nonzeroSampleCount = 0;
var complete = false;
var iterationCount = 0;
// This test ensures we receive at least expectedSampleCount nonzero samples
function processSamples(e) {
if (complete) {
return;
}
if (iterationCount == 0) {
// Don't start playing the audio until the AudioContext stuff is connected
// and running.
audio.play();
}
++iterationCount;
var buf = e.inputBuffer.getChannelData(0);
var nonzeroSamplesThisBuffer = 0;
for (var i = 0; i < buf.length; ++i) {
if (buf[i] != 0) {
++nonzeroSamplesThisBuffer;
}
}
nonzeroSampleCount += nonzeroSamplesThisBuffer;
is(e.inputBuffer.numberOfChannels, 1,
"Checking data channel count (nonzeroSamplesThisBuffer=" +
nonzeroSamplesThisBuffer + ")");
ok(nonzeroSampleCount <= expectedMaxNonzeroSampleCount,
"Too many nonzero samples (got " + nonzeroSampleCount + ", expected max " + expectedMaxNonzeroSampleCount + ")");
if (nonzeroSampleCount >= expectedMinNonzeroSampleCount &&
nonzeroSamplesThisBuffer == 0) {
ok(true,
"Check received enough nonzero samples (got " + nonzeroSampleCount + ", expected min " + expectedMinNonzeroSampleCount + ")");
SimpleTest.finish();
complete = true;
}
}
audio.oncanplaythrough = function() {
// Use a fuzz factor of 100 to account for samples that just happen to be zero
expectedMinNonzeroSampleCount = Math.floor(audio.duration*context.sampleRate) - 100;
expectedMaxNonzeroSampleCount = Math.floor(audio.duration*context.sampleRate) + 500;
sp.onaudioprocess = processSamples;
};
</script>
</pre>
</body>
</html>

25
content/media/webaudio/test/webaudio.js
View File

@ -56,7 +56,7 @@ function compareBuffers(buf1, buf2,
is(difference, 0, "Found " + difference + " different samples, maxDifference: " +
maxDifference + ", first bad index: " + firstBadIndex +
" with source offset " + sourceOffset + " and destination offset " +
" with source offset " + sourceOffset + " and desitnation offset " +
destOffset);
}
@ -87,8 +87,6 @@ function getEmptyBuffer(context, length) {
* to be silence. The sum of the length of the expected
* buffers should be equal to gTest.length. This
* function is guaranteed to be called before createGraph.
* + skipOfflineContextTests: optional. when true, skips running tests on an offline
* context by circumventing testOnOfflineContext.
*/
function runTest()
{
@ -97,7 +95,7 @@ function runTest()
}
SimpleTest.waitForExplicitFinish();
function runTestFunction () {
addLoadEvent(function() {
if (!gTest.numberOfChannels) {
gTest.numberOfChannels = 2; // default
}
@ -179,25 +177,14 @@ function runTest()
};
context.startRendering();
}
var context = new OfflineAudioContext(gTest.numberOfChannels, testLength, sampleRate);
runTestOnContext(context, callback, testOutput);
}
testOnNormalContext(function() {
if (!gTest.skipOfflineContextTests) {
testOnOfflineContext(function() {
testOnOfflineContext(done, 44100);
}, 48000);
} else {
done();
}
testOnOfflineContext(function() {
testOnOfflineContext(done, 44100);
}, 48000);
});
};
if (document.readyState !== 'complete') {
addLoadEvent(runTestFunction);
} else {
runTestFunction();
}
});
}

2
dom/webidl/AudioContext.webidl
View File

@ -42,8 +42,6 @@ interface AudioContext : EventTarget {
[Creator]
AnalyserNode createAnalyser();
[Creator, Throws]
MediaStreamAudioSourceNode createMediaStreamSource(MediaStream mediaStream);
[Creator]
GainNode createGain();
[Creator, Throws]

16
dom/webidl/MediaStreamAudioSourceNode.webidl
View File

@ -1,16 +0,0 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/.
*
* The origin of this IDL file is
* https://dvcs.w3.org/hg/audio/raw-file/tip/webaudio/specification.html
*
* Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
* liability, trademark and document use rules apply.
*/
interface MediaStreamAudioSourceNode : AudioNode {
};

1
dom/webidl/WebIDL.mk
View File

@ -181,7 +181,6 @@ webidl_files = \
MediaSource.webidl \
MediaStream.webidl \
MediaStreamAudioDestinationNode.webidl \
MediaStreamAudioSourceNode.webidl \
MediaStreamEvent.webidl \
MediaStreamTrack.webidl \
MessageEvent.webidl \