Changeset 99004 in webkit


Ignore:
Timestamp:
Nov 1, 2011 3:32:33 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[chromium] Media Stream API: Adding supporting classes to WebPeerConnectionHandler
​https://bugs.webkit.org/show_bug.cgi?id=71008

Expanding WebMediaStreamDescriptor and adding WebMediaStreamSource

Patch by Tommy Widenflycht <​tommyw@google.com> on 2011-11-01
Reviewed by Darin Fisher.

  • WebKit.gyp:
  • public/WebMediaStreamDescriptor.h:
  • public/WebMediaStreamSource.h: Copied from Source/WebKit/chromium/public/WebMediaStreamDescriptor.h.

(WebKit::WebMediaStreamSource::WebMediaStreamSource):
(WebKit::WebMediaStreamSource::~WebMediaStreamSource):
(WebKit::WebMediaStreamSource::isNull):

  • src/AssertMatchingEnums.cpp:
  • src/WebMediaStreamDescriptor.cpp:

(WebKit::WebMediaStreamDescriptor::operator=):
(WebKit::WebMediaStreamDescriptor::initialize):

  • src/WebMediaStreamSource.cpp: Copied from Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp.

(WebKit::WebMediaStreamSource::WebMediaStreamSource):
(WebKit::WebMediaStreamSource::reset):
(WebKit::WebMediaStreamSource::operator PassRefPtr<MediaStreamSource>):
(WebKit::WebMediaStreamSource::operator MediaStreamSource*):
(WebKit::WebMediaStreamSource::initialize):
(WebKit::WebMediaStreamSource::id):
(WebKit::WebMediaStreamSource::type):
(WebKit::WebMediaStreamSource::name):

Location:
trunk/Source/WebKit/chromium
Files:
5 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/chromium/ChangeLog

    r98994 r99004  
     12011-11-01  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] Media Stream API: Adding supporting classes to WebPeerConnectionHandler
     4        https://bugs.webkit.org/show_bug.cgi?id=71008
     5
     6        Expanding WebMediaStreamDescriptor and adding WebMediaStreamSource
     7
     8        Reviewed by Darin Fisher.
     9
     10        * WebKit.gyp:
     11        * public/WebMediaStreamDescriptor.h:
     12        * public/WebMediaStreamSource.h: Copied from Source/WebKit/chromium/public/WebMediaStreamDescriptor.h.
     13        (WebKit::WebMediaStreamSource::WebMediaStreamSource):
     14        (WebKit::WebMediaStreamSource::~WebMediaStreamSource):
     15        (WebKit::WebMediaStreamSource::isNull):
     16        * src/AssertMatchingEnums.cpp:
     17        * src/WebMediaStreamDescriptor.cpp:
     18        (WebKit::WebMediaStreamDescriptor::operator=):
     19        (WebKit::WebMediaStreamDescriptor::initialize):
     20        * src/WebMediaStreamSource.cpp: Copied from Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp.
     21        (WebKit::WebMediaStreamSource::WebMediaStreamSource):
     22        (WebKit::WebMediaStreamSource::reset):
     23        (WebKit::WebMediaStreamSource::operator PassRefPtr<MediaStreamSource>):
     24        (WebKit::WebMediaStreamSource::operator MediaStreamSource*):
     25        (WebKit::WebMediaStreamSource::initialize):
     26        (WebKit::WebMediaStreamSource::id):
     27        (WebKit::WebMediaStreamSource::type):
     28        (WebKit::WebMediaStreamSource::name):
     29
    1302011-11-01  Nat Duca  <nduca@chromium.org>
    231

  • trunk/Source/WebKit/chromium/WebKit.gyp

    r98926 r99004  
    236236                'public/WebMediaPlayerClient.h',
    237237                'public/WebMediaStreamDescriptor.h',
     238                'public/WebMediaStreamSource.h',
    238239                'public/WebMenuItemInfo.h',
    239240                'public/WebMessagePortChannel.h',
    … …  
    563564                'src/WebMediaPlayerClientImpl.h',
    564565                'src/WebMediaStreamDescriptor.cpp',
     566                'src/WebMediaStreamSource.cpp',
    565567                'src/WebNamedNodeMap.cpp',
    566568                'src/WebNetworkStateNotifier.cpp',

  • trunk/Source/WebKit/chromium/public/WebMediaStreamDescriptor.h

    r98926 r99004  
    2929#include "WebNonCopyable.h"
    3030#include "WebPrivatePtr.h"
     31#include "WebVector.h"
    3132
    3233namespace WebCore {
    … …  
    3637namespace WebKit {
    3738
     39class WebMediaStreamSource;
     40class WebString;
     41
    3842class WebMediaStreamDescriptor {
    3943public:
    … …  
    4145    ~WebMediaStreamDescriptor() { reset(); }
    4246
    43     WEBKIT_EXPORT void initialize(); // FIXME: Add params.
     47    WEBKIT_EXPORT void initialize(const WebString& label, const WebVector<WebMediaStreamSource>&);
    4448    WEBKIT_EXPORT void reset();
    4549    bool isNull() const { return m_private.isNull(); }
    4650
    47     // FIXME: Add functions.
     51    WEBKIT_EXPORT WebString label() const;
    4852
    4953#if WEBKIT_IMPLEMENTATION

  • trunk/Source/WebKit/chromium/public/WebMediaStreamSource.h

    r99003 r99004  
    2323 */
    2424
    25 #ifndef WebMediaStreamDescriptor_h
    26 #define WebMediaStreamDescriptor_h
     25#ifndef WebMediaStreamSource_h
     26#define WebMediaStreamSource_h
    2727
    2828#include "WebCommon.h"
    … …  
    3131
    3232namespace WebCore {
    33 class MediaStreamDescriptor;
     33class MediaStreamSource;
    3434}
    3535
    3636namespace WebKit {
    3737
    38 class WebMediaStreamDescriptor {
     38class WebString;
     39
     40class WebMediaStreamSource {
    3941public:
    40     WebMediaStreamDescriptor() { }
    41     ~WebMediaStreamDescriptor() { reset(); }
     42    enum Type {
     43        TypeAudio,
     44        TypeVideo
     45    };
    4246
    43     WEBKIT_EXPORT void initialize(); // FIXME: Add params.
     47    WebMediaStreamSource() { }
     48    ~WebMediaStreamSource() { reset(); }
     49
     50    WEBKIT_EXPORT void initialize(const WebString& id, Type, const WebString& name);
    4451    WEBKIT_EXPORT void reset();
    4552    bool isNull() const { return m_private.isNull(); }
    4653
    47     // FIXME: Add functions.
     54    WEBKIT_EXPORT WebString id() const;
     55    WEBKIT_EXPORT Type type() const;
     56    WEBKIT_EXPORT WebString name() const;
    4857
    4958#if WEBKIT_IMPLEMENTATION
    50     WebMediaStreamDescriptor(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
    51     operator WTF::PassRefPtr<WebCore::MediaStreamDescriptor>() const;
    52     operator WebCore::MediaStreamDescriptor*() const;
    53     WebMediaStreamDescriptor& operator=(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
     59    WebMediaStreamSource(const WTF::PassRefPtr<WebCore::MediaStreamSource>&);
     60    operator WTF::PassRefPtr<WebCore::MediaStreamSource>() const;
     61    operator WebCore::MediaStreamSource*() const;
    5462#endif
    5563
    5664private:
    57     WebPrivatePtr<WebCore::MediaStreamDescriptor> m_private;
     65    WebPrivatePtr<WebCore::MediaStreamSource> m_private;
    5866};
    5967
    6068} // namespace WebKit
    6169
    62 #endif // WebMediaStreamDescriptor_h
     70#endif // WebMediaStreamSource_h

  • trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp

    r98900 r99004  
    5151#include "IDBKey.h"
    5252#include "MediaPlayer.h"
     53#include "MediaStreamSource.h"
    5354#include "NotificationPresenter.h"
    5455#include "PageVisibilityState.h"
    … …  
    7980#include "WebInputElement.h"
    8081#include "WebMediaPlayer.h"
     82#include "WebMediaStreamSource.h"
    8183#include "WebNotificationPresenter.h"
    8284#include "WebPageVisibilityState.h"
    … …  
    460462COMPILE_ASSERT_MATCHING_ENUM(WebPageVisibilityStateHidden, PageVisibilityStateHidden);
    461463COMPILE_ASSERT_MATCHING_ENUM(WebPageVisibilityStatePrerender, PageVisibilityStatePrerender);
     464
     465#if ENABLE(MEDIA_STREAM)
     466COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::TypeAudio, MediaStreamSource::TypeAudio);
     467COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::TypeVideo, MediaStreamSource::TypeVideo);
     468#endif

  • trunk/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp

    r98926 r99004  
    3030
    3131#include "MediaStreamDescriptor.h"
     32#include "MediaStreamSource.h"
     33#include "WebMediaStreamSource.h"
    3234#include "WebString.h"
     35#include <wtf/Vector.h>
     36
     37using namespace WebCore;
    3338
    3439namespace WebKit {
    3540
    36 WebMediaStreamDescriptor::WebMediaStreamDescriptor(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor)
     41WebMediaStreamDescriptor::WebMediaStreamDescriptor(const PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor)
    3742    : m_private(mediaStreamDescriptor)
    3843{
    … …  
    4449}
    4550
    46 WebMediaStreamDescriptor& WebMediaStreamDescriptor::operator=(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor)
     51WebMediaStreamDescriptor& WebMediaStreamDescriptor::operator=(const PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor)
    4752{
    4853    m_private = mediaStreamDescriptor;
    … …  
    5055}
    5156
    52 WebMediaStreamDescriptor::operator WTF::PassRefPtr<WebCore::MediaStreamDescriptor>() const
     57WebMediaStreamDescriptor::operator PassRefPtr<WebCore::MediaStreamDescriptor>() const
    5358{
    5459    return m_private.get();
    … …  
    6065}
    6166
     67void WebMediaStreamDescriptor::initialize(const WebString& label, const WebVector<WebMediaStreamSource>& sources)
     68{
     69    MediaStreamSourceVector s;
     70    for (size_t i = 0; i < sources.size(); ++i) {
     71        MediaStreamSource* curr = sources[i];
     72        s.append(curr);
     73    }
     74    m_private = MediaStreamDescriptor::create(label, s);
     75}
     76
    6277} // namespace WebKit
    6378

  • trunk/Source/WebKit/chromium/src/WebMediaStreamSource.cpp

    r99003 r99004  
    2727#if ENABLE(MEDIA_STREAM)
    2828
    29 #include "WebMediaStreamDescriptor.h"
     29#include "WebMediaStreamSource.h"
    3030
    31 #include "MediaStreamDescriptor.h"
     31#include "MediaStreamSource.h"
    3232#include "WebString.h"
     33#include <wtf/Vector.h>
     34
     35using namespace WebCore;
    3336
    3437namespace WebKit {
    3538
    36 WebMediaStreamDescriptor::WebMediaStreamDescriptor(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor)
    37     : m_private(mediaStreamDescriptor)
     39WebMediaStreamSource::WebMediaStreamSource(const PassRefPtr<MediaStreamSource>& mediaStreamSource)
     40    : m_private(mediaStreamSource)
    3841{
    3942}
    4043
    41 void WebMediaStreamDescriptor::reset()
     44void WebMediaStreamSource::reset()
    4245{
    4346    m_private.reset();
    4447}
    4548
    46 WebMediaStreamDescriptor& WebMediaStreamDescriptor::operator=(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor)
    47 {
    48     m_private = mediaStreamDescriptor;
    49     return *this;
    50 }
    51 
    52 WebMediaStreamDescriptor::operator WTF::PassRefPtr<WebCore::MediaStreamDescriptor>() const
     49WebMediaStreamSource::operator PassRefPtr<MediaStreamSource>() const
    5350{
    5451    return m_private.get();
    5552}
    5653
    57 WebMediaStreamDescriptor::operator WebCore::MediaStreamDescriptor*() const
     54WebMediaStreamSource::operator MediaStreamSource*() const
    5855{
    5956    return m_private.get();
     57}
     58
     59void WebMediaStreamSource::initialize(const WebString& id, Type type, const WebString& name)
     60{
     61    m_private = MediaStreamSource::create(id, static_cast<MediaStreamSource::Type>(type), name);
     62}
     63
     64WebString WebMediaStreamSource::id() const
     65{
     66    ASSERT(!m_private.isNull());
     67    return m_private.get()->id();
     68}
     69
     70WebMediaStreamSource::Type WebMediaStreamSource::type() const
     71{
     72    ASSERT(!m_private.isNull());
     73    return static_cast<Type>(m_private.get()->type());
     74}
     75
     76WebString WebMediaStreamSource::name() const
     77{
     78    ASSERT(!m_private.isNull());
     79    return m_private.get()->name();
    6080}
    6181
Note: See TracChangeset for help on using the changeset viewer.