| Index: webrtc/media/base/mediachannel.h
|
| diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h
|
| index b71a309233546f941150431bf5df4aca8f46b095..8d9c28ac4beb9995f645411da95e77e790d49ea4 100644
|
| --- a/webrtc/media/base/mediachannel.h
|
| +++ b/webrtc/media/base/mediachannel.h
|
| @@ -166,6 +166,8 @@ struct AudioOptions {
|
| SetFrom(&recording_sample_rate, change.recording_sample_rate);
|
| SetFrom(&playout_sample_rate, change.playout_sample_rate);
|
| SetFrom(&combined_audio_video_bwe, change.combined_audio_video_bwe);
|
| + SetFrom(&level_control_initial_peak_level_dbfs,
|
| + change.level_control_initial_peak_level_dbfs);
|
| }
|
|
|
| bool operator==(const AudioOptions& o) const {
|
| @@ -193,7 +195,9 @@ struct AudioOptions {
|
| tx_agc_limiter == o.tx_agc_limiter &&
|
| recording_sample_rate == o.recording_sample_rate &&
|
| playout_sample_rate == o.playout_sample_rate &&
|
| - combined_audio_video_bwe == o.combined_audio_video_bwe;
|
| + combined_audio_video_bwe == o.combined_audio_video_bwe &&
|
| + level_control_initial_peak_level_dbfs ==
|
| + o.level_control_initial_peak_level_dbfs;
|
| }
|
| bool operator!=(const AudioOptions& o) const { return !(*this == o); }
|
|
|
| @@ -225,6 +229,8 @@ struct AudioOptions {
|
| ost << ToStringIfSet("recording_sample_rate", recording_sample_rate);
|
| ost << ToStringIfSet("playout_sample_rate", playout_sample_rate);
|
| ost << ToStringIfSet("combined_audio_video_bwe", combined_audio_video_bwe);
|
| + ost << ToStringIfSet("level_control_initial_peak_level_dbfs",
|
| + level_control_initial_peak_level_dbfs);
|
| ost << "}";
|
| return ost.str();
|
| }
|
| @@ -254,6 +260,8 @@ struct AudioOptions {
|
| rtc::Optional<bool> experimental_ns;
|
| rtc::Optional<bool> intelligibility_enhancer;
|
| rtc::Optional<bool> level_control;
|
| + // Specifies an optional initialization value for the level controller.
|
| + rtc::Optional<float> level_control_initial_peak_level_dbfs;
|
| // Note that tx_agc_* only applies to non-experimental AGC.
|
| rtc::Optional<uint16_t> tx_agc_target_dbov;
|
| rtc::Optional<uint16_t> tx_agc_digital_compression_gain;
|
|
|