Index: webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h |
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h b/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h |
similarity index 51% |
copy from webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h |
copy to webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h |
index bb8faf45d85ce0f427125edfdfae7d58eac483de..cfc6fa805816cd5c8eb61440fca35fee086d7377 100644 |
--- a/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h |
+++ b/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h |
@@ -8,38 +8,35 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
-#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_ |
-#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_ |
+#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_ |
+#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_ |
#include "webrtc/base/constructormagic.h" |
#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" |
namespace webrtc { |
-class DtxController final : public Controller { |
+class BitrateController final : public Controller { |
krasin1
2016/09/20 21:22:26
For the reference, this change has caused an ODR v
|
public: |
struct Config { |
- Config(bool initial_dtx_enabled, |
- int dtx_enabling_bandwidth_bps, |
- int dtx_disabling_bandwidth_bps); |
- bool initial_dtx_enabled; |
- // Uplink bandwidth below which DTX should be switched on. |
- int dtx_enabling_bandwidth_bps; |
- // Uplink bandwidth above which DTX should be switched off. |
- int dtx_disabling_bandwidth_bps; |
+ Config(int initial_bitrate_bps, int frame_length_ms); |
+ ~Config(); |
+ int initial_bitrate_bps; |
+ int initial_frame_length_ms; |
}; |
- explicit DtxController(const Config& config); |
+ explicit BitrateController(const Config& config); |
void MakeDecision(const NetworkMetrics& metrics, |
AudioNetworkAdaptor::EncoderRuntimeConfig* config) override; |
private: |
const Config config_; |
- bool dtx_enabled_; |
- RTC_DISALLOW_COPY_AND_ASSIGN(DtxController); |
+ int bitrate_bps_; |
+ int overhead_rate_bps_; |
+ RTC_DISALLOW_COPY_AND_ASSIGN(BitrateController); |
}; |
} // namespace webrtc |
-#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_ |
+#endif // WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_ |