diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
| commit | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (patch) | |
| tree | 52599cd0ab782b1768e23ad176f7618f98333cb6 /Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp | |
| parent | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (diff) | |
| download | qtwebkit-03e12282df9aa1e1fb05a8b90f1cfc2e08764cec.tar.gz | |
Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 (http://svn.webkit.org/repository/webkit/trunk@107223)
Diffstat (limited to 'Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp b/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp index 7daf329e5..9faa4fd85 100644 --- a/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp +++ b/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp @@ -37,6 +37,7 @@ #include "MediaStreamComponent.h" #include "MediaStreamDescriptor.h" #include "MediaStreamSource.h" +#include "platform/WebMediaStreamComponent.h" #include "platform/WebMediaStreamSource.h" #include "platform/WebString.h" #include <wtf/Vector.h> @@ -50,6 +51,11 @@ WebMediaStreamDescriptor::WebMediaStreamDescriptor(const PassRefPtr<WebCore::Med { } +WebMediaStreamDescriptor::WebMediaStreamDescriptor(WebCore::MediaStreamDescriptor* mediaStreamDescriptor) + : m_private(mediaStreamDescriptor) +{ +} + void WebMediaStreamDescriptor::reset() { m_private.reset(); @@ -74,21 +80,21 @@ void WebMediaStreamDescriptor::sources(WebVector<WebMediaStreamSource>& webSourc webSources.swap(result); } -void WebMediaStreamDescriptor::audioSources(WebVector<WebMediaStreamSource>& webSources) const +void WebMediaStreamDescriptor::audioSources(WebVector<WebMediaStreamComponent>& webSources) const { size_t numberOfSources = m_private->numberOfAudioComponents(); - WebVector<WebMediaStreamSource> result(numberOfSources); + WebVector<WebMediaStreamComponent> result(numberOfSources); for (size_t i = 0; i < numberOfSources; ++i) - result[i] = m_private->audioComponent(i)->source(); + result[i] = m_private->audioComponent(i); webSources.swap(result); } -void WebMediaStreamDescriptor::videoSources(WebVector<WebMediaStreamSource>& webSources) const +void WebMediaStreamDescriptor::videoSources(WebVector<WebMediaStreamComponent>& webSources) const { size_t numberOfSources = m_private->numberOfVideoComponents(); - WebVector<WebMediaStreamSource> result(numberOfSources); + WebVector<WebMediaStreamComponent> result(numberOfSources); for (size_t i = 0; i < numberOfSources; ++i) - result[i] = m_private->videoComponent(i)->source(); + result[i] = m_private->videoComponent(i); webSources.swap(result); } |