Changeset 155477 in webkit


Ignore:
Timestamp:
Sep 10, 2013 2:41:57 PM (11 years ago)
Author:
eric.carlson@apple.com
Message:

Split MediaStreamDescriptor.h and MediaStreamComponent.h into .h and .cpp
​https://bugs.webkit.org/show_bug.cgi?id=120878

Reviewed by Jer Noble.

No new tests, no functional change.

  • CMakeLists.txt: Add MediaStreamComponent.cpp and MediaStreamDescriptor.cpp.
  • GNUmakefile.list.am: Ditto.
  • Modules/mediastream/LocalMediaStream.cpp:

(WebCore::LocalMediaStream::create): MediaStreamDescriptor::create() doesn't take a UUID.

  • Modules/mediastream/MediaStream.cpp:

(WebCore::createFromSourceVectors): Ditto.

  • WebCore.xcodeproj/project.pbxproj: Add MediaStreamComponent.cpp and MediaStreamDescriptor.cpp.
  • platform/mediastream/MediaStreamComponent.cpp: Added.
  • platform/mediastream/MediaStreamComponent.h:
  • platform/mediastream/MediaStreamDescriptor.cpp: Added.
  • platform/mediastream/MediaStreamDescriptor.h:
Location:
trunk/Source/WebCore
Files:
2 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r155391 r155477  
    837837    Modules/mediastream/MediaConstraintsImpl.cpp
    838838    Modules/mediastream/MediaStream.cpp
     839    Modules/mediastream/MediaStreamComponent.cpp
     840    Modules/mediastream/MediaStreamDescriptor.cpp
    839841    Modules/mediastream/MediaStreamEvent.cpp
    840842    Modules/mediastream/MediaStreamRegistry.cpp

  • trunk/Source/WebCore/ChangeLog

    r155476 r155477  
     12013-09-10  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Split MediaStreamDescriptor.h and MediaStreamComponent.h into .h and .cpp
     4        https://bugs.webkit.org/show_bug.cgi?id=120878
     5
     6        Reviewed by Jer Noble.
     7
     8        No new tests, no functional change.
     9
     10        * CMakeLists.txt: Add MediaStreamComponent.cpp and MediaStreamDescriptor.cpp.
     11        * GNUmakefile.list.am: Ditto.
     12
     13        * Modules/mediastream/LocalMediaStream.cpp:
     14        (WebCore::LocalMediaStream::create): MediaStreamDescriptor::create() doesn't take a UUID.
     15
     16        * Modules/mediastream/MediaStream.cpp:
     17        (WebCore::createFromSourceVectors): Ditto.
     18
     19        * WebCore.xcodeproj/project.pbxproj: Add MediaStreamComponent.cpp and MediaStreamDescriptor.cpp.
     20
     21        * platform/mediastream/MediaStreamComponent.cpp: Added.
     22        * platform/mediastream/MediaStreamComponent.h:
     23
     24        * platform/mediastream/MediaStreamDescriptor.cpp: Added.
     25        * platform/mediastream/MediaStreamDescriptor.h:
     26
    1272013-09-10  Brent Fulgham  <bfulgham@apple.com>
    228

  • trunk/Source/WebCore/GNUmakefile.list.am

    r155391 r155477  
    54515451        Source/WebCore/platform/mediastream/MediaStreamCenter.cpp \
    54525452        Source/WebCore/platform/mediastream/MediaStreamCenter.h \
     5453        Source/WebCore/platform/mediastream/MediaStreamComponent.cpp \
    54535454        Source/WebCore/platform/mediastream/MediaStreamComponent.h \
     5455        Source/WebCore/platform/mediastream/MediaStreamDescriptor.cpp \
    54545456        Source/WebCore/platform/mediastream/MediaStreamDescriptor.h \
    54555457        Source/WebCore/platform/mediastream/MediaStreamSource.cpp \

  • trunk/Source/WebCore/Modules/mediastream/LocalMediaStream.cpp

    r139598 r155477  
    3030
    3131#include "MediaStreamCenter.h"
    32 #include "UUID.h"
    3332
    3433namespace WebCore {
    … …  
    3635PassRefPtr<LocalMediaStream> LocalMediaStream::create(ScriptExecutionContext* context, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
    3736{
    38     return adoptRef(new LocalMediaStream(context, MediaStreamDescriptor::create(createCanonicalUUIDString(), audioSources, videoSources)));
     37    return adoptRef(new LocalMediaStream(context, MediaStreamDescriptor::create(audioSources, videoSources)));
    3938}
    4039

  • trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp

    r155434 r155477  
    3434#include "MediaStreamSource.h"
    3535#include "MediaStreamTrackEvent.h"
    36 #include "UUID.h"
    3736
    3837namespace WebCore {
    … …  
    5958static PassRefPtr<MediaStream> createFromSourceVectors(ScriptExecutionContext* context, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
    6059{
    61     RefPtr<MediaStreamDescriptor> descriptor = MediaStreamDescriptor::create(createCanonicalUUIDString(), audioSources, videoSources);
     60    RefPtr<MediaStreamDescriptor> descriptor = MediaStreamDescriptor::create(audioSources, videoSources);
    6261    MediaStreamCenter::instance().didCreateMediaStream(descriptor.get());
    6362

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r155461 r155477  
    9595                070756E014239B4E00414161 /* JSTextTrackCueList.h in Headers */ = {isa = PBXBuildFile; fileRef = 070756DA14239B4E00414161 /* JSTextTrackCueList.h */; };
    9696                0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 0709FC4D1025DEE30059CDBA /* AccessibilitySlider.h */; };
     97                0711589017DF6F6200EDFE2B /* MediaStreamComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0711588E17DF633700EDFE2B /* MediaStreamComponent.cpp */; };
     98                0711589117DF6F6600EDFE2B /* MediaStreamDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0711588F17DF633700EDFE2B /* MediaStreamDescriptor.cpp */; };
    9799                071A9EC2168FBC43002629F9 /* TextTrackCueGeneric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 071A9EC0168FB56C002629F9 /* TextTrackCueGeneric.cpp */; };
    98100                071A9EC3168FBC55002629F9 /* TextTrackCueGeneric.h in Headers */ = {isa = PBXBuildFile; fileRef = 071A9EC1168FB56C002629F9 /* TextTrackCueGeneric.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    64306432                0709FC4D1025DEE30059CDBA /* AccessibilitySlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilitySlider.h; sourceTree = "<group>"; };
    64316433                070DD8F50F01868000727DEB /* mediaControls.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mediaControls.css; sourceTree = "<group>"; };
     6434                0711588E17DF633700EDFE2B /* MediaStreamComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamComponent.cpp; sourceTree = "<group>"; };
     6435                0711588F17DF633700EDFE2B /* MediaStreamDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamDescriptor.cpp; sourceTree = "<group>"; };
    64326436                071A9EC0168FB56C002629F9 /* TextTrackCueGeneric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrackCueGeneric.cpp; sourceTree = "<group>"; };
    64336437                071A9EC1168FB56C002629F9 /* TextTrackCueGeneric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackCueGeneric.h; sourceTree = "<group>"; };
    … …  
    1332613330                                07221B9A17CF0AD400848E51 /* MediaStreamCenter.cpp */,
    1332713331                                07221B9B17CF0AD400848E51 /* MediaStreamCenter.h */,
     13332                                0711588E17DF633700EDFE2B /* MediaStreamComponent.cpp */,
    1332813333                                07221B9C17CF0AD400848E51 /* MediaStreamComponent.h */,
     13334                                0711588F17DF633700EDFE2B /* MediaStreamDescriptor.cpp */,
    1332913335                                07221B9D17CF0AD400848E51 /* MediaStreamDescriptor.h */,
    1333013336                                07221B9E17CF0AD400848E51 /* MediaStreamSource.cpp */,
    … …  
    2660526611                                D3AA10F3123A98AA0092152B /* MediaQueryMatcher.cpp in Sources */,
    2660626612                                FD671A77159BB07000197559 /* MediaStreamAudioSourceNode.cpp in Sources */,
     26613                                0711589017DF6F6200EDFE2B /* MediaStreamComponent.cpp in Sources */,
     26614                                0711589117DF6F6600EDFE2B /* MediaStreamDescriptor.cpp in Sources */,
    2660726615                                BCB16C170979C3BD00467741 /* MemoryCache.cpp in Sources */,
    2660826616                                657EDA081385CB97004E0645 /* MemoryPressureHandler.cpp in Sources */,

  • trunk/Source/WebCore/platform/mediastream/MediaStreamComponent.h

    r142773 r155477  
    11/*
    22 * Copyright (C) 2011 Ericsson AB. All rights reserved.
     3 * Copyright (C) 2013 Google Inc. All rights reserved.
    34 *
    45 * Redistribution and use in source and binary forms, with or without
    … …  
    3435#if ENABLE(MEDIA_STREAM)
    3536
    36 #include "MediaStreamSource.h"
    37 #include "UUID.h"
     37#include <wtf/PassRefPtr.h>
     38#include <wtf/RefCounted.h>
     39#include <wtf/text/WTFString.h>
    3840
    3941namespace WebCore {
    4042
    4143class MediaStreamDescriptor;
     44class MediaStreamSource;
    4245
    4346class MediaStreamComponent : public RefCounted<MediaStreamComponent> {
    4447public:
    45     static PassRefPtr<MediaStreamComponent> create(PassRefPtr<MediaStreamSource> source)
    46     {
    47         return adoptRef(new MediaStreamComponent(createCanonicalUUIDString(), 0, source));
    48     }
    49 
    50     static PassRefPtr<MediaStreamComponent> create(const String& id, PassRefPtr<MediaStreamSource> source)
    51     {
    52         return adoptRef(new MediaStreamComponent(id, 0, source));
    53     }
    54 
    55     static PassRefPtr<MediaStreamComponent> create(MediaStreamDescriptor* stream, PassRefPtr<MediaStreamSource> source)
    56     {
    57         return adoptRef(new MediaStreamComponent(createCanonicalUUIDString(), stream, source));
    58     }
     48    static PassRefPtr<MediaStreamComponent> create(PassRefPtr<MediaStreamSource>);
     49    static PassRefPtr<MediaStreamComponent> create(MediaStreamDescriptor*, PassRefPtr<MediaStreamSource>);
    5950
    6051    MediaStreamDescriptor* stream() const { return m_stream; }
    … …  
    6859
    6960private:
    70     MediaStreamComponent(const String& id, MediaStreamDescriptor* stream, PassRefPtr<MediaStreamSource> source)
    71         : m_stream(stream)
    72         , m_source(source)
    73         , m_id(id)
    74         , m_enabled(true)
    75     {
    76         ASSERT(m_id.length());
    77     }
     61    MediaStreamComponent(const String& id, MediaStreamDescriptor*, PassRefPtr<MediaStreamSource>);
    7862
    7963    MediaStreamDescriptor* m_stream;

  • trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.h

    r155434 r155477  
    3636
    3737#include "MediaStreamComponent.h"
     38#include "MediaStreamSource.h"
    3839#include <wtf/RefCounted.h>
    3940#include <wtf/Vector.h>
    … …  
    5859    };
    5960
    60     static PassRefPtr<MediaStreamDescriptor> create(const String& id, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
    61     {
    62         return adoptRef(new MediaStreamDescriptor(id, audioSources, videoSources));
    63     }
    64 
    65     static PassRefPtr<MediaStreamDescriptor> create(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents)
    66     {
    67         return adoptRef(new MediaStreamDescriptor(id, audioComponents, videoComponents));
    68     }
     61    static PassRefPtr<MediaStreamDescriptor> create(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources);
     62    static PassRefPtr<MediaStreamDescriptor> create(const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents);
    6963
    7064    MediaStreamDescriptorClient* client() const { return m_client; }
    … …  
    7670    MediaStreamComponent* audioComponent(unsigned index) const { return m_audioComponents[index].get(); }
    7771
    78     void addRemoteTrack(MediaStreamComponent* component)
    79     {
    80         if (m_client)
    81             m_client->addRemoteTrack(component);
    82         else
    83             addComponent(component);
    84     }
    85 
    86     void removeRemoteTrack(MediaStreamComponent* component)
    87     {
    88         if (m_client)
    89             m_client->removeRemoteTrack(component);
    90         else
    91             removeComponent(component);
    92     }
    93 
    9472    unsigned numberOfVideoComponents() const { return m_videoComponents.size(); }
    9573    MediaStreamComponent* videoComponent(unsigned index) const { return m_videoComponents[index].get(); }
    9674
    97     void addComponent(PassRefPtr<MediaStreamComponent> component)
    98     {
    99         switch (component->source()->type()) {
    100         case MediaStreamSource::TypeAudio:
    101             if (m_audioComponents.find(component) == notFound)
    102                 m_audioComponents.append(component);
    103             break;
    104         case MediaStreamSource::TypeVideo:
    105             if (m_videoComponents.find(component) == notFound)
    106                 m_videoComponents.append(component);
    107             break;
    108         }
    109     }
     75    void addComponent(PassRefPtr<MediaStreamComponent>);
     76    void removeComponent(PassRefPtr<MediaStreamComponent>);
    11077
    111     void removeComponent(PassRefPtr<MediaStreamComponent> component)
    112     {
    113         size_t pos = notFound;
    114         switch (component->source()->type()) {
    115         case MediaStreamSource::TypeAudio:
    116             pos = m_audioComponents.find(component);
    117             if (pos != notFound)
    118                 m_audioComponents.remove(pos);
    119             break;
    120         case MediaStreamSource::TypeVideo:
    121             pos = m_videoComponents.find(component);
    122             if (pos != notFound)
    123                 m_videoComponents.remove(pos);
    124             break;
    125         }
    126     }
     78    void addRemoteTrack(MediaStreamComponent*);
     79    void removeRemoteTrack(MediaStreamComponent*);
    12780
    12881    bool ended() const { return m_ended; }
    … …  
    13386
    13487private:
    135     MediaStreamDescriptor(const String& id, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
    136         : m_client(0)
    137         , m_id(id)
    138         , m_ended(false)
    139     {
    140         ASSERT(m_id.length());
    141         for (size_t i = 0; i < audioSources.size(); i++)
    142             m_audioComponents.append(MediaStreamComponent::create(this, audioSources[i]));
    143 
    144         for (size_t i = 0; i < videoSources.size(); i++)
    145             m_videoComponents.append(MediaStreamComponent::create(this, videoSources[i]));
    146     }
    147 
    148     MediaStreamDescriptor(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents)
    149         : m_client(0)
    150         , m_id(id)
    151         , m_ended(false)
    152     {
    153         ASSERT(m_id.length());
    154         for (MediaStreamComponentVector::const_iterator iter = audioComponents.begin(); iter != audioComponents.end(); ++iter) {
    155             (*iter)->setStream(this);
    156             m_audioComponents.append((*iter));
    157         }
    158         for (MediaStreamComponentVector::const_iterator iter = videoComponents.begin(); iter != videoComponents.end(); ++iter) {
    159             (*iter)->setStream(this);
    160             m_videoComponents.append((*iter));
    161         }
    162     }
     88    MediaStreamDescriptor(const String& id, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources);
     89    MediaStreamDescriptor(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents);
    16390
    16491    MediaStreamDescriptorClient* m_client;
Note: See TracChangeset for help on using the changeset viewer.