admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Set(Send|Recv)Parameters Set(Sender|Receiver)Parameters

Browse Source 
following the previous change to rename the classes derived from
  cricket::RtpParameters

Also rename ChangedRecvParameters to ChangedReceiveParameters.

BUG=webrtc:13931

Change-Id: Ia51dd39905a5cbb98162c3948930e43ccaf3786d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/314500
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40677}
This commit is contained in:
Philipp Hancke 2023-08-25 15:28:47 +02:00 committed by WebRTC LUCI CQ
parent 374c38786f
commit 5866e1a0ed
15 changed files with 470 additions and 470 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
media/base/fake_media_engine.cc
View File

@ -76,7 +76,7 @@ const AudioOptions& FakeVoiceMediaReceiveChannel::options() const {
int FakeVoiceMediaReceiveChannel::max_bps() const { int FakeVoiceMediaReceiveChannel::max_bps() const {
return max_bps_; return max_bps_;
} }
bool FakeVoiceMediaReceiveChannel::SetRecvParameters( bool FakeVoiceMediaReceiveChannel::SetReceiverParameters(
const AudioReceiverParameters& params) { const AudioReceiverParameters& params) {
set_recv_rtcp_parameters(params.rtcp); set_recv_rtcp_parameters(params.rtcp);
return (SetRecvCodecs(params.codecs) && return (SetRecvCodecs(params.codecs) &&
@ -235,7 +235,7 @@ const AudioOptions& FakeVoiceMediaSendChannel::options() const {
int FakeVoiceMediaSendChannel::max_bps() const { int FakeVoiceMediaSendChannel::max_bps() const {
return max_bps_; return max_bps_;
} }
bool FakeVoiceMediaSendChannel::SetSendParameters( bool FakeVoiceMediaSendChannel::SetSenderParameters(
const AudioSenderParameter& params) { const AudioSenderParameter& params) {
set_send_rtcp_parameters(params.rtcp); set_send_rtcp_parameters(params.rtcp);
SetExtmapAllowMixed(params.extmap_allow_mixed); SetExtmapAllowMixed(params.extmap_allow_mixed);
@ -355,7 +355,7 @@ const VideoOptions& FakeVideoMediaSendChannel::options() const {
int FakeVideoMediaSendChannel::max_bps() const { int FakeVideoMediaSendChannel::max_bps() const {
return max_bps_; return max_bps_;
} }
bool FakeVideoMediaSendChannel::SetSendParameters( bool FakeVideoMediaSendChannel::SetSenderParameters(
const VideoSenderParameters& params) { const VideoSenderParameters& params) {
set_send_rtcp_parameters(params.rtcp); set_send_rtcp_parameters(params.rtcp);
SetExtmapAllowMixed(params.extmap_allow_mixed); SetExtmapAllowMixed(params.extmap_allow_mixed);
@ -441,7 +441,7 @@ FakeVideoMediaReceiveChannel::sinks() const {
int FakeVideoMediaReceiveChannel::max_bps() const { int FakeVideoMediaReceiveChannel::max_bps() const {
return max_bps_; return max_bps_;
} }
bool FakeVideoMediaReceiveChannel::SetRecvParameters( bool FakeVideoMediaReceiveChannel::SetReceiverParameters(
const VideoReceiverParameters& params) { const VideoReceiverParameters& params) {
set_recv_rtcp_parameters(params.rtcp); set_recv_rtcp_parameters(params.rtcp);
return (SetRecvCodecs(params.codecs) && return (SetRecvCodecs(params.codecs) &&

10
media/base/fake_media_engine.h
View File

@ -118,7 +118,7 @@ class RtpReceiveChannelHelper : public Base, public MediaChannelUtil {
return RemoveStreamBySsrc(&receive_streams_, ssrc); return RemoveStreamBySsrc(&receive_streams_, ssrc);
} }
webrtc::RtpParameters GetRtpReceiveParameters(uint32_t ssrc) const override { webrtc::RtpParameters GetRtpReceiverParameters(uint32_t ssrc) const override {
auto parameters_iterator = rtp_receive_parameters_.find(ssrc); auto parameters_iterator = rtp_receive_parameters_.find(ssrc);
if (parameters_iterator != rtp_receive_parameters_.end()) { if (parameters_iterator != rtp_receive_parameters_.end()) {
return parameters_iterator->second; return parameters_iterator->second;
@ -469,7 +469,7 @@ class FakeVoiceMediaReceiveChannel
return cricket::MEDIA_TYPE_AUDIO; return cricket::MEDIA_TYPE_AUDIO;
} }
bool SetRecvParameters(const AudioReceiverParameters& params) override; bool SetReceiverParameters(const AudioReceiverParameters& params) override;
void SetPlayout(bool playout) override; void SetPlayout(bool playout) override;
bool AddRecvStream(const StreamParams& sp) override; bool AddRecvStream(const StreamParams& sp) override;
@ -559,7 +559,7 @@ class FakeVoiceMediaSendChannel
return cricket::MEDIA_TYPE_AUDIO; return cricket::MEDIA_TYPE_AUDIO;
} }
bool SetSendParameters(const AudioSenderParameter& params) override; bool SetSenderParameters(const AudioSenderParameter& params) override;
void SetSend(bool send) override; void SetSend(bool send) override;
bool SetAudioSend(uint32_t ssrc, bool SetAudioSend(uint32_t ssrc,
bool enable, bool enable,
@ -644,7 +644,7 @@ class FakeVideoMediaReceiveChannel
const std::map<uint32_t, rtc::VideoSinkInterface<webrtc::VideoFrame>*>& const std::map<uint32_t, rtc::VideoSinkInterface<webrtc::VideoFrame>*>&
sinks() const; sinks() const;
int max_bps() const; int max_bps() const;
bool SetRecvParameters(const VideoReceiverParameters& params) override; bool SetReceiverParameters(const VideoReceiverParameters& params) override;
bool SetSink(uint32_t ssrc, bool SetSink(uint32_t ssrc,
rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) override; rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) override;
@ -717,7 +717,7 @@ class FakeVideoMediaSendChannel
const std::map<uint32_t, rtc::VideoSinkInterface<webrtc::VideoFrame>*>& const std::map<uint32_t, rtc::VideoSinkInterface<webrtc::VideoFrame>*>&
sinks() const; sinks() const;
int max_bps() const; int max_bps() const;
bool SetSendParameters(const VideoSenderParameters& params) override; bool SetSenderParameters(const VideoSenderParameters& params) override;
absl::optional<Codec> GetSendCodec() const override; absl::optional<Codec> GetSendCodec() const override;

12
media/base/media_channel.h
View File

@ -872,7 +872,7 @@ struct AudioReceiverParameters : MediaChannelParameters {};
class VoiceMediaSendChannelInterface : public MediaSendChannelInterface { class VoiceMediaSendChannelInterface : public MediaSendChannelInterface {
public: public:
virtual bool SetSendParameters(const AudioSenderParameter& params) = 0; virtual bool SetSenderParameters(const AudioSenderParameter& params) = 0;
// Starts or stops sending (and potentially capture) of local audio. // Starts or stops sending (and potentially capture) of local audio.
virtual void SetSend(bool send) = 0; virtual void SetSend(bool send) = 0;
// Configure stream for sending. // Configure stream for sending.
@ -894,9 +894,9 @@ class VoiceMediaSendChannelInterface : public MediaSendChannelInterface {
class VoiceMediaReceiveChannelInterface : public MediaReceiveChannelInterface { class VoiceMediaReceiveChannelInterface : public MediaReceiveChannelInterface {
public: public:
virtual bool SetRecvParameters(const AudioReceiverParameters& params) = 0; virtual bool SetReceiverParameters(const AudioReceiverParameters& params) = 0;
// Get the receive parameters for the incoming stream identified by `ssrc`. // Get the receive parameters for the incoming stream identified by `ssrc`.
virtual webrtc::RtpParameters GetRtpReceiveParameters( virtual webrtc::RtpParameters GetRtpReceiverParameters(
uint32_t ssrc) const = 0; uint32_t ssrc) const = 0;
virtual std::vector<webrtc::RtpSource> GetSources(uint32_t ssrc) const = 0; virtual std::vector<webrtc::RtpSource> GetSources(uint32_t ssrc) const = 0;
// Retrieve the receive parameters for the default receive // Retrieve the receive parameters for the default receive
@ -937,7 +937,7 @@ struct VideoReceiverParameters : MediaChannelParameters {};
class VideoMediaSendChannelInterface : public MediaSendChannelInterface { class VideoMediaSendChannelInterface : public MediaSendChannelInterface {
public: public:
virtual bool SetSendParameters(const VideoSenderParameters& params) = 0; virtual bool SetSenderParameters(const VideoSenderParameters& params) = 0;
// Starts or stops transmission (and potentially capture) of local video. // Starts or stops transmission (and potentially capture) of local video.
virtual bool SetSend(bool send) = 0; virtual bool SetSend(bool send) = 0;
// Configure stream for sending and register a source. // Configure stream for sending and register a source.
@ -969,9 +969,9 @@ class VideoMediaSendChannelInterface : public MediaSendChannelInterface {
class VideoMediaReceiveChannelInterface : public MediaReceiveChannelInterface { class VideoMediaReceiveChannelInterface : public MediaReceiveChannelInterface {
public: public:
virtual bool SetRecvParameters(const VideoReceiverParameters& params) = 0; virtual bool SetReceiverParameters(const VideoReceiverParameters& params) = 0;
// Get the receive parameters for the incoming stream identified by `ssrc`. // Get the receive parameters for the incoming stream identified by `ssrc`.
virtual webrtc::RtpParameters GetRtpReceiveParameters( virtual webrtc::RtpParameters GetRtpReceiverParameters(
uint32_t ssrc) const = 0; uint32_t ssrc) const = 0;
// Starts or stops decoding of remote video. // Starts or stops decoding of remote video.
virtual void SetReceive(bool receive) = 0; virtual void SetReceive(bool receive) = 0;

64
media/engine/webrtc_video_engine.cc
View File

@ -666,8 +666,8 @@ bool NonFlexfecReceiveCodecsHaveChanged(std::vector<VideoCodecSettings> before,
absl::c_sort(after, comparison); absl::c_sort(after, comparison);
// Changes in FlexFEC payload type are handled separately in // Changes in FlexFEC payload type are handled separately in
// WebRtcVideoReceiveChannel::GetChangedRecvParameters, so disregard FlexFEC // WebRtcVideoReceiveChannel::GetChangedReceiverParameters, so disregard
// in the comparison here. // FlexFEC in the comparison here.
return !absl::c_equal(before, after, return !absl::c_equal(before, after,
VideoCodecSettings::EqualsDisregardingFlexfec); VideoCodecSettings::EqualsDisregardingFlexfec);
} }
@ -971,9 +971,9 @@ std::vector<VideoCodecSettings> WebRtcVideoSendChannel::SelectSendVideoCodecs(
return encoders; return encoders;
} }
bool WebRtcVideoSendChannel::GetChangedSendParameters( bool WebRtcVideoSendChannel::GetChangedSenderParameters(
const VideoSenderParameters& params, const VideoSenderParameters& params,
ChangedSendParameters* changed_params) const { ChangedSenderParameters* changed_params) const {
if (!ValidateCodecFormats(params.codecs) || if (!ValidateCodecFormats(params.codecs) ||
!ValidateRtpExtensions(params.extensions, send_rtp_extensions_)) { !ValidateRtpExtensions(params.extensions, send_rtp_extensions_)) {
return false; return false;
@ -1071,13 +1071,13 @@ bool WebRtcVideoSendChannel::GetChangedSendParameters(
return true; return true;
} }
bool WebRtcVideoSendChannel::SetSendParameters( bool WebRtcVideoSendChannel::SetSenderParameters(
const VideoSenderParameters& params) { const VideoSenderParameters& params) {
RTC_DCHECK_RUN_ON(&thread_checker_); RTC_DCHECK_RUN_ON(&thread_checker_);
TRACE_EVENT0("webrtc", "WebRtcVideoSendChannel::SetSendParameters"); TRACE_EVENT0("webrtc", "WebRtcVideoSendChannel::SetSenderParameters");
RTC_LOG(LS_INFO) << "SetSendParameters: " << params.ToString(); RTC_LOG(LS_INFO) << "SetSenderParameters: " << params.ToString();
ChangedSendParameters changed_params; ChangedSenderParameters changed_params;
if (!GetChangedSendParameters(params, &changed_params)) { if (!GetChangedSenderParameters(params, &changed_params)) {
return false; return false;
} }
@ -1103,7 +1103,7 @@ void WebRtcVideoSendChannel::RequestEncoderFallback() {
return; return;
} }
ChangedSendParameters params; ChangedSenderParameters params;
params.negotiated_codecs = negotiated_codecs_; params.negotiated_codecs = negotiated_codecs_;
params.negotiated_codecs->erase(params.negotiated_codecs->begin()); params.negotiated_codecs->erase(params.negotiated_codecs->begin());
params.send_codec = params.negotiated_codecs->front(); params.send_codec = params.negotiated_codecs->front();
@ -1136,7 +1136,7 @@ void WebRtcVideoSendChannel::RequestEncoderSwitch(
return; return;
} }
ChangedSendParameters params; ChangedSenderParameters params;
params.send_codec = new_codec_setting; params.send_codec = new_codec_setting;
ApplyChangedParams(params); ApplyChangedParams(params);
return; return;
@ -1153,7 +1153,7 @@ void WebRtcVideoSendChannel::RequestEncoderSwitch(
} }
bool WebRtcVideoSendChannel::ApplyChangedParams( bool WebRtcVideoSendChannel::ApplyChangedParams(
const ChangedSendParameters& changed_params) { const ChangedSenderParameters& changed_params) {
RTC_DCHECK_RUN_ON(&thread_checker_); RTC_DCHECK_RUN_ON(&thread_checker_);
if (changed_params.negotiated_codecs) if (changed_params.negotiated_codecs)
negotiated_codecs_ = *changed_params.negotiated_codecs; negotiated_codecs_ = *changed_params.negotiated_codecs;
@ -1208,7 +1208,7 @@ bool WebRtcVideoSendChannel::ApplyChangedParams(
} }
for (auto& kv : send_streams_) { for (auto& kv : send_streams_) {
kv.second->SetSendParameters(changed_params); kv.second->SetSenderParameters(changed_params);
} }
if (changed_params.send_codec || changed_params.rtcp_mode) { if (changed_params.send_codec || changed_params.rtcp_mode) {
if (send_codec_changed_callback_) { if (send_codec_changed_callback_) {
@ -1304,7 +1304,7 @@ webrtc::RTCError WebRtcVideoSendChannel::SetRtpSendParameters(
}); });
RTC_CHECK(matched_codec != negotiated_codecs_.end()); RTC_CHECK(matched_codec != negotiated_codecs_.end());
ChangedSendParameters params; ChangedSenderParameters params;
params.send_codec = *matched_codec; params.send_codec = *matched_codec;
ApplyChangedParams(params); ApplyChangedParams(params);
} }
@ -1841,8 +1841,8 @@ void WebRtcVideoSendChannel::WebRtcVideoSendStream::SetCodec(
RecreateWebRtcStream(); RecreateWebRtcStream();
} }
void WebRtcVideoSendChannel::WebRtcVideoSendStream::SetSendParameters( void WebRtcVideoSendChannel::WebRtcVideoSendStream::SetSenderParameters(
const ChangedSendParameters& params) { const ChangedSenderParameters& params) {
RTC_DCHECK_RUN_ON(&thread_checker_); RTC_DCHECK_RUN_ON(&thread_checker_);
// `recreate_stream` means construction-time parameters have changed and the // `recreate_stream` means construction-time parameters have changed and the
// sending stream needs to be reset with the new config. // sending stream needs to be reset with the new config.
@ -1884,7 +1884,7 @@ void WebRtcVideoSendChannel::WebRtcVideoSendStream::SetSendParameters(
} }
if (recreate_stream) { if (recreate_stream) {
RTC_LOG(LS_INFO) RTC_LOG(LS_INFO)
<< "RecreateWebRtcStream (send) because of SetSendParameters"; << "RecreateWebRtcStream (send) because of SetSenderParameters";
RecreateWebRtcStream(); RecreateWebRtcStream();
} }
} }
@ -2571,7 +2571,7 @@ void WebRtcVideoReceiveChannel::SetReceiverFeedbackParameters(
// Note: There is no place in config to store rtx_time. // Note: There is no place in config to store rtx_time.
} }
webrtc::RtpParameters WebRtcVideoReceiveChannel::GetRtpReceiveParameters( webrtc::RtpParameters WebRtcVideoReceiveChannel::GetRtpReceiverParameters(
uint32_t ssrc) const { uint32_t ssrc) const {
RTC_DCHECK_RUN_ON(&thread_checker_); RTC_DCHECK_RUN_ON(&thread_checker_);
webrtc::RtpParameters rtp_params; webrtc::RtpParameters rtp_params;
@ -2614,9 +2614,9 @@ WebRtcVideoReceiveChannel::GetDefaultRtpReceiveParameters() const {
return rtp_params; return rtp_params;
} }
bool WebRtcVideoReceiveChannel::GetChangedRecvParameters( bool WebRtcVideoReceiveChannel::GetChangedReceiverParameters(
const VideoReceiverParameters& params, const VideoReceiverParameters& params,
ChangedRecvParameters* changed_params) const { ChangedReceiverParameters* changed_params) const {
if (!ValidateCodecFormats(params.codecs) || if (!ValidateCodecFormats(params.codecs) ||
!ValidateRtpExtensions(params.extensions, recv_rtp_extensions_)) { !ValidateRtpExtensions(params.extensions, recv_rtp_extensions_)) {
return false; return false;
@ -2627,7 +2627,7 @@ bool WebRtcVideoReceiveChannel::GetChangedRecvParameters(
MapCodecs(params.codecs); MapCodecs(params.codecs);
if (mapped_codecs.empty()) { if (mapped_codecs.empty()) {
RTC_LOG(LS_ERROR) RTC_LOG(LS_ERROR)
<< "GetChangedRecvParameters called without any video codecs."; << "GetChangedReceiverParameters called without any video codecs.";
return false; return false;
} }
@ -2639,9 +2639,9 @@ bool WebRtcVideoReceiveChannel::GetChangedRecvParameters(
/*include_rtx=*/true, call_->trials()); /*include_rtx=*/true, call_->trials());
for (const VideoCodecSettings& mapped_codec : mapped_codecs) { for (const VideoCodecSettings& mapped_codec : mapped_codecs) {
if (!FindMatchingCodec(local_supported_codecs, mapped_codec.codec)) { if (!FindMatchingCodec(local_supported_codecs, mapped_codec.codec)) {
RTC_LOG(LS_ERROR) RTC_LOG(LS_ERROR) << "GetChangedReceiverParameters called with "
<< "GetChangedRecvParameters called with unsupported video codec: " "unsupported video codec: "
<< mapped_codec.codec.ToString(); << mapped_codec.codec.ToString();
return false; return false;
} }
} }
@ -2669,13 +2669,13 @@ bool WebRtcVideoReceiveChannel::GetChangedRecvParameters(
return true; return true;
} }
bool WebRtcVideoReceiveChannel::SetRecvParameters( bool WebRtcVideoReceiveChannel::SetReceiverParameters(
const VideoReceiverParameters& params) { const VideoReceiverParameters& params) {
RTC_DCHECK_RUN_ON(&thread_checker_); RTC_DCHECK_RUN_ON(&thread_checker_);
TRACE_EVENT0("webrtc", "WebRtcVideoReceiveChannel::SetRecvParameters"); TRACE_EVENT0("webrtc", "WebRtcVideoReceiveChannel::SetReceiverParameters");
RTC_LOG(LS_INFO) << "SetRecvParameters: " << params.ToString(); RTC_LOG(LS_INFO) << "SetReceiverParameters: " << params.ToString();
ChangedRecvParameters changed_params; ChangedReceiverParameters changed_params;
if (!GetChangedRecvParameters(params, &changed_params)) { if (!GetChangedReceiverParameters(params, &changed_params)) {
return false; return false;
} }
if (changed_params.flexfec_payload_type) { if (changed_params.flexfec_payload_type) {
@ -2698,7 +2698,7 @@ bool WebRtcVideoReceiveChannel::SetRecvParameters(
} }
for (auto& kv : receive_streams_) { for (auto& kv : receive_streams_) {
kv.second->SetRecvParameters(changed_params); kv.second->SetReceiverParameters(changed_params);
} }
recv_params_ = params; recv_params_ = params;
return true; return true;
@ -3428,8 +3428,8 @@ void WebRtcVideoReceiveChannel::WebRtcVideoReceiveStream::SetFlexFecPayload(
} }
} }
void WebRtcVideoReceiveChannel::WebRtcVideoReceiveStream::SetRecvParameters( void WebRtcVideoReceiveChannel::WebRtcVideoReceiveStream::SetReceiverParameters(
const ChangedRecvParameters& params) { const ChangedReceiverParameters& params) {
RTC_DCHECK(stream_); RTC_DCHECK(stream_);
bool video_needs_recreation = false; bool video_needs_recreation = false;
if (params.codec_settings) { if (params.codec_settings) {

30
media/engine/webrtc_video_engine.h
View File

@ -190,7 +190,7 @@ class WebRtcVideoSendChannel : public MediaChannelUtil,
// Common functions between sender and receiver // Common functions between sender and receiver
void SetInterface(MediaChannelNetworkInterface* iface) override; void SetInterface(MediaChannelNetworkInterface* iface) override;
// VideoMediaSendChannelInterface implementation // VideoMediaSendChannelInterface implementation
bool SetSendParameters(const VideoSenderParameters& params) override; bool SetSenderParameters(const VideoSenderParameters& params) override;
webrtc::RTCError SetRtpSendParameters( webrtc::RTCError SetRtpSendParameters(
uint32_t ssrc, uint32_t ssrc,
const webrtc::RtpParameters& parameters, const webrtc::RtpParameters& parameters,
@ -296,7 +296,7 @@ class WebRtcVideoSendChannel : public MediaChannelUtil,
} }
private: private:
struct ChangedSendParameters { struct ChangedSenderParameters {
// These optionals are unset if not changed. // These optionals are unset if not changed.
absl::optional<VideoCodecSettings> send_codec; absl::optional<VideoCodecSettings> send_codec;
absl::optional<std::vector<VideoCodecSettings>> negotiated_codecs; absl::optional<std::vector<VideoCodecSettings>> negotiated_codecs;
@ -308,10 +308,10 @@ class WebRtcVideoSendChannel : public MediaChannelUtil,
absl::optional<webrtc::RtcpMode> rtcp_mode; absl::optional<webrtc::RtcpMode> rtcp_mode;
}; };
bool GetChangedSendParameters(const VideoSenderParameters& params, bool GetChangedSenderParameters(const VideoSenderParameters& params,
ChangedSendParameters* changed_params) const ChangedSenderParameters* changed_params) const
RTC_EXCLUSIVE_LOCKS_REQUIRED(thread_checker_); RTC_EXCLUSIVE_LOCKS_REQUIRED(thread_checker_);
bool ApplyChangedParams(const ChangedSendParameters& changed_params); bool ApplyChangedParams(const ChangedSenderParameters& changed_params);
bool ValidateSendSsrcAvailability(const StreamParams& sp) const bool ValidateSendSsrcAvailability(const StreamParams& sp) const
RTC_EXCLUSIVE_LOCKS_REQUIRED(thread_checker_); RTC_EXCLUSIVE_LOCKS_REQUIRED(thread_checker_);
@ -339,7 +339,7 @@ class WebRtcVideoSendChannel : public MediaChannelUtil,
const VideoSenderParameters& send_params); const VideoSenderParameters& send_params);
~WebRtcVideoSendStream(); ~WebRtcVideoSendStream();
void SetSendParameters(const ChangedSendParameters& send_params); void SetSenderParameters(const ChangedSenderParameters& send_params);
webrtc::RTCError SetRtpParameters(const webrtc::RtpParameters& parameters, webrtc::RTCError SetRtpParameters(const webrtc::RtpParameters& parameters,
webrtc::SetParametersCallback callback); webrtc::SetParametersCallback callback);
webrtc::RtpParameters GetRtpParameters() const; webrtc::RtpParameters GetRtpParameters() const;
@ -525,7 +525,7 @@ class WebRtcVideoSendChannel : public MediaChannelUtil,
std::vector<webrtc::RtpExtension> recv_rtp_extensions_ std::vector<webrtc::RtpExtension> recv_rtp_extensions_
RTC_GUARDED_BY(thread_checker_); RTC_GUARDED_BY(thread_checker_);
// See reason for keeping track of the FlexFEC payload type separately in // See reason for keeping track of the FlexFEC payload type separately in
// comment in WebRtcVideoChannel::ChangedRecvParameters. // comment in WebRtcVideoChannel::ChangedReceiverParameters.
int recv_flexfec_payload_type_ RTC_GUARDED_BY(thread_checker_); int recv_flexfec_payload_type_ RTC_GUARDED_BY(thread_checker_);
webrtc::BitrateConstraints bitrate_config_ RTC_GUARDED_BY(thread_checker_); webrtc::BitrateConstraints bitrate_config_ RTC_GUARDED_BY(thread_checker_);
// TODO(deadbeef): Don't duplicate information between // TODO(deadbeef): Don't duplicate information between
@ -590,8 +590,8 @@ class WebRtcVideoReceiveChannel : public MediaChannelUtil,
// Common functions between sender and receiver // Common functions between sender and receiver
void SetInterface(MediaChannelNetworkInterface* iface) override; void SetInterface(MediaChannelNetworkInterface* iface) override;
// VideoMediaReceiveChannelInterface implementation // VideoMediaReceiveChannelInterface implementation
bool SetRecvParameters(const VideoReceiverParameters& params) override; bool SetReceiverParameters(const VideoReceiverParameters& params) override;
webrtc::RtpParameters GetRtpReceiveParameters(uint32_t ssrc) const override; webrtc::RtpParameters GetRtpReceiverParameters(uint32_t ssrc) const override;
webrtc::RtpParameters GetDefaultRtpReceiveParameters() const override; webrtc::RtpParameters GetDefaultRtpReceiveParameters() const override;
void SetReceive(bool receive) override; void SetReceive(bool receive) override;
bool AddRecvStream(const StreamParams& sp) override; bool AddRecvStream(const StreamParams& sp) override;
@ -645,7 +645,7 @@ class WebRtcVideoReceiveChannel : public MediaChannelUtil,
private: private:
class WebRtcVideoReceiveStream; class WebRtcVideoReceiveStream;
struct ChangedRecvParameters { struct ChangedReceiverParameters {
// These optionals are unset if not changed. // These optionals are unset if not changed.
absl::optional<std::vector<VideoCodecSettings>> codec_settings; absl::optional<std::vector<VideoCodecSettings>> codec_settings;
absl::optional<std::vector<webrtc::RtpExtension>> rtp_header_extensions; absl::optional<std::vector<webrtc::RtpExtension>> rtp_header_extensions;
@ -719,7 +719,7 @@ class WebRtcVideoReceiveChannel : public MediaChannelUtil,
bool nack_enabled, bool nack_enabled,
webrtc::RtcpMode rtcp_mode, webrtc::RtcpMode rtcp_mode,
absl::optional<int> rtx_time); absl::optional<int> rtx_time);
void SetRecvParameters(const ChangedRecvParameters& recv_params); void SetReceiverParameters(const ChangedReceiverParameters& recv_params);
void OnFrame(const webrtc::VideoFrame& frame) override; void OnFrame(const webrtc::VideoFrame& frame) override;
bool IsDefaultStream() const; bool IsDefaultStream() const;
@ -786,9 +786,9 @@ class WebRtcVideoReceiveChannel : public MediaChannelUtil,
RTC_NO_UNIQUE_ADDRESS webrtc::SequenceChecker thread_checker_; RTC_NO_UNIQUE_ADDRESS webrtc::SequenceChecker thread_checker_;
bool receiving_ RTC_GUARDED_BY(&thread_checker_); bool receiving_ RTC_GUARDED_BY(&thread_checker_);
}; };
bool GetChangedRecvParameters(const VideoReceiverParameters& params, bool GetChangedReceiverParameters(const VideoReceiverParameters& params,
ChangedRecvParameters* changed_params) const ChangedReceiverParameters* changed_params)
RTC_EXCLUSIVE_LOCKS_REQUIRED(thread_checker_); const RTC_EXCLUSIVE_LOCKS_REQUIRED(thread_checker_);
std::map<uint32_t, WebRtcVideoReceiveStream*> receive_streams_ std::map<uint32_t, WebRtcVideoReceiveStream*> receive_streams_
RTC_GUARDED_BY(thread_checker_); RTC_GUARDED_BY(thread_checker_);
@ -857,7 +857,7 @@ class WebRtcVideoReceiveChannel : public MediaChannelUtil,
std::vector<webrtc::RtpExtension> recv_rtp_extensions_ std::vector<webrtc::RtpExtension> recv_rtp_extensions_
RTC_GUARDED_BY(thread_checker_); RTC_GUARDED_BY(thread_checker_);
// See reason for keeping track of the FlexFEC payload type separately in // See reason for keeping track of the FlexFEC payload type separately in
// comment in WebRtcVideoChannel::ChangedRecvParameters. // comment in WebRtcVideoChannel::ChangedReceiverParameters.
int recv_flexfec_payload_type_ RTC_GUARDED_BY(thread_checker_); int recv_flexfec_payload_type_ RTC_GUARDED_BY(thread_checker_);
webrtc::BitrateConstraints bitrate_config_ RTC_GUARDED_BY(thread_checker_); webrtc::BitrateConstraints bitrate_config_ RTC_GUARDED_BY(thread_checker_);
// TODO(deadbeef): Don't duplicate information between // TODO(deadbeef): Don't duplicate information between

440
media/engine/webrtc_video_engine_unittest.cc
View File

File diff suppressed because it is too large Load Diff

16
media/engine/webrtc_voice_engine.cc
View File

@ -1262,11 +1262,11 @@ bool WebRtcVoiceSendChannel::SetOptions(const AudioOptions& options) {
return true; return true;
} }
bool WebRtcVoiceSendChannel::SetSendParameters( bool WebRtcVoiceSendChannel::SetSenderParameters(
const AudioSenderParameter& params) { const AudioSenderParameter& params) {
TRACE_EVENT0("webrtc", "WebRtcVoiceMediaChannel::SetSendParameters"); TRACE_EVENT0("webrtc", "WebRtcVoiceMediaChannel::SetSenderParameters");
RTC_DCHECK_RUN_ON(worker_thread_); RTC_DCHECK_RUN_ON(worker_thread_);
RTC_LOG(LS_INFO) << "WebRtcVoiceMediaChannel::SetSendParameters: " RTC_LOG(LS_INFO) << "WebRtcVoiceMediaChannel::SetSenderParameters: "
<< params.ToString(); << params.ToString();
// TODO(pthatcher): Refactor this to be more clean now that we have // TODO(pthatcher): Refactor this to be more clean now that we have
// all the information at once. // all the information at once.
@ -1342,7 +1342,7 @@ absl::optional<Codec> WebRtcVoiceSendChannel::GetSendCodec() const {
return absl::nullopt; return absl::nullopt;
} }
// Utility function called from SetSendParameters() to extract current send // Utility function called from SetSenderParameters() to extract current send
// codec settings from the given list of codecs (originally from SDP). Both send // codec settings from the given list of codecs (originally from SDP). Both send
// and receive streams may be reconfigured based on the new settings. // and receive streams may be reconfigured based on the new settings.
bool WebRtcVoiceSendChannel::SetSendCodecs( bool WebRtcVoiceSendChannel::SetSendCodecs(
@ -2042,11 +2042,11 @@ WebRtcVoiceReceiveChannel::~WebRtcVoiceReceiveChannel() {
} }
} }
bool WebRtcVoiceReceiveChannel::SetRecvParameters( bool WebRtcVoiceReceiveChannel::SetReceiverParameters(
const AudioReceiverParameters& params) { const AudioReceiverParameters& params) {
TRACE_EVENT0("webrtc", "WebRtcVoiceMediaChannel::SetRecvParameters"); TRACE_EVENT0("webrtc", "WebRtcVoiceMediaChannel::SetReceiverParameters");
RTC_DCHECK_RUN_ON(worker_thread_); RTC_DCHECK_RUN_ON(worker_thread_);
RTC_LOG(LS_INFO) << "WebRtcVoiceMediaChannel::SetRecvParameters: " RTC_LOG(LS_INFO) << "WebRtcVoiceMediaChannel::SetReceiverParameters: "
<< params.ToString(); << params.ToString();
// TODO(pthatcher): Refactor this to be more clean now that we have // TODO(pthatcher): Refactor this to be more clean now that we have
// all the information at once. // all the information at once.
@ -2069,7 +2069,7 @@ bool WebRtcVoiceReceiveChannel::SetRecvParameters(
return true; return true;
} }
webrtc::RtpParameters WebRtcVoiceReceiveChannel::GetRtpReceiveParameters( webrtc::RtpParameters WebRtcVoiceReceiveChannel::GetRtpReceiverParameters(
uint32_t ssrc) const { uint32_t ssrc) const {
RTC_DCHECK_RUN_ON(worker_thread_); RTC_DCHECK_RUN_ON(worker_thread_);
webrtc::RtpParameters rtp_params; webrtc::RtpParameters rtp_params;

6
media/engine/webrtc_voice_engine.h
View File

@ -227,7 +227,7 @@ class WebRtcVoiceSendChannel final : public MediaChannelUtil,
const AudioOptions& options() const { return options_; } const AudioOptions& options() const { return options_; }
bool SetSendParameters(const AudioSenderParameter& params) override; bool SetSenderParameters(const AudioSenderParameter& params) override;
webrtc::RtpParameters GetRtpSendParameters(uint32_t ssrc) const override; webrtc::RtpParameters GetRtpSendParameters(uint32_t ssrc) const override;
webrtc::RTCError SetRtpSendParameters( webrtc::RTCError SetRtpSendParameters(
uint32_t ssrc, uint32_t ssrc,
@ -378,8 +378,8 @@ class WebRtcVoiceReceiveChannel final
void SetInterface(MediaChannelNetworkInterface* iface) override { void SetInterface(MediaChannelNetworkInterface* iface) override {
MediaChannelUtil::SetInterface(iface); MediaChannelUtil::SetInterface(iface);
} }
bool SetRecvParameters(const AudioReceiverParameters& params) override; bool SetReceiverParameters(const AudioReceiverParameters& params) override;
webrtc::RtpParameters GetRtpReceiveParameters(uint32_t ssrc) const override; webrtc::RtpParameters GetRtpReceiverParameters(uint32_t ssrc) const override;
webrtc::RtpParameters GetDefaultRtpReceiveParameters() const override; webrtc::RtpParameters GetDefaultRtpReceiveParameters() const override;
void SetPlayout(bool playout) override; void SetPlayout(bool playout) override;

324
media/engine/webrtc_voice_engine_unittest.cc
View File

File diff suppressed because it is too large Load Diff

2
pc/audio_rtp_receiver.cc
View File

@ -139,7 +139,7 @@ RtpParameters AudioRtpReceiver::GetParameters() const {
return RtpParameters(); return RtpParameters();
auto current_ssrc = ssrc(); auto current_ssrc = ssrc();
return current_ssrc.has_value() return current_ssrc.has_value()
? media_channel_->GetRtpReceiveParameters(current_ssrc.value()) ? media_channel_->GetRtpReceiverParameters(current_ssrc.value())
: media_channel_->GetDefaultRtpReceiveParameters(); : media_channel_->GetDefaultRtpReceiveParameters();
} }

12
pc/channel.cc
View File

@ -888,7 +888,7 @@ bool VoiceChannel::SetLocalContent_w(const MediaContentDescription* content,
webrtc::RtpTransceiverDirectionHasRecv(content->direction()), webrtc::RtpTransceiverDirectionHasRecv(content->direction()),
&recv_params); &recv_params);
if (!media_receive_channel()->SetRecvParameters(recv_params)) { if (!media_receive_channel()->SetReceiverParameters(recv_params)) {
error_desc = StringFormat( error_desc = StringFormat(
"Failed to set local audio description recv parameters for m-section " "Failed to set local audio description recv parameters for m-section "
"with mid='%s'.", "with mid='%s'.",
@ -941,7 +941,7 @@ bool VoiceChannel::SetRemoteContent_w(const MediaContentDescription* content,
send_params.mid = mid(); send_params.mid = mid();
bool parameters_applied = bool parameters_applied =
media_send_channel()->SetSendParameters(send_params); media_send_channel()->SetSenderParameters(send_params);
if (!parameters_applied) { if (!parameters_applied) {
error_desc = StringFormat( error_desc = StringFormat(
"Failed to set remote audio description send parameters for m-section " "Failed to set remote audio description send parameters for m-section "
@ -1050,7 +1050,7 @@ bool VideoChannel::SetLocalContent_w(const MediaContentDescription* content,
} }
} }
if (!media_receive_channel()->SetRecvParameters(recv_params)) { if (!media_receive_channel()->SetReceiverParameters(recv_params)) {
error_desc = StringFormat( error_desc = StringFormat(
"Failed to set local video description recv parameters for m-section " "Failed to set local video description recv parameters for m-section "
"with mid='%s'.", "with mid='%s'.",
@ -1069,7 +1069,7 @@ bool VideoChannel::SetLocalContent_w(const MediaContentDescription* content,
last_recv_params_ = recv_params; last_recv_params_ = recv_params;
if (needs_send_params_update) { if (needs_send_params_update) {
if (!media_send_channel()->SetSendParameters(send_params)) { if (!media_send_channel()->SetSenderParameters(send_params)) {
error_desc = StringFormat( error_desc = StringFormat(
"Failed to set send parameters for m-section with mid='%s'.", "Failed to set send parameters for m-section with mid='%s'.",
mid().c_str()); mid().c_str());
@ -1135,7 +1135,7 @@ bool VideoChannel::SetRemoteContent_w(const MediaContentDescription* content,
} }
} }
if (!media_send_channel()->SetSendParameters(send_params)) { if (!media_send_channel()->SetSenderParameters(send_params)) {
error_desc = StringFormat( error_desc = StringFormat(
"Failed to set remote video description send parameters for m-section " "Failed to set remote video description send parameters for m-section "
"with mid='%s'.", "with mid='%s'.",
@ -1151,7 +1151,7 @@ bool VideoChannel::SetRemoteContent_w(const MediaContentDescription* content,
last_send_params_ = send_params; last_send_params_ = send_params;
if (needs_recv_params_update) { if (needs_recv_params_update) {
if (!media_receive_channel()->SetRecvParameters(recv_params)) { if (!media_receive_channel()->SetReceiverParameters(recv_params)) {
error_desc = StringFormat( error_desc = StringFormat(
"Failed to set recv parameters for m-section with mid='%s'.", "Failed to set recv parameters for m-section with mid='%s'.",
mid().c_str()); mid().c_str());

8
pc/channel.h
View File

@ -430,10 +430,10 @@ class VoiceChannel : public BaseChannel {
RTC_RUN_ON(worker_thread()) override; RTC_RUN_ON(worker_thread()) override;
// Last AudioSenderParameter sent down to the media_channel() via // Last AudioSenderParameter sent down to the media_channel() via
// SetSendParameters. // SetSenderParameters.
AudioSenderParameter last_send_params_ RTC_GUARDED_BY(worker_thread()); AudioSenderParameter last_send_params_ RTC_GUARDED_BY(worker_thread());
// Last AudioReceiverParameters sent down to the media_channel() via // Last AudioReceiverParameters sent down to the media_channel() via
// SetRecvParameters. // SetReceiverParameters.
AudioReceiverParameters last_recv_params_ RTC_GUARDED_BY(worker_thread()); AudioReceiverParameters last_recv_params_ RTC_GUARDED_BY(worker_thread());
}; };
@ -499,10 +499,10 @@ class VideoChannel : public BaseChannel {
RTC_RUN_ON(worker_thread()) override; RTC_RUN_ON(worker_thread()) override;
// Last VideoSenderParameters sent down to the media_channel() via // Last VideoSenderParameters sent down to the media_channel() via
// SetSendParameters. // SetSenderParameters.
VideoSenderParameters last_send_params_ RTC_GUARDED_BY(worker_thread()); VideoSenderParameters last_send_params_ RTC_GUARDED_BY(worker_thread());
// Last VideoReceiverParameters sent down to the media_channel() via // Last VideoReceiverParameters sent down to the media_channel() via
// SetRecvParameters. // SetReceiverParameters.
VideoReceiverParameters last_recv_params_ RTC_GUARDED_BY(worker_thread()); VideoReceiverParameters last_recv_params_ RTC_GUARDED_BY(worker_thread());
}; };

2
pc/rtp_sender_receiver_unittest.cc
View File

@ -176,7 +176,7 @@ class RtpSenderReceiverTest
const cricket::AudioCodec kTelephoneEventCodec = const cricket::AudioCodec kTelephoneEventCodec =
cricket::CreateAudioCodec(106, "telephone-event", 8000, 1); cricket::CreateAudioCodec(106, "telephone-event", 8000, 1);
params.codecs.push_back(kTelephoneEventCodec); params.codecs.push_back(kTelephoneEventCodec);
voice_media_send_channel()->SetSendParameters(params); voice_media_send_channel()->SetSenderParameters(params);
} }
void AddVideoTrack() { AddVideoTrack(false); } void AddVideoTrack() { AddVideoTrack(false); }

4
pc/test/mock_voice_media_receive_channel_interface.h
View File

@ -34,11 +34,11 @@ class MockVoiceMediaReceiveChannelInterface
// VoiceMediaReceiveChannelInterface // VoiceMediaReceiveChannelInterface
MOCK_METHOD(bool, MOCK_METHOD(bool,
SetRecvParameters, SetReceiverParameters,
(const AudioReceiverParameters& params), (const AudioReceiverParameters& params),
(override)); (override));
MOCK_METHOD(webrtc::RtpParameters, MOCK_METHOD(webrtc::RtpParameters,
GetRtpReceiveParameters, GetRtpReceiverParameters,
(uint32_t ssrc), (uint32_t ssrc),
(const, override)); (const, override));
MOCK_METHOD(std::vector<webrtc::RtpSource>, MOCK_METHOD(std::vector<webrtc::RtpSource>,

2
pc/video_rtp_receiver.cc
View File

@ -78,7 +78,7 @@ RtpParameters VideoRtpReceiver::GetParameters() const {
return RtpParameters(); return RtpParameters();
auto current_ssrc = ssrc(); auto current_ssrc = ssrc();
return current_ssrc.has_value() return current_ssrc.has_value()
? media_channel_->GetRtpReceiveParameters(current_ssrc.value()) ? media_channel_->GetRtpReceiverParameters(current_ssrc.value())
: media_channel_->GetDefaultRtpReceiveParameters(); : media_channel_->GetDefaultRtpReceiveParameters();
} }