Changeset 155362 in webkit
- Timestamp:
- Sep 9, 2013 10:48:51 AM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r155361 r155362 1 2013-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 1 22 2013-09-09 ChangSeok Oh <changseok.oh@collabora.com> 2 23 -
trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp
r155249 r155362 168 168 } 169 169 170 void MediaStream::removeTrack(PassRefPtr<MediaStreamTrack> prpTrack 170 void MediaStream::removeTrack(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionCode& ec) 171 171 { 172 172 if (ended()) { … … 281 281 switch (component->source()->type()) { 282 282 case MediaStreamSource::TypeAudio: 283 m_descriptor->addAudioComponent(component); 283 284 m_audioTracks.append(track); 284 285 break; 285 286 case MediaStreamSource::TypeVideo: 287 m_descriptor->addVideoComponent(component); 286 288 m_videoTracks.append(track); 287 289 break; … … 316 318 return; 317 319 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 318 329 RefPtr<MediaStreamTrack> track = (*tracks)[index]; 319 330 tracks->remove(index); -
trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp
r139775 r155362 57 57 } 58 58 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 73 59 } // namespace WebCore 74 60 -
trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h
r134084 r155362 52 52 virtual void queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClient>) = 0; 53 53 54 // FIXME: add a way to mute a MediaStreamSource from the WebKit API layer55 56 54 // Calls from the DOM objects to notify the platform 57 55 virtual void didSetMediaStreamTrackEnabled(MediaStreamDescriptor*, MediaStreamComponent*) = 0; … … 65 63 66 64 void endLocalMediaStream(MediaStreamDescriptor*); 67 void addMediaStreamTrack(MediaStreamDescriptor*, MediaStreamComponent*);68 void removeMediaStreamTrack(MediaStreamDescriptor*, MediaStreamComponent*);69 65 }; 70 66 -
trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.h
r155249 r155362 78 78 void removeAudioComponent(MediaStreamComponent* component) 79 79 { 80 size_t pos = m_ audioComponents.find(component);80 size_t pos = m_videoComponents.find(component); 81 81 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); 83 95 } 84 96
Note: See TracChangeset
for help on using the changeset viewer.