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

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

Issue 2085353008: Allow disabling of resampling in decodeAudioData Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 5 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
(...skipping 27 matching lines...) Expand all
38 38
39 AsyncAudioDecoder::AsyncAudioDecoder() 39 AsyncAudioDecoder::AsyncAudioDecoder()
40 : m_thread(wrapUnique(Platform::current()->createThread("Audio Decoder"))) 40 : m_thread(wrapUnique(Platform::current()->createThread("Audio Decoder")))
41 { 41 {
42 } 42 }
43 43
44 AsyncAudioDecoder::~AsyncAudioDecoder() 44 AsyncAudioDecoder::~AsyncAudioDecoder()
45 { 45 {
46 } 46 }
47 47
48 void AsyncAudioDecoder::decodeAsync(DOMArrayBuffer* audioData, float sampleRate, AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback, Scrip tPromiseResolver* resolver, BaseAudioContext* context) 48 void AsyncAudioDecoder::decodeAsync(DOMArrayBuffer* audioData, float sampleRate, bool disableResampling, AudioBufferCallback* successCallback, AudioBufferCallba ck* errorCallback, ScriptPromiseResolver* resolver, BaseAudioContext* context)
49 { 49 {
50 ASSERT(isMainThread()); 50 ASSERT(isMainThread());
51 ASSERT(audioData); 51 ASSERT(audioData);
52 if (!audioData) 52 if (!audioData)
53 return; 53 return;
54 54
55 m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, crossThreadBind(&Asy ncAudioDecoder::decode, wrapCrossThreadPersistent(audioData), sampleRate, wrapCr ossThreadPersistent(successCallback), wrapCrossThreadPersistent(errorCallback), wrapCrossThreadPersistent(resolver), wrapCrossThreadPersistent(context))); 55 m_thread->getWebTaskRunner()->postTask(
56 BLINK_FROM_HERE,
57 crossThreadBind(
58 &AsyncAudioDecoder::decode,
59 wrapCrossThreadPersistent(audioData),
60 sampleRate,
61 disableResampling,
62 wrapCrossThreadPersistent(successCallback),
63 wrapCrossThreadPersistent(errorCallback),
64 wrapCrossThreadPersistent(resolver), wrapCrossThreadPersistent(conte xt)));
56 } 65 }
57 66
58 void AsyncAudioDecoder::decode(DOMArrayBuffer* audioData, float sampleRate, Audi oBufferCallback* successCallback, AudioBufferCallback* errorCallback, ScriptProm iseResolver* resolver, BaseAudioContext* context) 67 void AsyncAudioDecoder::decode(DOMArrayBuffer* audioData, float sampleRate, bool disableResampling, AudioBufferCallback* successCallback, AudioBufferCallback* e rrorCallback, ScriptPromiseResolver* resolver, BaseAudioContext* context)
59 { 68 {
60 RefPtr<AudioBus> bus = createBusFromInMemoryAudioFile(audioData->data(), aud ioData->byteLength(), false, sampleRate); 69 RefPtr<AudioBus> bus = createBusFromInMemoryAudioFile(audioData->data(), aud ioData->byteLength(), false, disableResampling ? 0 : sampleRate);
61 70
62 // Decoding is finished, but we need to do the callbacks on the main thread. 71 // Decoding is finished, but we need to do the callbacks on the main thread.
63 // A reference to |*bus| is retained by WTF::Function and will be removed af ter notifyComplete() is done. 72 // A reference to |*bus| is retained by WTF::Function and will be removed af ter notifyComplete() is done.
64 Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_H ERE, crossThreadBind(&AsyncAudioDecoder::notifyComplete, wrapCrossThreadPersiste nt(audioData), wrapCrossThreadPersistent(successCallback), wrapCrossThreadPersis tent(errorCallback), bus.release(), wrapCrossThreadPersistent(resolver), wrapCro ssThreadPersistent(context))); 73 Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_H ERE, crossThreadBind(&AsyncAudioDecoder::notifyComplete, wrapCrossThreadPersiste nt(audioData), wrapCrossThreadPersistent(successCallback), wrapCrossThreadPersis tent(errorCallback), bus.release(), wrapCrossThreadPersistent(resolver), wrapCro ssThreadPersistent(context)));
65 } 74 }
66 75
67 void AsyncAudioDecoder::notifyComplete(DOMArrayBuffer*, AudioBufferCallback* suc cessCallback, AudioBufferCallback* errorCallback, AudioBus* audioBus, ScriptProm iseResolver* resolver, BaseAudioContext* context) 76 void AsyncAudioDecoder::notifyComplete(DOMArrayBuffer*, AudioBufferCallback* suc cessCallback, AudioBufferCallback* errorCallback, AudioBus* audioBus, ScriptProm iseResolver* resolver, BaseAudioContext* context)
68 { 77 {
69 ASSERT(isMainThread()); 78 ASSERT(isMainThread());
70 79
71 AudioBuffer* audioBuffer = AudioBuffer::createFromAudioBus(audioBus); 80 AudioBuffer* audioBuffer = AudioBuffer::createFromAudioBus(audioBus);
72 81
73 // Let the context finish the notification. 82 // Let the context finish the notification.
74 context->handleDecodeAudioData(audioBuffer, resolver, successCallback, error Callback); 83 context->handleDecodeAudioData(audioBuffer, resolver, successCallback, error Callback);
75 } 84 }
76 85
77 } // namespace blink 86 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698