Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.cpp

Issue 2738823004: Replace createCrossThreadTask with crossThreadBind in webaudio (Closed)
Patch Set: RefPtr -> wrapPassRefPtr Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, Google Inc. All rights reserved. 2 * Copyright (C) 2011, 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
14 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
16 * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE 16 * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE
17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
23 * DAMAGE. 23 * DAMAGE.
24 */ 24 */
25 25
26 #include "modules/webaudio/OfflineAudioDestinationNode.h" 26 #include "modules/webaudio/OfflineAudioDestinationNode.h"
27 27
28 #include "core/dom/ExecutionContextTask.h" 28 #include <algorithm>
29 #include "core/dom/TaskRunnerHelper.h" 29 #include "core/dom/TaskRunnerHelper.h"
30 #include "modules/webaudio/AudioNodeInput.h" 30 #include "modules/webaudio/AudioNodeInput.h"
31 #include "modules/webaudio/AudioNodeOutput.h" 31 #include "modules/webaudio/AudioNodeOutput.h"
32 #include "modules/webaudio/BaseAudioContext.h" 32 #include "modules/webaudio/BaseAudioContext.h"
33 #include "modules/webaudio/OfflineAudioContext.h" 33 #include "modules/webaudio/OfflineAudioContext.h"
34 #include "platform/CrossThreadFunctional.h"
34 #include "platform/audio/AudioBus.h" 35 #include "platform/audio/AudioBus.h"
35 #include "platform/audio/AudioUtilities.h" 36 #include "platform/audio/AudioUtilities.h"
36 #include "platform/audio/DenormalDisabler.h" 37 #include "platform/audio/DenormalDisabler.h"
37 #include "platform/audio/HRTFDatabaseLoader.h" 38 #include "platform/audio/HRTFDatabaseLoader.h"
38 #include "public/platform/Platform.h" 39 #include "public/platform/Platform.h"
39 #include "wtf/PtrUtil.h" 40 #include "wtf/PtrUtil.h"
40 #include <algorithm>
41 41
42 namespace blink { 42 namespace blink {
43 43
44 OfflineAudioDestinationHandler::OfflineAudioDestinationHandler( 44 OfflineAudioDestinationHandler::OfflineAudioDestinationHandler(
45 AudioNode& node, 45 AudioNode& node,
46 AudioBuffer* renderTarget) 46 AudioBuffer* renderTarget)
47 : AudioDestinationHandler(node), 47 : AudioDestinationHandler(node),
48 m_renderTarget(renderTarget), 48 m_renderTarget(renderTarget),
49 m_renderThread(WTF::wrapUnique( 49 m_renderThread(WTF::wrapUnique(
50 Platform::current()->createThread("offline audio renderer"))), 50 Platform::current()->createThread("offline audio renderer"))),
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 // Finish up the rendering loop if there is no more to process. 214 // Finish up the rendering loop if there is no more to process.
215 if (!m_framesToProcess) 215 if (!m_framesToProcess)
216 finishOfflineRendering(); 216 finishOfflineRendering();
217 } 217 }
218 218
219 void OfflineAudioDestinationHandler::suspendOfflineRendering() { 219 void OfflineAudioDestinationHandler::suspendOfflineRendering() {
220 DCHECK(!isMainThread()); 220 DCHECK(!isMainThread());
221 221
222 // The actual rendering has been suspended. Notify the context. 222 // The actual rendering has been suspended. Notify the context.
223 if (context()->getExecutionContext()) { 223 if (context()->getExecutionContext()) {
224 context()->getExecutionContext()->postTask( 224 TaskRunnerHelper::get(TaskType::MediaElementEvent,
225 TaskType::MediaElementEvent, BLINK_FROM_HERE, 225 context()->getExecutionContext())
226 createCrossThreadTask(&OfflineAudioDestinationHandler::notifySuspend, 226 ->postTask(BLINK_FROM_HERE,
227 PassRefPtr<OfflineAudioDestinationHandler>(this), 227 crossThreadBind(
228 context()->currentSampleFrame())); 228 &OfflineAudioDestinationHandler::notifySuspend,
229 wrapPassRefPtr(this), context()->currentSampleFrame()));
229 } 230 }
230 } 231 }
231 232
232 void OfflineAudioDestinationHandler::finishOfflineRendering() { 233 void OfflineAudioDestinationHandler::finishOfflineRendering() {
233 DCHECK(!isMainThread()); 234 DCHECK(!isMainThread());
234 235
235 // The actual rendering has been completed. Notify the context. 236 // The actual rendering has been completed. Notify the context.
236 if (context()->getExecutionContext()) { 237 if (context()->getExecutionContext()) {
237 context()->getExecutionContext()->postTask( 238 TaskRunnerHelper::get(TaskType::MediaElementEvent,
238 TaskType::MediaElementEvent, BLINK_FROM_HERE, 239 context()->getExecutionContext())
239 createCrossThreadTask(&OfflineAudioDestinationHandler::notifyComplete, 240 ->postTask(
240 wrapPassRefPtr(this))); 241 BLINK_FROM_HERE,
242 crossThreadBind(&OfflineAudioDestinationHandler::notifyComplete,
243 wrapPassRefPtr(this)));
241 } 244 }
242 } 245 }
243 246
244 void OfflineAudioDestinationHandler::notifySuspend(size_t frame) { 247 void OfflineAudioDestinationHandler::notifySuspend(size_t frame) {
245 DCHECK(isMainThread()); 248 DCHECK(isMainThread());
246 249
247 if (context()) 250 if (context())
248 context()->resolveSuspendOnMainThread(frame); 251 context()->resolveSuspendOnMainThread(frame);
249 } 252 }
250 253
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 setHandler(OfflineAudioDestinationHandler::create(*this, renderTarget)); 339 setHandler(OfflineAudioDestinationHandler::create(*this, renderTarget));
337 } 340 }
338 341
339 OfflineAudioDestinationNode* OfflineAudioDestinationNode::create( 342 OfflineAudioDestinationNode* OfflineAudioDestinationNode::create(
340 BaseAudioContext* context, 343 BaseAudioContext* context,
341 AudioBuffer* renderTarget) { 344 AudioBuffer* renderTarget) {
342 return new OfflineAudioDestinationNode(*context, renderTarget); 345 return new OfflineAudioDestinationNode(*context, renderTarget);
343 } 346 }
344 347
345 } // namespace blink 348 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698