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

Side by Side Diff: Source/modules/webaudio/AsyncAudioDecoder.h

Issue 1006963003: AudioContext.decodeAudioData returns a Promise (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Error callback invoked with error, not null. Created 5 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 | Annotate | Revision Log
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 16 matching lines...) Expand all
27 27
28 #include "platform/heap/Handle.h" 28 #include "platform/heap/Handle.h"
29 #include "public/platform/WebThread.h" 29 #include "public/platform/WebThread.h"
30 #include "wtf/OwnPtr.h" 30 #include "wtf/OwnPtr.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 class AudioBuffer; 34 class AudioBuffer;
35 class AudioBufferCallback; 35 class AudioBufferCallback;
36 class AudioBus; 36 class AudioBus;
37 class AudioContext;
37 class DOMArrayBuffer; 38 class DOMArrayBuffer;
39 class ScriptPromiseResolver;
38 40
39 // AsyncAudioDecoder asynchronously decodes audio file data from a DOMArrayBuffe r in a worker thread. 41 // AsyncAudioDecoder asynchronously decodes audio file data from a DOMArrayBuffe r in a worker thread.
40 // Upon successful decoding, a completion callback will be invoked with the deco ded PCM data in an AudioBuffer. 42 // Upon successful decoding, a completion callback will be invoked with the deco ded PCM data in an AudioBuffer.
41 43
42 class AsyncAudioDecoder { 44 class AsyncAudioDecoder {
43 WTF_MAKE_NONCOPYABLE(AsyncAudioDecoder); 45 WTF_MAKE_NONCOPYABLE(AsyncAudioDecoder);
44 public: 46 public:
45 AsyncAudioDecoder(); 47 AsyncAudioDecoder();
46 ~AsyncAudioDecoder(); 48 ~AsyncAudioDecoder();
47 49
48 // Must be called on the main thread. 50 // Must be called on the main thread.
49 void decodeAsync(DOMArrayBuffer* audioData, float sampleRate, AudioBufferCal lback* successCallback, AudioBufferCallback* errorCallback); 51 void decodeAsync(DOMArrayBuffer* audioData, float sampleRate, AudioBufferCal lback* successCallback, AudioBufferCallback* errorCallback, ScriptPromiseResolve r*, AudioContext*);
50 52
51 private: 53 private:
52 AudioBuffer* createAudioBufferFromAudioBus(AudioBus*); 54 AudioBuffer* createAudioBufferFromAudioBus(AudioBus*);
53 static void decode(DOMArrayBuffer* audioData, float sampleRate, AudioBufferC allback* successCallback, AudioBufferCallback* errorCallback); 55 static void decode(DOMArrayBuffer* audioData, float sampleRate, AudioBufferC allback* successCallback, AudioBufferCallback* errorCallback, ScriptPromiseResol ver*, AudioContext*);
54 static void notifyComplete(DOMArrayBuffer* audioData, AudioBufferCallback* s uccessCallback, AudioBufferCallback* errorCallback, AudioBus*); 56 static void notifyComplete(DOMArrayBuffer* audioData, AudioBufferCallback* s uccessCallback, AudioBufferCallback* errorCallback, AudioBus*, ScriptPromiseReso lver*, AudioContext*);
55 57
56 OwnPtr<WebThread> m_thread; 58 OwnPtr<WebThread> m_thread;
59 RefPtrWillBeMember<ScriptPromiseResolver> m_resolver;
haraken 2015/04/07 23:39:14 Since AsyncAudioDecoder is not on-heap, this needs
Raymond Toy 2015/04/08 16:47:11 Oops. This isn't actually used anywhere. Deleting
57 }; 60 };
58 61
59 } // namespace blink 62 } // namespace blink
60 63
61 #endif // AsyncAudioDecoder_h 64 #endif // AsyncAudioDecoder_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698