diff --git a/dom/media/webrtc/jsapi/MediaTransportHandler.cpp b/dom/media/webrtc/jsapi/MediaTransportHandler.cpp index f39fb77df0ad..04c7b44485b6 100644 --- a/dom/media/webrtc/jsapi/MediaTransportHandler.cpp +++ b/dom/media/webrtc/jsapi/MediaTransportHandler.cpp @@ -88,7 +88,7 @@ class MediaTransportHandlerSTS : public MediaTransportHandler, void EnsureProvisionalTransport(const std::string& aTransportId, const std::string& aUfrag, const std::string& aPwd, - size_t aComponentCount) override; + int aComponentCount) override; void SetTargetForDefaultLocalAddressLookup(const std::string& aTargetIp, uint16_t aTargetPort) override; @@ -734,7 +734,7 @@ void MediaTransportHandlerSTS::SetProxyConfig( void MediaTransportHandlerSTS::EnsureProvisionalTransport( const std::string& aTransportId, const std::string& aUfrag, - const std::string& aPwd, size_t aComponentCount) { + const std::string& aPwd, int aComponentCount) { MOZ_RELEASE_ASSERT(mInitPromise); mInitPromise->Then( @@ -746,9 +746,9 @@ void MediaTransportHandlerSTS::EnsureProvisionalTransport( RefPtr stream(mIceCtx->GetStream(aTransportId)); if (!stream) { - CSFLogDebug(LOGTAG, "%s: Creating ICE media stream=%s components=%u", + CSFLogDebug(LOGTAG, "%s: Creating ICE media stream=%s components=%d", mIceCtx->name().c_str(), aTransportId.c_str(), - static_cast(aComponentCount)); + aComponentCount); std::ostringstream os; os << mIceCtx->name() << " transport-id=" << aTransportId; diff --git a/dom/media/webrtc/jsapi/MediaTransportHandler.h b/dom/media/webrtc/jsapi/MediaTransportHandler.h index f8f355d66525..77d4c3647029 100644 --- a/dom/media/webrtc/jsapi/MediaTransportHandler.h +++ b/dom/media/webrtc/jsapi/MediaTransportHandler.h @@ -74,7 +74,7 @@ class MediaTransportHandler { virtual void EnsureProvisionalTransport(const std::string& aTransportId, const std::string& aLocalUfrag, const std::string& aLocalPwd, - size_t aComponentCount) = 0; + int aComponentCount) = 0; virtual void SetTargetForDefaultLocalAddressLookup( const std::string& aTargetIp, uint16_t aTargetPort) = 0; diff --git a/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.cpp b/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.cpp index e05b52826854..e95417c355c2 100644 --- a/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.cpp +++ b/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.cpp @@ -179,7 +179,7 @@ void MediaTransportHandlerIPC::SetProxyConfig( void MediaTransportHandlerIPC::EnsureProvisionalTransport( const std::string& aTransportId, const std::string& aLocalUfrag, - const std::string& aLocalPwd, size_t aComponentCount) { + const std::string& aLocalPwd, int aComponentCount) { mInitPromise->Then( mCallbackThread, __func__, [=, self = RefPtr(this)](bool /*dummy*/) { diff --git a/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.h b/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.h index 05df596ca3c6..60f38d682c68 100644 --- a/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.h +++ b/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.h @@ -33,7 +33,7 @@ class MediaTransportHandlerIPC : public MediaTransportHandler { void EnsureProvisionalTransport(const std::string& aTransportId, const std::string& aLocalUfrag, const std::string& aLocalPwd, - size_t aComponentCount) override; + int aComponentCount) override; void SetTargetForDefaultLocalAddressLookup(const std::string& aTargetIp, uint16_t aTargetPort) override; diff --git a/media/webrtc/signaling/gtest/mediapipeline_unittest.cpp b/media/webrtc/signaling/gtest/mediapipeline_unittest.cpp index c2ac022bafaa..4be9f2c027e3 100644 --- a/media/webrtc/signaling/gtest/mediapipeline_unittest.cpp +++ b/media/webrtc/signaling/gtest/mediapipeline_unittest.cpp @@ -204,7 +204,7 @@ class LoopbackTransport : public MediaTransportHandler { void EnsureProvisionalTransport(const std::string& aTransportId, const std::string& aLocalUfrag, const std::string& aLocalPwd, - size_t aComponentCount) override {} + int aComponentCount) override {} void SetTargetForDefaultLocalAddressLookup(const std::string& aTargetIp, uint16_t aTargetPort) override {}