OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2010, Google Inc. All rights reserved. | 2 * Copyright (C) 2010, Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
45 #include "modules/webaudio/AudioBufferSourceNode.h" | 45 #include "modules/webaudio/AudioBufferSourceNode.h" |
46 #include "modules/webaudio/AudioContext.h" | 46 #include "modules/webaudio/AudioContext.h" |
47 #include "modules/webaudio/AudioListener.h" | 47 #include "modules/webaudio/AudioListener.h" |
48 #include "modules/webaudio/AudioNodeInput.h" | 48 #include "modules/webaudio/AudioNodeInput.h" |
49 #include "modules/webaudio/AudioNodeOutput.h" | 49 #include "modules/webaudio/AudioNodeOutput.h" |
50 #include "modules/webaudio/BiquadFilterNode.h" | 50 #include "modules/webaudio/BiquadFilterNode.h" |
51 #include "modules/webaudio/ChannelMergerNode.h" | 51 #include "modules/webaudio/ChannelMergerNode.h" |
52 #include "modules/webaudio/ChannelSplitterNode.h" | 52 #include "modules/webaudio/ChannelSplitterNode.h" |
53 #include "modules/webaudio/ConstantSourceNode.h" | 53 #include "modules/webaudio/ConstantSourceNode.h" |
54 #include "modules/webaudio/ConvolverNode.h" | 54 #include "modules/webaudio/ConvolverNode.h" |
55 #include "modules/webaudio/DefaultAudioDestinationNode.h" | |
56 #include "modules/webaudio/DelayNode.h" | 55 #include "modules/webaudio/DelayNode.h" |
57 #include "modules/webaudio/DynamicsCompressorNode.h" | 56 #include "modules/webaudio/DynamicsCompressorNode.h" |
58 #include "modules/webaudio/GainNode.h" | 57 #include "modules/webaudio/GainNode.h" |
59 #include "modules/webaudio/IIRFilterNode.h" | 58 #include "modules/webaudio/IIRFilterNode.h" |
60 #include "modules/webaudio/MediaElementAudioSourceNode.h" | 59 #include "modules/webaudio/MediaElementAudioSourceNode.h" |
61 #include "modules/webaudio/MediaStreamAudioDestinationNode.h" | 60 #include "modules/webaudio/MediaStreamAudioDestinationNode.h" |
62 #include "modules/webaudio/MediaStreamAudioSourceNode.h" | 61 #include "modules/webaudio/MediaStreamAudioSourceNode.h" |
63 #include "modules/webaudio/OfflineAudioCompletionEvent.h" | 62 #include "modules/webaudio/OfflineAudioCompletionEvent.h" |
64 #include "modules/webaudio/OfflineAudioContext.h" | 63 #include "modules/webaudio/OfflineAudioContext.h" |
65 #include "modules/webaudio/OfflineAudioDestinationNode.h" | 64 #include "modules/webaudio/OfflineAudioDestinationNode.h" |
66 #include "modules/webaudio/OscillatorNode.h" | 65 #include "modules/webaudio/OscillatorNode.h" |
67 #include "modules/webaudio/PannerNode.h" | 66 #include "modules/webaudio/PannerNode.h" |
68 #include "modules/webaudio/PeriodicWave.h" | 67 #include "modules/webaudio/PeriodicWave.h" |
69 #include "modules/webaudio/PeriodicWaveConstraints.h" | 68 #include "modules/webaudio/PeriodicWaveConstraints.h" |
70 #include "modules/webaudio/ScriptProcessorNode.h" | 69 #include "modules/webaudio/ScriptProcessorNode.h" |
71 #include "modules/webaudio/StereoPannerNode.h" | 70 #include "modules/webaudio/StereoPannerNode.h" |
72 #include "modules/webaudio/WaveShaperNode.h" | 71 #include "modules/webaudio/WaveShaperNode.h" |
73 #include "platform/CrossThreadFunctional.h" | 72 #include "platform/CrossThreadFunctional.h" |
74 #include "platform/Histogram.h" | 73 #include "platform/Histogram.h" |
75 #include "platform/UserGestureIndicator.h" | 74 #include "platform/UserGestureIndicator.h" |
76 #include "platform/audio/IIRFilter.h" | 75 #include "platform/audio/IIRFilter.h" |
77 #include "public/platform/Platform.h" | 76 #include "public/platform/Platform.h" |
78 #include "wtf/text/WTFString.h" | 77 #include "wtf/text/WTFString.h" |
79 | 78 |
80 namespace blink { | 79 namespace blink { |
81 | 80 |
82 BaseAudioContext* BaseAudioContext::create(Document& document, | 81 BaseAudioContext* BaseAudioContext::create( |
83 ExceptionState& exceptionState) { | 82 Document& document, |
84 return AudioContext::create(document, exceptionState); | 83 const AudioContextOptions& contextOptions, |
84 ExceptionState& exceptionState) { | |
85 return AudioContext::create(document, contextOptions, exceptionState); | |
85 } | 86 } |
86 | 87 |
87 // FIXME(dominicc): Devolve these constructors to AudioContext | 88 // FIXME(dominicc): Devolve these constructors to AudioContext |
88 // and OfflineAudioContext respectively. | 89 // and OfflineAudioContext respectively. |
89 | 90 |
90 // Constructor for rendering to the audio hardware. | 91 // Constructor for rendering to the audio hardware. |
91 BaseAudioContext::BaseAudioContext(Document* document) | 92 BaseAudioContext::BaseAudioContext(Document* document) |
92 : ActiveScriptWrappable(this), | 93 : ActiveScriptWrappable(this), |
93 ActiveDOMObject(document), | 94 ActiveDOMObject(document), |
94 m_destinationNode(nullptr), | 95 m_destinationNode(nullptr), |
95 m_isCleared(false), | 96 m_isCleared(false), |
96 m_isResolvingResumePromises(false), | 97 m_isResolvingResumePromises(false), |
97 m_userGestureRequired(false), | 98 m_userGestureRequired(false), |
98 m_connectionCount(0), | 99 m_connectionCount(0), |
99 m_deferredTaskHandler(DeferredTaskHandler::create()), | 100 m_deferredTaskHandler(DeferredTaskHandler::create()), |
100 m_contextState(Suspended), | 101 m_contextState(Suspended), |
101 m_closedContextSampleRate(-1), | 102 m_closedContextSampleRate(-1), |
102 m_periodicWaveSine(nullptr), | 103 m_periodicWaveSine(nullptr), |
103 m_periodicWaveSquare(nullptr), | 104 m_periodicWaveSquare(nullptr), |
104 m_periodicWaveSawtooth(nullptr), | 105 m_periodicWaveSawtooth(nullptr), |
105 m_periodicWaveTriangle(nullptr) { | 106 m_periodicWaveTriangle(nullptr) { |
106 // If mediaPlaybackRequiresUserGesture is enabled, cross origin iframes will | 107 // If mediaPlaybackRequiresUserGesture is enabled, cross origin iframes will |
107 // require user gesture for the AudioContext to produce sound. | 108 // require user gesture for the AudioContext to produce sound. |
108 if (document->settings() && | 109 if (document->settings() && |
109 document->settings()->mediaPlaybackRequiresUserGesture() && | 110 document->settings()->mediaPlaybackRequiresUserGesture() && |
110 document->frame() && document->frame()->isCrossOriginSubframe()) { | 111 document->frame() && document->frame()->isCrossOriginSubframe()) { |
111 m_autoplayStatus = AutoplayStatus::AutoplayStatusFailed; | 112 m_autoplayStatus = AutoplayStatus::AutoplayStatusFailed; |
112 m_userGestureRequired = true; | 113 m_userGestureRequired = true; |
113 } | 114 } |
114 | |
115 m_destinationNode = DefaultAudioDestinationNode::create(this); | |
116 | |
117 initialize(); | |
Raymond Toy
2016/12/08 17:14:38
Ah, nice catch. You removed this because OfflineA
Andrew MacPherson
2016/12/09 12:34:14
The OfflineAudioContext actually uses a different
Raymond Toy
2016/12/13 15:53:11
Thanks for the explanation. This makes the code m
| |
118 } | 115 } |
119 | 116 |
120 // Constructor for offline (non-realtime) rendering. | 117 // Constructor for offline (non-realtime) rendering. |
121 BaseAudioContext::BaseAudioContext(Document* document, | 118 BaseAudioContext::BaseAudioContext(Document* document, |
122 unsigned numberOfChannels, | 119 unsigned numberOfChannels, |
123 size_t numberOfFrames, | 120 size_t numberOfFrames, |
124 float sampleRate) | 121 float sampleRate) |
125 : ActiveScriptWrappable(this), | 122 : ActiveScriptWrappable(this), |
126 ActiveDOMObject(document), | 123 ActiveDOMObject(document), |
127 m_destinationNode(nullptr), | 124 m_destinationNode(nullptr), |
(...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
881 } | 878 } |
882 | 879 |
883 SecurityOrigin* BaseAudioContext::getSecurityOrigin() const { | 880 SecurityOrigin* BaseAudioContext::getSecurityOrigin() const { |
884 if (getExecutionContext()) | 881 if (getExecutionContext()) |
885 return getExecutionContext()->getSecurityOrigin(); | 882 return getExecutionContext()->getSecurityOrigin(); |
886 | 883 |
887 return nullptr; | 884 return nullptr; |
888 } | 885 } |
889 | 886 |
890 } // namespace blink | 887 } // namespace blink |
OLD | NEW |