OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2012, Google Inc. All rights reserved. | 2 * Copyright (C) 2012, 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 17 matching lines...) Expand all Loading... | |
28 | 28 |
29 #include "modules/webaudio/MediaStreamAudioSourceNode.h" | 29 #include "modules/webaudio/MediaStreamAudioSourceNode.h" |
30 | 30 |
31 #include "platform/Logging.h" | 31 #include "platform/Logging.h" |
32 #include "modules/webaudio/AudioContext.h" | 32 #include "modules/webaudio/AudioContext.h" |
33 #include "modules/webaudio/AudioNodeOutput.h" | 33 #include "modules/webaudio/AudioNodeOutput.h" |
34 #include "wtf/Locker.h" | 34 #include "wtf/Locker.h" |
35 | 35 |
36 namespace WebCore { | 36 namespace WebCore { |
37 | 37 |
38 PassRefPtr<MediaStreamAudioSourceNode> MediaStreamAudioSourceNode::create(AudioC ontext* context, MediaStream* mediaStream, MediaStreamTrack* audioTrack, PassOwn Ptr<AudioSourceProvider> audioSourceProvider) | 38 PassRefPtrWillBeRawPtr<MediaStreamAudioSourceNode> MediaStreamAudioSourceNode::c reate(AudioContext* context, MediaStream* mediaStream, MediaStreamTrack* audioTr ack, PassOwnPtr<AudioSourceProvider> audioSourceProvider) |
39 { | 39 { |
40 return adoptRef(new MediaStreamAudioSourceNode(context, mediaStream, audioTr ack, audioSourceProvider)); | 40 return adoptRefWillBeNoop(new MediaStreamAudioSourceNode(context, mediaStrea m, audioTrack, audioSourceProvider)); |
41 } | 41 } |
42 | 42 |
43 MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AudioContext* context, Me diaStream* mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProv ider> audioSourceProvider) | 43 MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AudioContext* context, Me diaStream* mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProv ider> audioSourceProvider) |
44 : AudioSourceNode(context, context->sampleRate()) | 44 : AudioSourceNode(context, context->sampleRate()) |
45 , m_mediaStream(mediaStream) | 45 , m_mediaStream(mediaStream) |
46 , m_audioTrack(audioTrack) | 46 , m_audioTrack(audioTrack) |
47 , m_audioSourceProvider(audioSourceProvider) | 47 , m_audioSourceProvider(audioSourceProvider) |
48 , m_sourceNumberOfChannels(0) | 48 , m_sourceNumberOfChannels(0) |
49 { | 49 { |
50 ScriptWrappable::init(this); | 50 ScriptWrappable::init(this); |
51 // Default to stereo. This could change depending on the format of the Media Stream's audio track. | 51 // Default to stereo. This could change depending on the format of the Media Stream's audio track. |
52 addOutput(adoptPtr(new AudioNodeOutput(this, 2))); | 52 addOutput(adoptPtr(new AudioNodeOutput(this, 2))); |
53 | 53 |
54 setNodeType(NodeTypeMediaStreamAudioSource); | 54 setNodeType(NodeTypeMediaStreamAudioSource); |
55 | 55 |
56 initialize(); | 56 initialize(); |
57 } | 57 } |
58 | 58 |
59 MediaStreamAudioSourceNode::~MediaStreamAudioSourceNode() | 59 MediaStreamAudioSourceNode::~MediaStreamAudioSourceNode() |
60 { | 60 { |
61 uninitialize(); | 61 uninitialize(); |
haraken
2014/03/27 11:44:05
Not related to your CL, it looks like that all sub
| |
62 } | 62 } |
63 | 63 |
64 void MediaStreamAudioSourceNode::setFormat(size_t numberOfChannels, float source SampleRate) | 64 void MediaStreamAudioSourceNode::setFormat(size_t numberOfChannels, float source SampleRate) |
65 { | 65 { |
66 if (numberOfChannels != m_sourceNumberOfChannels || sourceSampleRate != samp leRate()) { | 66 if (numberOfChannels != m_sourceNumberOfChannels || sourceSampleRate != samp leRate()) { |
67 // The sample-rate must be equal to the context's sample-rate. | 67 // The sample-rate must be equal to the context's sample-rate. |
68 if (!numberOfChannels || numberOfChannels > AudioContext::maxNumberOfCha nnels() || sourceSampleRate != sampleRate()) { | 68 if (!numberOfChannels || numberOfChannels > AudioContext::maxNumberOfCha nnels() || sourceSampleRate != sampleRate()) { |
69 // process() will generate silence for these uninitialized values. | 69 // process() will generate silence for these uninitialized values. |
70 WTF_LOG(Media, "MediaStreamAudioSourceNode::setFormat(%u, %f) - unha ndled format change", static_cast<unsigned>(numberOfChannels), sourceSampleRate) ; | 70 WTF_LOG(Media, "MediaStreamAudioSourceNode::setFormat(%u, %f) - unha ndled format change", static_cast<unsigned>(numberOfChannels), sourceSampleRate) ; |
71 m_sourceNumberOfChannels = 0; | 71 m_sourceNumberOfChannels = 0; |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
109 audioSourceProvider()->provideInput(outputBus, numberOfFrames); | 109 audioSourceProvider()->provideInput(outputBus, numberOfFrames); |
110 else { | 110 else { |
111 // We failed to acquire the lock. | 111 // We failed to acquire the lock. |
112 outputBus->zero(); | 112 outputBus->zero(); |
113 } | 113 } |
114 } | 114 } |
115 | 115 |
116 } // namespace WebCore | 116 } // namespace WebCore |
117 | 117 |
118 #endif // ENABLE(WEB_AUDIO) | 118 #endif // ENABLE(WEB_AUDIO) |
OLD | NEW |