Index: webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h |
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h b/webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h |
index 14ddbca0a781e2bfd257843291d185540739e95c..5dc0849f420d17e7f444a13729d883033111e83e 100644 |
--- a/webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h |
+++ b/webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h |
@@ -15,26 +15,27 @@ |
namespace webrtc { |
+struct AudioEncoderRuntimeConfig { |
+ AudioEncoderRuntimeConfig(); |
+ AudioEncoderRuntimeConfig(const AudioEncoderRuntimeConfig& other); |
+ ~AudioEncoderRuntimeConfig(); |
+ rtc::Optional<int> bitrate_bps; |
+ rtc::Optional<int> frame_length_ms; |
+ rtc::Optional<float> uplink_packet_loss_fraction; |
+ rtc::Optional<bool> enable_fec; |
+ rtc::Optional<bool> enable_dtx; |
+ |
+ // Some encoders can encode fewer channels than the actual input to make |
+ // better use of the bandwidth. |num_channels| sets the number of channels |
+ // to encode. |
+ rtc::Optional<size_t> num_channels; |
+}; |
+ |
// An AudioNetworkAdaptor optimizes the audio experience by suggesting a |
// suitable runtime configuration (bit rate, frame length, FEC, etc.) to the |
// encoder based on network metrics. |
class AudioNetworkAdaptor { |
public: |
- struct EncoderRuntimeConfig { |
- EncoderRuntimeConfig(); |
- EncoderRuntimeConfig(const EncoderRuntimeConfig& other); |
- ~EncoderRuntimeConfig(); |
- rtc::Optional<int> bitrate_bps; |
- rtc::Optional<int> frame_length_ms; |
- rtc::Optional<float> uplink_packet_loss_fraction; |
- rtc::Optional<bool> enable_fec; |
- rtc::Optional<bool> enable_dtx; |
- |
- // Some encoders can encode fewer channels than the actual input to make |
- // better use of the bandwidth. |num_channels| sets the number of channels |
- // to encode. |
- rtc::Optional<size_t> num_channels; |
- }; |
virtual ~AudioNetworkAdaptor() = default; |
@@ -49,7 +50,7 @@ class AudioNetworkAdaptor { |
virtual void SetOverhead(size_t overhead_bytes_per_packet) = 0; |
- virtual EncoderRuntimeConfig GetEncoderRuntimeConfig() = 0; |
+ virtual AudioEncoderRuntimeConfig GetEncoderRuntimeConfig() = 0; |
virtual void StartDebugDump(FILE* file_handle) = 0; |