Changeset 181893 in webkit
- Timestamp:
- Mar 24, 2015 8:18:21 AM (9 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 added
- 1 deleted
- 3 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r181892 r181893 1 2015-03-17 Philippe Normand <pnormand@igalia.com> 2 3 [OpenWebRTC] RealtimeMediaSourceCenter implementation 4 https://bugs.webkit.org/show_bug.cgi?id=142476 5 6 Reviewed by Eric Carlson. 7 8 The old GStreamer MediaStreamCenter is replaced by the OpenWebRTC 9 RealtimeMediaSourceCenter. It is not yet able to correctly assess 10 MediaConstraints so it selects the first audio/video sources 11 available through OpenWebRTC. 12 13 * PlatformEfl.cmake: Add new files to the build. 14 * PlatformGTK.cmake: Ditto. 15 * platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp: Removed. 16 * platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp: Added. 17 (WebCore::initializeOpenWebRTC): Simple function to initialize the 18 framework, it is going to be used by the PeerConnection backend as well. 19 * platform/mediastream/openwebrtc/OpenWebRTCUtilities.h: Added. 20 * platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp: Added. 21 (WebCore::mediaSourcesAvailableCallback): Function invoked once 22 the media sources discovery succeeded within OpenWebRTC. 23 (WebCore::RealtimeMediaSourceCenter::platformCenter): Instantiate 24 the OpenWebRTC RealtimeMediaSourceCenter. 25 (WebCore::RealtimeMediaSourceCenterOwr::RealtimeMediaSourceCenterOwr): 26 (WebCore::RealtimeMediaSourceCenterOwr::~RealtimeMediaSourceCenterOwr): 27 (WebCore::RealtimeMediaSourceCenterOwr::validateRequestConstraints): 28 Schedule a discovery process for the capture sources. 29 (WebCore::RealtimeMediaSourceCenterOwr::createMediaStream): Pick 30 the first audio/video sources and create a MediaStream accordingly. 31 (WebCore::RealtimeMediaSourceCenterOwr::getMediaStreamTrackSources): 32 Not yet implemented. 33 (WebCore::RealtimeMediaSourceCenterOwr::mediaSourcesAvailable): 34 Method invoked once the capture sources process succeeded. Parse 35 them and create an internal cache of RealtimeMediaSources accordingly. 36 (WebCore::RealtimeMediaSourceCenterOwr::firstSource): Utility 37 function to fetch the first source of the given type from the 38 RealtimeMediaSources cache. 39 * platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.h: Renamed from Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h. 40 * platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h: Added. 41 1 42 2015-03-24 Csaba Osztrogonác <ossy@webkit.org> 2 43 -
trunk/Source/WebCore/PlatformEfl.cmake
r181892 r181893 19 19 "${WEBCORE_DIR}/platform/graphics/texmap/coordinated" 20 20 "${WEBCORE_DIR}/platform/linux" 21 "${WEBCORE_DIR}/platform/mediastream/ gstreamer"21 "${WEBCORE_DIR}/platform/mediastream/openwebrtc" 22 22 "${WEBCORE_DIR}/platform/mock/mediasource" 23 23 "${WEBCORE_DIR}/platform/network/soup" … … 214 214 platform/linux/MemoryPressureHandlerLinux.cpp 215 215 216 platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp 216 platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp 217 platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp 217 218 218 219 platform/network/efl/NetworkStateNotifierEfl.cpp -
trunk/Source/WebCore/PlatformGTK.cmake
r181624 r181893 17 17 "${WEBCORE_DIR}/platform/graphics/wayland" 18 18 "${WEBCORE_DIR}/platform/linux" 19 "${WEBCORE_DIR}/platform/mediastream/ gstreamer"19 "${WEBCORE_DIR}/platform/mediastream/openwebrtc" 20 20 "${WEBCORE_DIR}/platform/mock/mediasource" 21 21 "${WEBCORE_DIR}/platform/network/gtk" … … 154 154 platform/linux/MemoryPressureHandlerLinux.cpp 155 155 156 platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp 156 platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp 157 platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp 157 158 158 159 platform/network/soup/AuthenticationChallengeSoup.cpp -
trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.h
r181892 r181893 2 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. 3 3 * Copyright (C) 2012 Google Inc. All rights reserved. 4 * Copyright (C) 2015 Igalia S.L. All rights reserved. 5 * Copyright (C) 2015 Metrological. All rights reserved. 4 6 * 5 7 * Redistribution and use in source and binary forms, with or without … … 30 32 */ 31 33 32 #ifndef MediaStreamCenterGStreamer_h33 #define MediaStreamCenterGStreamer_h34 #ifndef RealtimeMediaSourceCenterOwr_h 35 #define RealtimeMediaSourceCenterOwr_h 34 36 35 #if ENABLE(MEDIA_STREAM) 37 #if ENABLE(MEDIA_STREAM) && USE(OPENWEBRTC) 36 38 37 39 #include "RealtimeMediaSourceCenter.h" 38 40 41 #include "RealtimeMediaSourceOwr.h" 39 42 #include <wtf/PassRefPtr.h> 40 #include <wtf/text/WTFString.h>41 43 42 44 namespace WebCore { … … 46 48 class MediaStreamSourcesQueryClient; 47 49 48 class MediaStreamCenterGStreamer: public RealtimeMediaSourceCenter {50 class RealtimeMediaSourceCenterOwr final : public RealtimeMediaSourceCenter { 49 51 public: 50 MediaStreamCenterGStreamer();51 ~ MediaStreamCenterGStreamer();52 RealtimeMediaSourceCenterOwr(); 53 ~RealtimeMediaSourceCenterOwr(); 52 54 53 55 virtual void validateRequestConstraints(PassRefPtr<MediaStreamCreationClient>, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints); 54 56 virtual void createMediaStream(PassRefPtr<MediaStreamCreationClient>, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints); 55 57 virtual bool getMediaStreamTrackSources(PassRefPtr<MediaStreamTrackSourcesRequestClient>) override; 58 59 void mediaSourcesAvailable(GList* sources); 60 61 private: 62 PassRefPtr<RealtimeMediaSource> firstSource(RealtimeMediaSource::Type); 63 RealtimeMediaSourceOwrMap m_sourceMap; 64 RefPtr<MediaStreamCreationClient> m_client; 56 65 }; 57 66 58 67 } // namespace WebCore 59 68 60 #endif // ENABLE(MEDIA_STREAM) 69 #endif // ENABLE(MEDIA_STREAM) && USE(OPENWEBRTC) 61 70 62 #endif // MediaStreamCenterGStreamer_h71 #endif // RealtimeMediaSourceCenterOwr_h
Note: See TracChangeset
for help on using the changeset viewer.