diff --git a/media/base/media_channel.cc b/media/base/media_channel.cc index 11953c2c5b..5d59dba5b5 100644 --- a/media/base/media_channel.cc +++ b/media/base/media_channel.cc @@ -26,14 +26,8 @@ VideoOptions::VideoOptions() : content_hint(VideoTrackInterface::ContentHint::kNone) {} VideoOptions::~VideoOptions() = default; -MediaChannel::MediaChannel(const MediaConfig& config, - TaskQueueBase* network_thread) - : enable_dscp_(config.enable_dscp), - network_safety_(PendingTaskSafetyFlag::CreateDetachedInactive()), - network_thread_(network_thread) {} - -MediaChannel::MediaChannel(TaskQueueBase* network_thread) - : enable_dscp_(false), +MediaChannel::MediaChannel(TaskQueueBase* network_thread, bool enable_dscp) + : enable_dscp_(enable_dscp), network_safety_(PendingTaskSafetyFlag::CreateDetachedInactive()), network_thread_(network_thread) {} diff --git a/media/base/media_channel.h b/media/base/media_channel.h index b3ceb3930f..89f316e09d 100644 --- a/media/base/media_channel.h +++ b/media/base/media_channel.h @@ -38,7 +38,6 @@ #include "common_video/include/quality_limitation_reason.h" #include "media/base/codec.h" #include "media/base/delayable.h" -#include "media/base/media_config.h" #include "media/base/media_constants.h" #include "media/base/stream_params.h" #include "modules/audio_processing/include/audio_processing_statistics.h" @@ -170,9 +169,8 @@ class MediaChannel { virtual ~NetworkInterface() {} }; - MediaChannel(const MediaConfig& config, - webrtc::TaskQueueBase* network_thread); - explicit MediaChannel(webrtc::TaskQueueBase* network_thread); + explicit MediaChannel(webrtc::TaskQueueBase* network_thread, + bool enable_dscp = false); virtual ~MediaChannel(); virtual cricket::MediaType media_type() const = 0; @@ -774,11 +772,9 @@ struct AudioRecvParameters : RtpParameters {}; class VoiceMediaChannel : public MediaChannel, public Delayable { public: - explicit VoiceMediaChannel(webrtc::TaskQueueBase* network_thread) - : MediaChannel(network_thread) {} - VoiceMediaChannel(const MediaConfig& config, - webrtc::TaskQueueBase* network_thread) - : MediaChannel(config, network_thread) {} + VoiceMediaChannel(webrtc::TaskQueueBase* network_thread, + bool enable_dscp = false) + : MediaChannel(network_thread, enable_dscp) {} ~VoiceMediaChannel() override {} cricket::MediaType media_type() const override; @@ -846,11 +842,9 @@ struct VideoRecvParameters : RtpParameters {}; class VideoMediaChannel : public MediaChannel, public Delayable { public: - explicit VideoMediaChannel(webrtc::TaskQueueBase* network_thread) - : MediaChannel(network_thread) {} - VideoMediaChannel(const MediaConfig& config, - webrtc::TaskQueueBase* network_thread) - : MediaChannel(config, network_thread) {} + explicit VideoMediaChannel(webrtc::TaskQueueBase* network_thread, + bool enable_dscp = false) + : MediaChannel(network_thread, enable_dscp) {} ~VideoMediaChannel() override {} cricket::MediaType media_type() const override; diff --git a/media/base/media_engine.h b/media/base/media_engine.h index 6f47127f30..500e1ba5e5 100644 --- a/media/base/media_engine.h +++ b/media/base/media_engine.h @@ -24,6 +24,7 @@ #include "call/audio_state.h" #include "media/base/codec.h" #include "media/base/media_channel.h" +#include "media/base/media_config.h" #include "media/base/video_common.h" #include "rtc_base/system/file_wrapper.h" diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc index fe1dca27ea..dcfa0b52e3 100644 --- a/media/engine/webrtc_video_engine.cc +++ b/media/engine/webrtc_video_engine.cc @@ -684,7 +684,7 @@ WebRtcVideoChannel::WebRtcVideoChannel( webrtc::VideoEncoderFactory* encoder_factory, webrtc::VideoDecoderFactory* decoder_factory, webrtc::VideoBitrateAllocatorFactory* bitrate_allocator_factory) - : VideoMediaChannel(config, call->network_thread()), + : VideoMediaChannel(call->network_thread(), config.enable_dscp), worker_thread_(call->worker_thread()), call_(call), unsignalled_ssrc_handler_(&default_unsignalled_ssrc_handler_), diff --git a/media/engine/webrtc_voice_engine.cc b/media/engine/webrtc_voice_engine.cc index 77b475bc31..18399c3c6a 100644 --- a/media/engine/webrtc_voice_engine.cc +++ b/media/engine/webrtc_voice_engine.cc @@ -1332,7 +1332,7 @@ WebRtcVoiceMediaChannel::WebRtcVoiceMediaChannel( const AudioOptions& options, const webrtc::CryptoOptions& crypto_options, webrtc::Call* call) - : VoiceMediaChannel(config, call->network_thread()), + : VoiceMediaChannel(call->network_thread(), config.enable_dscp), worker_thread_(call->worker_thread()), engine_(engine), call_(call),