Bug 1324352 - Implement BaseAudioContext, r=padenot

Brli · Dec 20, 2016 · 59d9a61 · 59d9a61
1 parent f6912dd
commit 59d9a61
Show file tree

Hide file tree

Showing 32 changed files with 311 additions and 311 deletions.
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
@@ -103,6 +103,10 @@ DOMInterfaces = {
     'headerFile': 'mozilla/dom/BarProps.h',
 },
 
+'BaseAudioContext': {
+    'nativeType': 'mozilla::dom::AudioContext',
+},
+
 'Blob': {
     'headerFile': 'mozilla/dom/File.h',
 },

diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
@@ -24,7 +24,7 @@
 #include "AudioNodeExternalInputStream.h"
 #include "MediaStreamListener.h"
 #include "MediaStreamVideoSink.h"
-#include "mozilla/dom/AudioContextBinding.h"
+#include "mozilla/dom/BaseAudioContextBinding.h"
 #include "mozilla/media/MediaUtils.h"
 #include <algorithm>
 #include "GeckoProfiler.h"

diff --git a/dom/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp
@@ -15,6 +15,7 @@
 #include "mozilla/dom/AnalyserNodeBinding.h"
 #include "mozilla/dom/AudioBufferSourceNodeBinding.h"
 #include "mozilla/dom/AudioContextBinding.h"
+#include "mozilla/dom/BaseAudioContextBinding.h"
 #include "mozilla/dom/BiquadFilterNodeBinding.h"
 #include "mozilla/dom/ChannelMergerNodeBinding.h"
 #include "mozilla/dom/ChannelSplitterNodeBinding.h"
@@ -29,6 +30,7 @@
 #include "mozilla/dom/OfflineAudioContextBinding.h"
 #include "mozilla/dom/OscillatorNodeBinding.h"
 #include "mozilla/dom/PannerNodeBinding.h"
+#include "mozilla/dom/PeriodicWaveBinding.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/StereoPannerNodeBinding.h"
 #include "mozilla/dom/WaveShaperNodeBinding.h"

diff --git a/dom/media/webaudio/MediaBufferDecoder.cpp b/dom/media/webaudio/MediaBufferDecoder.cpp
@@ -7,6 +7,7 @@
 #include "MediaBufferDecoder.h"
 #include "BufferDecoder.h"
 #include "mozilla/dom/AudioContextBinding.h"
+#include "mozilla/dom/BaseAudioContextBinding.h"
 #include "mozilla/dom/DOMException.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include <speex/speex_resampler.h>

diff --git a/dom/media/webaudio/test/test_OfflineAudioContext.html b/dom/media/webaudio/test/test_OfflineAudioContext.html
@@ -42,10 +42,6 @@
     }
   }
 
-  expectException(function() {
-    ctx.createMediaStreamDestination();
-  }, DOMException.NOT_SUPPORTED_ERR);
-
   expectException(function() {
     new OfflineAudioContext(2, 100, 0);
   }, DOMException.NOT_SUPPORTED_ERR);

diff --git a/dom/media/webaudio/test/test_audioContextSuspendResumeClose.html b/dom/media/webaudio/test/test_audioContextSuspendResumeClose.html
@@ -326,9 +326,7 @@
   var o = new OfflineAudioContext(1, 44100, 44100);
   is(o.state, "suspended", "OfflineAudioContext should start in suspended state.");
 
-  expectRejectedPromise(o, "suspend", "NotSupportedError");
   expectRejectedPromise(o, "resume", "NotSupportedError");
-  expectRejectedPromise(o, "close", "NotSupportedError");
 
   var previousState = o.state,
       finishedRendering = false;

diff --git a/dom/webidl/AnalyserNode.webidl b/dom/webidl/AnalyserNode.webidl
@@ -18,7 +18,7 @@ dictionary AnalyserOptions : AudioNodeOptions {
 };
 
 [Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional AnalyserOptions options)]
+ Constructor(BaseAudioContext context, optional AnalyserOptions options)]
 interface AnalyserNode : AudioNode {
 
     // Real-time frequency-domain data

diff --git a/dom/webidl/AudioBuffer.webidl b/dom/webidl/AudioBuffer.webidl
@@ -17,7 +17,7 @@ dictionary AudioBufferOptions {
 };
 
 [Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, AudioBufferOptions options)]
+ Constructor(BaseAudioContext context, AudioBufferOptions options)]
 interface AudioBuffer {
 
     readonly attribute float sampleRate;

diff --git a/dom/webidl/AudioBufferSourceNode.webidl b/dom/webidl/AudioBufferSourceNode.webidl
@@ -20,7 +20,7 @@ dictionary AudioBufferSourceOptions {
 };
 
 [Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional AudioBufferSourceOptions options)]
+ Constructor(BaseAudioContext context, optional AudioBufferSourceOptions options)]
 interface AudioBufferSourceNode : AudioNode {
 
     attribute AudioBuffer? buffer;

diff --git a/dom/webidl/AudioContext.webidl b/dom/webidl/AudioContext.webidl
@@ -10,96 +10,29 @@
  * liability, trademark and document use rules apply.
  */
 
-callback DecodeSuccessCallback = void (AudioBuffer decodedData);
-callback DecodeErrorCallback = void (DOMException error);
-
-enum AudioContextState {
-    "suspended",
-    "running",
-    "closed"
-};
-
-dictionary PeriodicWaveConstraints {
-  boolean disableNormalization = false;
-};
-
 [Constructor,
  Constructor(AudioChannel audioChannelType),
  Pref="dom.webaudio.enabled"]
-interface AudioContext : EventTarget {
+interface AudioContext : BaseAudioContext {
+
+    // Bug 1324545: readonly        attribute double outputLatency;
+    // Bug 1324545: AudioTimestamp                  getOutputTimestamp ();
 
-    readonly attribute AudioDestinationNode destination;
-    readonly attribute float sampleRate;
-    readonly attribute double currentTime;
-    readonly attribute AudioListener listener;
-    readonly attribute AudioContextState state;
     [Throws]
     Promise<void> suspend();
     [Throws]
-    Promise<void> resume();
-    [Throws]
     Promise<void> close();
-    attribute EventHandler onstatechange;
 
-    [NewObject, Throws]
-    AudioBuffer createBuffer(unsigned long numberOfChannels, unsigned long length, float sampleRate);
-
-    [Throws]
-    Promise<AudioBuffer> decodeAudioData(ArrayBuffer audioData,
-                                         optional DecodeSuccessCallback successCallback,
-                                         optional DecodeErrorCallback errorCallback);
-
-    // AudioNode creation
-    [NewObject, Throws]
-    AudioBufferSourceNode createBufferSource();
-
-    [NewObject, Throws]
-    ConstantSourceNode createConstantSource();
-
-    [NewObject, Throws]
-    MediaStreamAudioDestinationNode createMediaStreamDestination();
-
-    [NewObject, Throws]
-    ScriptProcessorNode createScriptProcessor(optional unsigned long bufferSize = 0,
-                                              optional unsigned long numberOfInputChannels = 2,
-                                              optional unsigned long numberOfOutputChannels = 2);
-
-    [NewObject, Throws]
-    StereoPannerNode createStereoPanner();
-    [NewObject, Throws]
-    AnalyserNode createAnalyser();
     [NewObject, Throws, UnsafeInPrerendering]
     MediaElementAudioSourceNode createMediaElementSource(HTMLMediaElement mediaElement);
+
     [NewObject, Throws, UnsafeInPrerendering]
     MediaStreamAudioSourceNode createMediaStreamSource(MediaStream mediaStream);
-    [NewObject, Throws]
-    GainNode createGain();
-    [NewObject, Throws]
-    DelayNode createDelay(optional double maxDelayTime = 1);
-    [NewObject, Throws]
-    BiquadFilterNode createBiquadFilter();
-    [NewObject, Throws]
-    IIRFilterNode createIIRFilter(sequence<double> feedforward, sequence<double> feedback);
-    [NewObject, Throws]
-    WaveShaperNode createWaveShaper();
-    [NewObject, Throws]
-    PannerNode createPanner();
-    [NewObject, Throws]
-    ConvolverNode createConvolver();
 
-    [NewObject, Throws]
-    ChannelSplitterNode createChannelSplitter(optional unsigned long numberOfOutputs = 6);
-    [NewObject, Throws]
-    ChannelMergerNode createChannelMerger(optional unsigned long numberOfInputs = 6);
+    // Bug 1324548: MediaStreamTrackAudioSourceNode createMediaStreamTrackSource (AudioMediaStreamTrack mediaStreamTrack);
 
     [NewObject, Throws]
-    DynamicsCompressorNode createDynamicsCompressor();
-
-    [NewObject, Throws]
-    OscillatorNode createOscillator();
-    [NewObject, Throws]
-    PeriodicWave createPeriodicWave(Float32Array real, Float32Array imag, optional PeriodicWaveConstraints constraints);
-
+    MediaStreamAudioDestinationNode createMediaStreamDestination();
 };
 
 // Mozilla extensions

diff --git a/dom/webidl/AudioNode.webidl b/dom/webidl/AudioNode.webidl
@@ -49,7 +49,7 @@ interface AudioNode : EventTarget {
     [Throws]
     void disconnect(AudioParam destination, unsigned long output);
 
-    readonly attribute AudioContext context;
+    readonly attribute BaseAudioContext context;
     readonly attribute unsigned long numberOfInputs;
     readonly attribute unsigned long numberOfOutputs;
 

diff --git a/dom/webidl/BaseAudioContext.webidl b/dom/webidl/BaseAudioContext.webidl
@@ -0,0 +1,100 @@
+/* -*- 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://webaudio.github.io/web-audio-api/#idl-def-BaseAudioContext
+ *
+ * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
+ * liability, trademark and document use rules apply.
+ */
+
+callback DecodeSuccessCallback = void (AudioBuffer decodedData);
+callback DecodeErrorCallback = void (DOMException error);
+
+enum AudioContextState {
+    "suspended",
+    "running",
+    "closed"
+};
+
+interface BaseAudioContext : EventTarget {
+    readonly        attribute AudioDestinationNode destination;
+    readonly        attribute float                sampleRate;
+    readonly        attribute double               currentTime;
+    readonly        attribute AudioListener        listener;
+    readonly        attribute AudioContextState    state;
+    // Bug 1324552: readonly        attribute double               baseLatency;
+
+    [Throws]
+    Promise<void> resume();
+
+                    attribute EventHandler         onstatechange;
+
+    [NewObject, Throws]
+    AudioBuffer            createBuffer (unsigned long numberOfChannels,
+                                         unsigned long length,
+                                         float sampleRate);
+
+    [Throws]
+    Promise<AudioBuffer> decodeAudioData(ArrayBuffer audioData,
+                                         optional DecodeSuccessCallback successCallback,
+                                         optional DecodeErrorCallback errorCallback);
+
+    // AudioNode creation
+    [NewObject, Throws]
+    AudioBufferSourceNode createBufferSource();
+
+    [NewObject, Throws]
+    ConstantSourceNode createConstantSource();
+
+    [NewObject, Throws]
+    ScriptProcessorNode createScriptProcessor(optional unsigned long bufferSize = 0,
+                                              optional unsigned long numberOfInputChannels = 2,
+                                              optional unsigned long numberOfOutputChannels = 2);
+
+    [NewObject, Throws]
+    AnalyserNode createAnalyser();
+
+    [NewObject, Throws]
+    GainNode createGain();
+
+    [NewObject, Throws]
+    DelayNode createDelay(optional double maxDelayTime = 1);
+
+    [NewObject, Throws]
+    BiquadFilterNode createBiquadFilter();
+
+    [NewObject, Throws]
+    IIRFilterNode createIIRFilter(sequence<double> feedforward, sequence<double> feedback);
+
+    [NewObject, Throws]
+    WaveShaperNode createWaveShaper();
+
+    [NewObject, Throws]
+    PannerNode createPanner();
+
+    [NewObject, Throws]
+    StereoPannerNode createStereoPanner();
+
+    [NewObject, Throws]
+    ConvolverNode createConvolver();
+
+    [NewObject, Throws]
+    ChannelSplitterNode createChannelSplitter(optional unsigned long numberOfOutputs = 6);
+
+    [NewObject, Throws]
+    ChannelMergerNode createChannelMerger(optional unsigned long numberOfInputs = 6);
+
+    [NewObject, Throws]
+    DynamicsCompressorNode createDynamicsCompressor();
+
+    [NewObject, Throws]
+    OscillatorNode createOscillator();
+
+    [NewObject, Throws]
+    PeriodicWave createPeriodicWave(Float32Array real,
+                                    Float32Array imag,
+                                    optional PeriodicWaveConstraints constraints);
+};
diff --git a/dom/webidl/BiquadFilterNode.webidl b/dom/webidl/BiquadFilterNode.webidl
@@ -30,7 +30,7 @@ dictionary BiquadFilterOptions : AudioNodeOptions {
 };
 
 [Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional BiquadFilterOptions options)]
+ Constructor(BaseAudioContext context, optional BiquadFilterOptions options)]
 interface BiquadFilterNode : AudioNode {
 
     attribute BiquadFilterType type;

diff --git a/dom/webidl/ChannelMergerNode.webidl b/dom/webidl/ChannelMergerNode.webidl
@@ -15,6 +15,6 @@ dictionary ChannelMergerOptions : AudioNodeOptions {
 };
 
 [Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional ChannelMergerOptions options)]
+ Constructor(BaseAudioContext context, optional ChannelMergerOptions options)]
 interface ChannelMergerNode : AudioNode {
 };
diff --git a/dom/webidl/ChannelSplitterNode.webidl b/dom/webidl/ChannelSplitterNode.webidl
@@ -15,7 +15,7 @@ dictionary ChannelSplitterOptions : AudioNodeOptions {
 };
 
 [Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional ChannelSplitterOptions options)]
+ Constructor(BaseAudioContext context, optional ChannelSplitterOptions options)]
 interface ChannelSplitterNode : AudioNode {
 
 };

diff --git a/dom/webidl/ConstantSourceNode.webidl b/dom/webidl/ConstantSourceNode.webidl
@@ -15,7 +15,7 @@ dictionary ConstantSourceOptions {
 };
 
 [Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional ConstantSourceOptions options)]
+ Constructor(BaseAudioContext context, optional ConstantSourceOptions options)]
 interface ConstantSourceNode : AudioNode {
     readonly        attribute AudioParam   offset;
                     attribute EventHandler onended;

diff --git a/dom/webidl/ConvolverNode.webidl b/dom/webidl/ConvolverNode.webidl
@@ -16,7 +16,7 @@ dictionary ConvolverOptions : AudioNodeOptions {
 };
 
 [Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional ConvolverOptions options)]
+ Constructor(BaseAudioContext context, optional ConvolverOptions options)]
 interface ConvolverNode : AudioNode {
 
       [SetterThrows]

diff --git a/dom/webidl/DelayNode.webidl b/dom/webidl/DelayNode.webidl
@@ -16,7 +16,7 @@ dictionary DelayOptions : AudioNodeOptions {
 };
 
 [Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional DelayOptions options)]
+ Constructor(BaseAudioContext context, optional DelayOptions options)]
 interface DelayNode : AudioNode {
 
     readonly attribute AudioParam delayTime;

diff --git a/dom/webidl/DynamicsCompressorNode.webidl b/dom/webidl/DynamicsCompressorNode.webidl
@@ -19,7 +19,7 @@ dictionary DynamicsCompressorOptions : AudioNodeOptions {
 };
 
 [Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional DynamicsCompressorOptions options)]
+ Constructor(BaseAudioContext context, optional DynamicsCompressorOptions options)]
 interface DynamicsCompressorNode : AudioNode {
 
     readonly attribute AudioParam threshold; // in Decibels

diff --git a/dom/webidl/GainNode.webidl b/dom/webidl/GainNode.webidl
@@ -15,7 +15,7 @@ dictionary GainOptions : AudioNodeOptions {
 };
 
 [Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional GainOptions options)]
+ Constructor(BaseAudioContext context, optional GainOptions options)]
 interface GainNode : AudioNode {
 
     readonly attribute AudioParam gain;

diff --git a/dom/webidl/IIRFilterNode.webidl b/dom/webidl/IIRFilterNode.webidl
@@ -15,7 +15,7 @@ dictionary IIRFilterOptions : AudioNodeOptions {
 };
 
 [Pref="dom.webaudio.enabled",
-Constructor(AudioContext context, IIRFilterOptions options)]
+Constructor(BaseAudioContext context, IIRFilterOptions options)]
 interface IIRFilterNode : AudioNode {
     void getFrequencyResponse(Float32Array frequencyHz, Float32Array magResponse, Float32Array phaseResponse);
 };