| 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 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "platform/mediastream/MediaStreamSource.h" | 32 #include "platform/mediastream/MediaStreamSource.h" |
| 33 | 33 |
| 34 | 34 |
| 35 namespace blink { | 35 namespace blink { |
| 36 | 36 |
| 37 PassRefPtr<MediaStreamSource> MediaStreamSource::create(const String& id, Type t
ype, const String& name, ReadyState readyState, bool requiresConsumer) | 37 PassRefPtr<MediaStreamSource> MediaStreamSource::create(const String& id, Type t
ype, const String& name, bool remote, bool readonly, ReadyState readyState, bool
requiresConsumer) |
| 38 { | 38 { |
| 39 return adoptRef(new MediaStreamSource(id, type, name, readyState, requiresCo
nsumer)); | 39 return adoptRef(new MediaStreamSource(id, type, name, remote, readonly, read
yState, requiresConsumer)); |
| 40 } | 40 } |
| 41 | 41 |
| 42 MediaStreamSource::MediaStreamSource(const String& id, Type type, const String&
name, ReadyState readyState, bool requiresConsumer) | 42 MediaStreamSource::MediaStreamSource(const String& id, Type type, const String&
name, bool remote, bool readonly, ReadyState readyState, bool requiresConsumer) |
| 43 : m_id(id) | 43 : m_id(id) |
| 44 , m_type(type) | 44 , m_type(type) |
| 45 , m_name(name) | 45 , m_name(name) |
| 46 , m_remote(remote) |
| 47 , m_readonly(readonly) |
| 46 , m_readyState(readyState) | 48 , m_readyState(readyState) |
| 47 , m_requiresConsumer(requiresConsumer) | 49 , m_requiresConsumer(requiresConsumer) |
| 48 { | 50 { |
| 49 } | 51 } |
| 50 | 52 |
| 51 void MediaStreamSource::setReadyState(ReadyState readyState) | 53 void MediaStreamSource::setReadyState(ReadyState readyState) |
| 52 { | 54 { |
| 53 if (m_readyState != ReadyStateEnded && m_readyState != readyState) { | 55 if (m_readyState != ReadyStateEnded && m_readyState != readyState) { |
| 54 m_readyState = readyState; | 56 m_readyState = readyState; |
| 55 for (Vector<Observer*>::iterator i = m_observers.begin(); i != m_observe
rs.end(); ++i) | 57 for (Vector<Observer*>::iterator i = m_observers.begin(); i != m_observe
rs.end(); ++i) |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 | 99 |
| 98 void MediaStreamSource::consumeAudio(AudioBus* bus, size_t numberOfFrames) | 100 void MediaStreamSource::consumeAudio(AudioBus* bus, size_t numberOfFrames) |
| 99 { | 101 { |
| 100 ASSERT(m_requiresConsumer); | 102 ASSERT(m_requiresConsumer); |
| 101 MutexLocker locker(m_audioConsumersLock); | 103 MutexLocker locker(m_audioConsumersLock); |
| 102 for (HeapHashSet<Member<AudioDestinationConsumer> >::iterator it = m_audioCo
nsumers.begin(); it != m_audioConsumers.end(); ++it) | 104 for (HeapHashSet<Member<AudioDestinationConsumer> >::iterator it = m_audioCo
nsumers.begin(); it != m_audioConsumers.end(); ++it) |
| 103 (*it)->consumeAudio(bus, numberOfFrames); | 105 (*it)->consumeAudio(bus, numberOfFrames); |
| 104 } | 106 } |
| 105 | 107 |
| 106 } // namespace blink | 108 } // namespace blink |
| OLD | NEW |