Changeset 138895 in webkit
- Timestamp:
- Jan 5, 2013 12:04:35 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/Platform/ChangeLog
r138831 r138895 1 2013-01-05 Chris Rogers <crogers@google.com> 2 3 Implement MediaStreamSource::setAudioFormat() 4 https://bugs.webkit.org/show_bug.cgi?id=106053 5 6 Reviewed by Kenneth Russell. 7 8 * chromium/public/WebAudioDestinationConsumer.h: 9 (WebAudioDestinationConsumer): 10 1 11 2013-01-04 James Robinson <jamesr@chromium.org> 2 12 -
trunk/Source/Platform/chromium/public/WebAudioDestinationConsumer.h
r135985 r138895 34 34 virtual ~WebAudioDestinationConsumer() { } 35 35 36 virtual void setFormat(size_t numberOfChannels, float sampleRate) = 0; 37 36 38 // The size of the vector is the number of audio channels, and numberOfFrames is the 37 39 // number of audio frames in the (possibly multi-channel) buffer in a planar format. -
trunk/Source/WebCore/ChangeLog
r138891 r138895 1 2013-01-05 Chris Rogers <crogers@google.com> 2 3 Implement MediaStreamSource::setAudioFormat() 4 https://bugs.webkit.org/show_bug.cgi?id=106053 5 6 Reviewed by Kenneth Russell. 7 8 MediaStreamAudioDestinationNode needs to be able to tell its associated 9 MediaStreamSource about the audio format (number of channels and sample-rate). 10 11 * Modules/webaudio/MediaStreamAudioDestinationNode.cpp: 12 (WebCore::MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode): 13 * platform/audio/AudioDestinationConsumer.h: 14 (AudioDestinationConsumer): 15 * platform/chromium/support/WebMediaStreamSource.cpp: 16 (ConsumerWrapper): 17 (WebKit::ConsumerWrapper::setFormat): 18 (WebKit): 19 * platform/mediastream/MediaStreamSource.cpp: 20 (WebCore::MediaStreamSource::setAudioFormat): 21 (WebCore): 22 * platform/mediastream/MediaStreamSource.h: 23 (MediaStreamSource): 24 1 25 2013-01-05 Zeno Albisser <zeno@webkit.org> 2 26 -
trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp
r135985 r138895 57 57 MediaStreamCenter::instance().didCreateMediaStream(m_stream->descriptor()); 58 58 59 m_source->setAudioFormat(numberOfChannels, context->sampleRate()); 60 59 61 initialize(); 60 62 } -
trunk/Source/WebCore/platform/audio/AudioDestinationConsumer.h
r135985 r138895 42 42 virtual ~AudioDestinationConsumer() { } 43 43 44 virtual void setFormat(size_t numberOfChannels, float sampleRate) = 0; 44 45 virtual void consumeAudio(AudioBus*, size_t numberOfFrames) = 0; 45 46 }; -
trunk/Source/WebCore/platform/chromium/support/WebMediaStreamSource.cpp
r135985 r138895 151 151 } 152 152 153 virtual void setFormat(size_t numberOfChannels, float sampleRate) OVERRIDE; 153 154 virtual void consumeAudio(AudioBus*, size_t numberOfFrames) OVERRIDE; 154 155 … … 161 162 WebAudioDestinationConsumer* m_consumer; 162 163 }; 164 165 void ConsumerWrapper::setFormat(size_t numberOfChannels, float sampleRate) 166 { 167 m_consumer->setFormat(numberOfChannels, sampleRate); 168 } 163 169 164 170 void ConsumerWrapper::consumeAudio(AudioBus* bus, size_t numberOfFrames) -
trunk/Source/WebCore/platform/mediastream/MediaStreamSource.cpp
r135985 r138895 93 93 } 94 94 95 void MediaStreamSource::setAudioFormat(size_t numberOfChannels, float sampleRate) 96 { 97 ASSERT(m_requiresConsumer); 98 MutexLocker locker(m_audioConsumersLock); 99 for (Vector<RefPtr<AudioDestinationConsumer> >::iterator it = m_audioConsumers.begin(); it != m_audioConsumers.end(); ++it) 100 (*it)->setFormat(numberOfChannels, sampleRate); 101 } 102 95 103 void MediaStreamSource::consumeAudio(AudioBus* bus, size_t numberOfFrames) 96 104 { -
trunk/Source/WebCore/platform/mediastream/MediaStreamSource.h
r135985 r138895 81 81 void setExtraData(PassRefPtr<ExtraData> extraData) { m_extraData = extraData; } 82 82 83 void setAudioFormat(size_t numberOfChannels, float sampleRate); 83 84 void consumeAudio(AudioBus*, size_t numberOfFrames); 84 85 -
trunk/Tools/DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp
r135985 r138895 90 90 public: 91 91 virtual ~MockWebAudioDestinationConsumer() { } 92 virtual void setFormat(size_t numberOfChannels, float sampleRate) OVERRIDE { } 92 93 virtual void consumeAudio(const WebVector<const float*>&, size_t number_of_frames) OVERRIDE { } 93 94 };
Note: See TracChangeset
for help on using the changeset viewer.