Changeset 155362 in webkit


Ignore:
Timestamp:
Sep 9, 2013 10:48:51 AM (11 years ago)
Author:
eric.carlson@apple.com
Message:

MediaStream API: Moving Add/Remove track from WebMediaStreamCenterClient to WebMediaStream
https://bugs.webkit.org/show_bug.cgi?id=120872

Reviewed by Jer Noble.

Merge https://chromium.googlesource.com/chromium/blink/+/7d740fd27c1f345b59c846df01c3adce53c18e6e
Simple cleanup that makes the API cleaner.

  • Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::removeTrack):
(WebCore::MediaStream::addRemoteTrack):
(WebCore::MediaStream::removeRemoteTrack):

  • platform/mediastream/MediaStreamCenter.cpp:
  • platform/mediastream/MediaStreamCenter.h:
  • platform/mediastream/MediaStreamDescriptor.h:

(WebCore::MediaStreamDescriptor::removeAudioComponent):
(WebCore::MediaStreamDescriptor::addRemoteTrack):
(WebCore::MediaStreamDescriptor::removeRemoteTrack):

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r155361 r155362  
     12013-09-09  Eric Carlson  <eric.carlson@apple.com>
     2
     3        MediaStream API: Moving Add/Remove track from WebMediaStreamCenterClient to WebMediaStream
     4        https://bugs.webkit.org/show_bug.cgi?id=120872
     5
     6        Reviewed by Jer Noble.
     7
     8        Merge https://chromium.googlesource.com/chromium/blink/+/7d740fd27c1f345b59c846df01c3adce53c18e6e
     9        Simple cleanup that makes the API cleaner.
     10
     11        * Modules/mediastream/MediaStream.cpp:
     12        (WebCore::MediaStream::removeTrack):
     13        (WebCore::MediaStream::addRemoteTrack):
     14        (WebCore::MediaStream::removeRemoteTrack):
     15        * platform/mediastream/MediaStreamCenter.cpp:
     16        * platform/mediastream/MediaStreamCenter.h:
     17        * platform/mediastream/MediaStreamDescriptor.h:
     18        (WebCore::MediaStreamDescriptor::removeAudioComponent):
     19        (WebCore::MediaStreamDescriptor::addRemoteTrack):
     20        (WebCore::MediaStreamDescriptor::removeRemoteTrack):
     21
    1222013-09-09  ChangSeok Oh  <changseok.oh@collabora.com>
    223
  • trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp

    r155249 r155362  
    168168}
    169169
    170 void MediaStream::removeTrack(PassRefPtr<MediaStreamTrack> prpTrack , ExceptionCode& ec)
     170void MediaStream::removeTrack(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionCode& ec)
    171171{
    172172    if (ended()) {
     
    281281    switch (component->source()->type()) {
    282282    case MediaStreamSource::TypeAudio:
     283        m_descriptor->addAudioComponent(component);
    283284        m_audioTracks.append(track);
    284285        break;
    285286    case MediaStreamSource::TypeVideo:
     287        m_descriptor->addVideoComponent(component);
    286288        m_videoTracks.append(track);
    287289        break;
     
    316318        return;
    317319
     320    switch (component->source()->type()) {
     321    case MediaStreamSource::TypeAudio:
     322        m_descriptor->removeAudioComponent(component);
     323        break;
     324    case MediaStreamSource::TypeVideo:
     325        m_descriptor->removeAudioComponent(component);
     326        break;
     327    }
     328
    318329    RefPtr<MediaStreamTrack> track = (*tracks)[index];
    319330    tracks->remove(index);
  • trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp

    r139775 r155362  
    5757}
    5858
    59 void MediaStreamCenter::addMediaStreamTrack(MediaStreamDescriptor* streamDescriptor, MediaStreamComponent* component)
    60 {
    61     MediaStreamDescriptorClient* client = streamDescriptor->client();
    62     if (client)
    63         client->addRemoteTrack(component);
    64 }
    65 
    66 void MediaStreamCenter::removeMediaStreamTrack(MediaStreamDescriptor* streamDescriptor, MediaStreamComponent* component)
    67 {
    68     MediaStreamDescriptorClient* client = streamDescriptor->client();
    69     if (client)
    70         client->removeRemoteTrack(component);
    71 }
    72 
    7359} // namespace WebCore
    7460
  • trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h

    r134084 r155362  
    5252    virtual void queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClient>) = 0;
    5353
    54     // FIXME: add a way to mute a MediaStreamSource from the WebKit API layer
    55 
    5654    // Calls from the DOM objects to notify the platform
    5755    virtual void didSetMediaStreamTrackEnabled(MediaStreamDescriptor*, MediaStreamComponent*) = 0;
     
    6563
    6664    void endLocalMediaStream(MediaStreamDescriptor*);
    67     void addMediaStreamTrack(MediaStreamDescriptor*, MediaStreamComponent*);
    68     void removeMediaStreamTrack(MediaStreamDescriptor*, MediaStreamComponent*);
    6965};
    7066
  • trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.h

    r155249 r155362  
    7878    void removeAudioComponent(MediaStreamComponent* component)
    7979    {
    80         size_t pos = m_audioComponents.find(component);
     80        size_t pos = m_videoComponents.find(component);
    8181        if (pos != notFound)
    82             m_audioComponents.remove(pos);
     82            m_videoComponents.remove(pos);
     83    }
     84
     85    void addRemoteTrack(MediaStreamComponent* component)
     86    {
     87        if (m_client)
     88            m_client->addRemoteTrack(component);
     89    }
     90
     91    void removeRemoteTrack(MediaStreamComponent* component)
     92    {
     93        if (m_client)
     94            m_client->removeRemoteTrack(component);
    8395    }
    8496
Note: See TracChangeset for help on using the changeset viewer.