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

Apply VideoOptions per stream.

Browse Source 
BUG=webrtc:5438

Review URL: https://codereview.webrtc.org/1608793004

Cr-Commit-Position: refs/heads/master@{#11656}
This commit is contained in:
nisse 2016-02-17 07:24:50 -08:00 committed by Commit bot
parent 789ba92e14
commit a293ef0618
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
webrtc/media/engine/webrtcvideoengine2.cc
View File

@ -616,7 +616,9 @@ WebRtcVideoChannel2::WebRtcVideoChannel2(
external_encoder_factory_(external_encoder_factory),
external_decoder_factory_(external_decoder_factory) {
RTC_DCHECK(thread_checker_.CalledOnValidThread());
options_.SetAll(options);
send_params_.options = options;
rtcp_receiver_report_ssrc_ = kDefaultRtcpReceiverReportSsrc;
sending_ = false;
default_send_ssrc_ = 0;
@ -742,9 +744,9 @@ bool WebRtcVideoChannel2::GetChangedSendParameters(
// Handle options.
// TODO(pbos): Require VideoSendParameters to contain a full set of options
// and check if params.options != options_ instead of applying a delta.
VideoOptions new_options = options_;
VideoOptions new_options = send_params_.options;
new_options.SetAll(params.options);
if (!(new_options == options_)) {
if (!(new_options == send_params_.options)) {
changed_params->options = rtc::Optional<VideoOptions>(new_options);
}
@ -807,7 +809,7 @@ bool WebRtcVideoChannel2::SetSendParameters(const VideoSendParameters& params) {
}
if (changed_params.options)
options_.SetAll(*changed_params.options);
send_params_.options.SetAll(*changed_params.options);
{
rtc::CritScope stream_lock(&stream_crit_);
@ -956,9 +958,7 @@ bool WebRtcVideoChannel2::SetVideoSend(uint32_t ssrc, bool enable,
return false;
}
if (enable && options) {
VideoSendParameters new_params = send_params_;
new_params.options.SetAll(*options);
SetSendParameters(send_params_);
SetOptions(ssrc, *options);
}
return true;
}
@ -1002,10 +1002,10 @@ bool WebRtcVideoChannel2::AddSendStream(const StreamParams& sp) {
webrtc::VideoSendStream::Config config(this);
config.overuse_callback = this;
WebRtcVideoSendStream* stream = new WebRtcVideoSendStream(
call_, sp, config, external_encoder_factory_, options_,
bitrate_config_.max_bitrate_bps, send_codec_, send_rtp_extensions_,
send_params_);
WebRtcVideoSendStream* stream =
new WebRtcVideoSendStream(call_, sp, config, external_encoder_factory_,
bitrate_config_.max_bitrate_bps, send_codec_,
send_rtp_extensions_, send_params_);
uint32_t ssrc = sp.first_ssrc();
RTC_DCHECK(ssrc != 0);
@ -1104,7 +1104,7 @@ bool WebRtcVideoChannel2::AddRecvStream(const StreamParams& sp,
rtc::CritScope stream_lock(&stream_crit_);
// Remove running stream if this was a default stream.
auto prev_stream = receive_streams_.find(ssrc);
const auto& prev_stream = receive_streams_.find(ssrc);
if (prev_stream != receive_streams_.end()) {
if (default_stream || !prev_stream->second->IsDefaultStream()) {
LOG(LS_ERROR) << "Receive stream for SSRC '" << ssrc
@ -1274,11 +1274,12 @@ bool WebRtcVideoChannel2::SetCapturer(uint32_t ssrc, VideoCapturer* capturer) {
RTC_DCHECK(ssrc != 0);
{
rtc::CritScope stream_lock(&stream_crit_);
if (send_streams_.find(ssrc) == send_streams_.end()) {
const auto& kv = send_streams_.find(ssrc);
if (kv == send_streams_.end()) {
LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc;
return false;
}
if (!send_streams_[ssrc]->SetCapturer(capturer)) {
if (!kv->second->SetCapturer(capturer)) {
return false;
}
}
@ -1372,20 +1373,27 @@ bool WebRtcVideoChannel2::MuteStream(uint32_t ssrc, bool mute) {
<< (mute ? "mute" : "unmute");
RTC_DCHECK(ssrc != 0);
rtc::CritScope stream_lock(&stream_crit_);
if (send_streams_.find(ssrc) == send_streams_.end()) {
const auto& kv = send_streams_.find(ssrc);
if (kv == send_streams_.end()) {
LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc;
return false;
}
send_streams_[ssrc]->MuteStream(mute);
kv->second->MuteStream(mute);
return true;
}
// TODO(pbos): Remove SetOptions in favor of SetSendParameters.
void WebRtcVideoChannel2::SetOptions(const VideoOptions& options) {
VideoSendParameters new_params = send_params_;
new_params.options.SetAll(options);
SetSendParameters(send_params_);
void WebRtcVideoChannel2::SetOptions(uint32_t ssrc,
const VideoOptions& options) {
LOG(LS_INFO) << "SetOptions: ssrc " << ssrc << ": " << options.ToString();
rtc::CritScope stream_lock(&stream_crit_);
const auto& kv = send_streams_.find(ssrc);
if (kv == send_streams_.end()) {
return;
}
kv->second->SetOptions(options);
}
void WebRtcVideoChannel2::SetInterface(NetworkInterface* iface) {
@ -1487,7 +1495,6 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::WebRtcVideoSendStream(
const StreamParams& sp,
const webrtc::VideoSendStream::Config& config,
WebRtcVideoEncoderFactory* external_encoder_factory,
const VideoOptions& options,
int max_bitrate_bps,
const rtc::Optional<VideoCodecSettings>& codec_settings,
const std::vector<webrtc::RtpExtension>& rtp_extensions,
@ -1499,7 +1506,7 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::WebRtcVideoSendStream(
call_(call),
external_encoder_factory_(external_encoder_factory),
stream_(NULL),
parameters_(config, options, max_bitrate_bps, codec_settings),
parameters_(config, send_params.options, max_bitrate_bps, codec_settings),
pending_encoder_reconfiguration_(false),
allocated_encoder_(NULL, webrtc::kVideoCodecUnknown, false),
capturer_(NULL),

5
webrtc/media/engine/webrtcvideoengine2.h
View File

@ -212,7 +212,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
bool MuteStream(uint32_t ssrc, bool mute);
void SetMaxSendBandwidth(int bps);
void SetOptions(const VideoOptions& options);
void SetOptions(uint32_t ssrc, const VideoOptions& options);
void ConfigureReceiverRtp(webrtc::VideoReceiveStream::Config* config,
const StreamParams& sp) const;
@ -237,7 +237,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
const StreamParams& sp,
const webrtc::VideoSendStream::Config& config,
WebRtcVideoEncoderFactory* external_encoder_factory,
const VideoOptions& options,
int max_bitrate_bps,
const rtc::Optional<VideoCodecSettings>& codec_settings,
const std::vector<webrtc::RtpExtension>& rtp_extensions,
@ -457,7 +456,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
};
void Construct(webrtc::Call* call, WebRtcVideoEngine2* engine);
void SetDefaultOptions();
bool SendRtp(const uint8_t* data,
size_t len,
@ -516,7 +514,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
std::vector<VideoCodecSettings> recv_codecs_;
std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
webrtc::Call::Config::BitrateConfig bitrate_config_;
VideoOptions options_;
// TODO(deadbeef): Don't duplicate information between
// send_params/recv_params, rtp_extensions, options, etc.
VideoSendParameters send_params_;