Bug 1664900 - P3 - mv media-conduit to libwebrtcglue;r=dminor

Differential Revision: https://phabricator.services.mozilla.com/D90949

dom/bindings/moz.build

@@ -80,7 +80,7 @@ LOCAL_INCLUDES += [
     '/dom/media/webaudio',
     '/dom/media/webrtc',
     '/dom/media/webrtc/common/time_profiling',
-    '/dom/media/webrtc/media-conduit',
+    '/dom/media/webrtc/libwebrtcglue',
     '/dom/media/webrtc/peerconnection',
     '/dom/media/webrtc/transport',
     '/dom/media/webspeech/recognition',

dom/media/bridge/moz.build

@@ -17,7 +17,7 @@ SOURCES += [
 LOCAL_INCLUDES += [
     '/dom/media/webrtc/',
     '/dom/media/webrtc/common/time_profiling',
-    '/dom/media/webrtc/media-conduit',
+    '/dom/media/webrtc/libwebrtcglue',
     '/dom/media/webrtc/mediapipeline',
     '/dom/media/webrtc/peerconnection',
     '/dom/media/webrtc/transport',

dom/media/webrtc/jsep/JsepTrack.h

@@ -21,7 +21,7 @@
 #include "sdp/Sdp.h"
 #include "sdp/SdpAttribute.h"
 #include "sdp/SdpMediaSection.h"
-#include "media-conduit/RtpRtcpConfig.h"
+#include "libwebrtcglue/RtpRtcpConfig.h"
 namespace mozilla {
 
 class JsepTrackNegotiatedDetails {

dom/media/webrtc/mediapipeline/MediaPipeline.cpp

@@ -46,7 +46,7 @@
 #include "transport/runnable_utils.h"
 #include "peerconnection/MediaTransportHandler.h"
 #include "Tracing.h"
-#include "media-conduit/WebrtcImageBuffer.h"
+#include "libwebrtcglue/WebrtcImageBuffer.h"
 #include "webrtc/common_video/include/video_frame_buffer.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 

dom/media/webrtc/mediapipeline/MediaPipeline.h

@@ -13,7 +13,7 @@
 #include "transport/sigslot.h"
 #include "transport/transportlayer.h"  // For TransportLayer::State
 
-#include "media-conduit/MediaConduitInterface.h"
+#include "libwebrtcglue/MediaConduitInterface.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "mozilla/Atomics.h"
 #include "transport/SrtpFlow.h"  // For SRTP_MAX_EXPANSION

dom/media/webrtc/moz.build

@@ -15,7 +15,7 @@ with Files('common/**'):
     BUG_COMPONENT = ('CORE', 'WebRTC: Signaling')
 with Files('jsep/**'):
     BUG_COMPONENT = ('CORE', 'WebRTC: Signaling')
-with Files('media-conduit/**'):
+with Files('libwebrtcglue/**'):
     BUG_COMPONENT = ('CORE', 'WebRTC: Signaling')
 with Files('mediapipeline/**'):
     BUG_COMPONENT = ('CORE', 'WebRTC: Signaling')
@@ -70,7 +70,7 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']:
     DIRS += [
         'common',
         'jsep',
-        'media-conduit',
+        'libwebrtcglue',
         'mediapipeline',
         'peerconnection',
         'sdp'

dom/media/webrtc/peerconnection/PeerConnectionImpl.cpp

@@ -28,8 +28,8 @@
 #include "nsProxyRelease.h"
 #include "prtime.h"
 
-#include "media-conduit/AudioConduit.h"
-#include "media-conduit/VideoConduit.h"
+#include "libwebrtcglue/AudioConduit.h"
+#include "libwebrtcglue/VideoConduit.h"
 #include "MediaTrackGraph.h"
 #include "transport/runnable_utils.h"
 #include "IPeerConnection.h"

dom/media/webrtc/peerconnection/PeerConnectionMedia.cpp

@@ -28,7 +28,7 @@
 #include "mozilla/net/NeckoChild.h"
 #include "mozilla/net/WebrtcProxyConfig.h"
 #include "MediaManager.h"
-#include "media-conduit/WebrtcGmpVideoCodec.h"
+#include "libwebrtcglue/WebrtcGmpVideoCodec.h"
 
 namespace mozilla {
 using namespace dom;

dom/media/webrtc/peerconnection/RTCDTMFSender.cpp

@@ -3,7 +3,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "RTCDTMFSender.h"
-#include "media-conduit/MediaConduitInterface.h"
+#include "libwebrtcglue/MediaConduitInterface.h"
 #include "transport/logging.h"
 #include "TransceiverImpl.h"
 #include "nsITimer.h"

dom/media/webrtc/peerconnection/RTCRtpReceiver.cpp

@@ -14,7 +14,7 @@
 #include "mozilla/NullPrincipal.h"
 #include "MediaTrackGraph.h"
 #include "RemoteTrackSource.h"
-#include "media-conduit/RtpRtcpConfig.h"
+#include "libwebrtcglue/RtpRtcpConfig.h"
 #include "nsString.h"
 #include "mozilla/dom/AudioStreamTrack.h"
 #include "mozilla/dom/VideoStreamTrack.h"
@@ -25,7 +25,7 @@
 #include "RTCStatsReport.h"
 #include "mozilla/Preferences.h"
 #include "TransceiverImpl.h"
-#include "media-conduit/AudioConduit.h"
+#include "libwebrtcglue/AudioConduit.h"
 
 namespace mozilla {
 

dom/media/webrtc/peerconnection/RTCRtpReceiver.h

@@ -13,7 +13,7 @@
 #include "nsTArray.h"
 #include "mozilla/dom/RTCStatsReportBinding.h"
 #include "RTCStatsReport.h"
-#include "media-conduit/RtcpEventObserver.h"
+#include "libwebrtcglue/RtcpEventObserver.h"
 #include <vector>
 
 class nsPIDOMWindowInner;

dom/media/webrtc/peerconnection/TransceiverImpl.cpp

@@ -6,8 +6,8 @@
 #include "mozilla/UniquePtr.h"
 #include <string>
 #include <vector>
-#include "media-conduit/AudioConduit.h"
-#include "media-conduit/VideoConduit.h"
+#include "libwebrtcglue/AudioConduit.h"
+#include "libwebrtcglue/VideoConduit.h"
 #include "MediaTrackGraph.h"
 #include "mediapipeline/MediaPipeline.h"
 #include "mediapipeline/MediaPipelineFilter.h"
@@ -19,7 +19,7 @@
 #include "nsIPrincipal.h"
 #include "MediaSegment.h"
 #include "RemoteTrackSource.h"
-#include "media-conduit/RtpRtcpConfig.h"
+#include "libwebrtcglue/RtpRtcpConfig.h"
 #include "MediaTransportHandler.h"
 #include "mozilla/dom/RTCRtpReceiverBinding.h"
 #include "mozilla/dom/RTCRtpSenderBinding.h"
@@ -27,7 +27,7 @@
 #include "mozilla/dom/TransceiverImplBinding.h"
 #include "RTCRtpReceiver.h"
 #include "RTCDTMFSender.h"
-#include "media-conduit/WebrtcGmpVideoCodec.h"
+#include "libwebrtcglue/WebrtcGmpVideoCodec.h"
 
 namespace mozilla {
 

media/webrtc/signaling/gtest/moz.build

@@ -21,7 +21,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'uikit' and CONFIG['OS_TARGET'] != 'Android'
       '/dom/media/webrtc',
       '/dom/media/webrtc/common',
       '/dom/media/webrtc/common/time_profiling',
-      '/dom/media/webrtc/media-conduit',
+      '/dom/media/webrtc/libwebrtcglue',
       '/dom/media/webrtc/mediapipeline',
       '/dom/media/webrtc/peerconnection',
       '/dom/media/webrtc/transport',

tools/lint/rejected-words.yml

@@ -123,7 +123,7 @@ avoid-blacklist-and-whitelist:
         - dom/media/test/test_autoplay_policy_key_blacklist.html
         - dom/media/test/test_autoplay_policy_permission.html
         - dom/media/webm/WebMDecoder.cpp
-        - dom/media/webrtc/media-conduit/VideoConduit.cpp
+        - dom/media/webrtc/libwebrtcglue/VideoConduit.cpp
         - dom/media/webrtc/peerconnection/PeerConnectionMedia.cpp
         - dom/media/webrtc/transport/stun_socket_filter.cpp
         - dom/media/webrtc/transport/test/ice_unittest.cpp