| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. | 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. |
| 3 * Copyright (C) 2013 Google Inc. All rights reserved. | 3 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 30 */ | 30 */ |
| 31 | 31 |
| 32 #include "config.h" | 32 #include "config.h" |
| 33 | 33 |
| 34 #include "core/platform/mediastream/MediaStreamDescriptor.h" | 34 #include "core/platform/mediastream/MediaStreamDescriptor.h" |
| 35 | 35 |
| 36 #include "core/platform/mediastream/MediaStreamComponent.h" | 36 #include "core/platform/mediastream/MediaStreamComponent.h" |
| 37 #include "core/platform/mediastream/MediaStreamSource.h" | |
| 38 #include "platform/UUID.h" | 37 #include "platform/UUID.h" |
| 38 #include "platform/mediastream/MediaStreamSource.h" |
| 39 #include "wtf/RefCounted.h" | 39 #include "wtf/RefCounted.h" |
| 40 #include "wtf/Vector.h" | 40 #include "wtf/Vector.h" |
| 41 | 41 |
| 42 namespace WebCore { | 42 namespace WebCore { |
| 43 | 43 |
| 44 PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const MediaStrea
mSourceVector& audioSources, const MediaStreamSourceVector& videoSources) | 44 PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const MediaStrea
mSourceVector& audioSources, const MediaStreamSourceVector& videoSources) |
| 45 { | 45 { |
| 46 return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audio
Sources, videoSources)); | 46 return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audio
Sources, videoSources)); |
| 47 } | 47 } |
| 48 | 48 |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 { | 131 { |
| 132 for (MediaStreamComponentVector::iterator iter = m_audioComponents.begin();
iter != m_audioComponents.end(); ++iter) | 132 for (MediaStreamComponentVector::iterator iter = m_audioComponents.begin();
iter != m_audioComponents.end(); ++iter) |
| 133 (*iter)->setStream(0); | 133 (*iter)->setStream(0); |
| 134 | 134 |
| 135 for (MediaStreamComponentVector::iterator iter = m_videoComponents.begin();
iter != m_videoComponents.end(); ++iter) | 135 for (MediaStreamComponentVector::iterator iter = m_videoComponents.begin();
iter != m_videoComponents.end(); ++iter) |
| 136 (*iter)->setStream(0); | 136 (*iter)->setStream(0); |
| 137 } | 137 } |
| 138 | 138 |
| 139 } // namespace WebCore | 139 } // namespace WebCore |
| 140 | 140 |
| OLD | NEW |