generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unused (no-op) VideoOptions.

Browse Source 
Removing VideoOptions: adapt_input_to_encoder, adapt_view_switch,
video_one_layer_screencast and video_high_bitrate.

R=pthatcher@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/23079004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7448 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2014-10-14 19:12:06 +00:00
parent a4351a045d
commit 43336b6b9f
1 changed files with 29 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
talk/media/base/mediachannel.h
View File

@ -301,14 +301,10 @@ struct VideoOptions {
} }
void SetAll(const VideoOptions& change) { void SetAll(const VideoOptions& change) {
adapt_input_to_encoder.SetFrom(change.adapt_input_to_encoder);
adapt_input_to_cpu_usage.SetFrom(change.adapt_input_to_cpu_usage); adapt_input_to_cpu_usage.SetFrom(change.adapt_input_to_cpu_usage);
adapt_cpu_with_smoothing.SetFrom(change.adapt_cpu_with_smoothing); adapt_cpu_with_smoothing.SetFrom(change.adapt_cpu_with_smoothing);
adapt_view_switch.SetFrom(change.adapt_view_switch);
video_adapt_third.SetFrom(change.video_adapt_third); video_adapt_third.SetFrom(change.video_adapt_third);
video_noise_reduction.SetFrom(change.video_noise_reduction); video_noise_reduction.SetFrom(change.video_noise_reduction);
video_one_layer_screencast.SetFrom(change.video_one_layer_screencast);
video_high_bitrate.SetFrom(change.video_high_bitrate);
video_start_bitrate.SetFrom(change.video_start_bitrate); video_start_bitrate.SetFrom(change.video_start_bitrate);
video_temporal_layer_screencast.SetFrom( video_temporal_layer_screencast.SetFrom(
change.video_temporal_layer_screencast); change.video_temporal_layer_screencast);
@ -338,52 +334,44 @@ struct VideoOptions {
} }
bool operator==(const VideoOptions& o) const { bool operator==(const VideoOptions& o) const {
return adapt_input_to_encoder == o.adapt_input_to_encoder && return adapt_input_to_cpu_usage == o.adapt_input_to_cpu_usage &&
adapt_input_to_cpu_usage == o.adapt_input_to_cpu_usage && adapt_cpu_with_smoothing == o.adapt_cpu_with_smoothing &&
adapt_cpu_with_smoothing == o.adapt_cpu_with_smoothing && video_adapt_third == o.video_adapt_third &&
adapt_view_switch == o.adapt_view_switch && video_noise_reduction == o.video_noise_reduction &&
video_adapt_third == o.video_adapt_third && video_start_bitrate == o.video_start_bitrate &&
video_noise_reduction == o.video_noise_reduction && video_temporal_layer_screencast ==
video_one_layer_screencast == o.video_one_layer_screencast && o.video_temporal_layer_screencast &&
video_high_bitrate == o.video_high_bitrate && video_leaky_bucket == o.video_leaky_bucket &&
video_start_bitrate == o.video_start_bitrate && video_highest_bitrate == o.video_highest_bitrate &&
video_temporal_layer_screencast == o.video_temporal_layer_screencast && cpu_overuse_detection == o.cpu_overuse_detection &&
video_leaky_bucket == o.video_leaky_bucket && cpu_underuse_threshold == o.cpu_underuse_threshold &&
video_highest_bitrate == o.video_highest_bitrate && cpu_overuse_threshold == o.cpu_overuse_threshold &&
cpu_overuse_detection == o.cpu_overuse_detection && cpu_underuse_encode_rsd_threshold ==
cpu_underuse_threshold == o.cpu_underuse_threshold && o.cpu_underuse_encode_rsd_threshold &&
cpu_overuse_threshold == o.cpu_overuse_threshold && cpu_overuse_encode_rsd_threshold ==
cpu_underuse_encode_rsd_threshold == o.cpu_overuse_encode_rsd_threshold &&
o.cpu_underuse_encode_rsd_threshold && cpu_overuse_encode_usage == o.cpu_overuse_encode_usage &&
cpu_overuse_encode_rsd_threshold == conference_mode == o.conference_mode &&
o.cpu_overuse_encode_rsd_threshold && process_adaptation_threshhold == o.process_adaptation_threshhold &&
cpu_overuse_encode_usage == o.cpu_overuse_encode_usage && system_low_adaptation_threshhold ==
conference_mode == o.conference_mode && o.system_low_adaptation_threshhold &&
process_adaptation_threshhold == o.process_adaptation_threshhold && system_high_adaptation_threshhold ==
system_low_adaptation_threshhold == o.system_high_adaptation_threshhold &&
o.system_low_adaptation_threshhold && buffered_mode_latency == o.buffered_mode_latency && dscp == o.dscp &&
system_high_adaptation_threshhold == suspend_below_min_bitrate == o.suspend_below_min_bitrate &&
o.system_high_adaptation_threshhold && unsignalled_recv_stream_limit == o.unsignalled_recv_stream_limit &&
buffered_mode_latency == o.buffered_mode_latency && use_simulcast_adapter == o.use_simulcast_adapter &&
dscp == o.dscp && screencast_min_bitrate == o.screencast_min_bitrate &&
suspend_below_min_bitrate == o.suspend_below_min_bitrate && use_payload_padding == o.use_payload_padding;
unsignalled_recv_stream_limit == o.unsignalled_recv_stream_limit &&
use_simulcast_adapter == o.use_simulcast_adapter &&
screencast_min_bitrate == o.screencast_min_bitrate &&
use_payload_padding == o.use_payload_padding;
} }
std::string ToString() const { std::string ToString() const {
std::ostringstream ost; std::ostringstream ost;
ost << "VideoOptions {"; ost << "VideoOptions {";
ost << ToStringIfSet("encoder adaption", adapt_input_to_encoder);
ost << ToStringIfSet("cpu adaption", adapt_input_to_cpu_usage); ost << ToStringIfSet("cpu adaption", adapt_input_to_cpu_usage);
ost << ToStringIfSet("cpu adaptation smoothing", adapt_cpu_with_smoothing); ost << ToStringIfSet("cpu adaptation smoothing", adapt_cpu_with_smoothing);
ost << ToStringIfSet("adapt view switch", adapt_view_switch);
ost << ToStringIfSet("video adapt third", video_adapt_third); ost << ToStringIfSet("video adapt third", video_adapt_third);
ost << ToStringIfSet("noise reduction", video_noise_reduction); ost << ToStringIfSet("noise reduction", video_noise_reduction);
ost << ToStringIfSet("1 layer screencast", video_one_layer_screencast);
ost << ToStringIfSet("high bitrate", video_high_bitrate);
ost << ToStringIfSet("start bitrate", video_start_bitrate); ost << ToStringIfSet("start bitrate", video_start_bitrate);
ost << ToStringIfSet("video temporal layer screencast", ost << ToStringIfSet("video temporal layer screencast",
video_temporal_layer_screencast); video_temporal_layer_screencast);
@ -415,22 +403,14 @@ struct VideoOptions {
return ost.str(); return ost.str();
} }
// Encoder adaption, which is the gd callback in LMI, and TBA in WebRTC.
Settable<bool> adapt_input_to_encoder;
// Enable CPU adaptation? // Enable CPU adaptation?
Settable<bool> adapt_input_to_cpu_usage; Settable<bool> adapt_input_to_cpu_usage;
// Enable CPU adaptation smoothing? // Enable CPU adaptation smoothing?
Settable<bool> adapt_cpu_with_smoothing; Settable<bool> adapt_cpu_with_smoothing;
// Enable Adapt View Switch?
Settable<bool> adapt_view_switch;
// Enable video adapt third? // Enable video adapt third?
Settable<bool> video_adapt_third; Settable<bool> video_adapt_third;
// Enable denoising? // Enable denoising?
Settable<bool> video_noise_reduction; Settable<bool> video_noise_reduction;
// Experimental: Enable one layer screencast?
Settable<bool> video_one_layer_screencast;
// Experimental: Enable WebRtc higher bitrate?
Settable<bool> video_high_bitrate;
// Experimental: Enable WebRtc higher start bitrate? // Experimental: Enable WebRtc higher start bitrate?
Settable<int> video_start_bitrate; Settable<int> video_start_bitrate;
// Experimental: Enable WebRTC layered screencast. // Experimental: Enable WebRTC layered screencast.