Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h

Issue 2429503002: Simplifying audio network adaptor by moving receiver frame length range to ctor. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h
diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h
index 342668e78002976165d3d453256cc321680fb606..5df4f7a70f53b446a29e6ef31f8f97363203f49c 100644
--- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h
+++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h
@@ -62,8 +62,11 @@ class AudioEncoderOpus final : public AudioEncoder {
};
using AudioNetworkAdaptorCreator =
- std::function<std::unique_ptr<AudioNetworkAdaptor>(const std::string&,
- const Clock*)>;
+ std::function<std::unique_ptr<AudioNetworkAdaptor>(
+ const std::string&,
+ int min_receiver_frame_length_ms,
+ int max_receiver_frame_length_ms,
+ const Clock*)>;
AudioEncoderOpus(
const Config& config,
AudioNetworkAdaptorCreator&& audio_network_adaptor_creator = nullptr);
@@ -93,6 +96,8 @@ class AudioEncoderOpus final : public AudioEncoder {
void SetTargetBitrate(int target_bps) override;
bool EnableAudioNetworkAdaptor(const std::string& config_string,
+ int min_receiver_frame_length_ms,
+ int max_receiver_frame_length_ms,
const Clock* clock) override;
void DisableAudioNetworkAdaptor() override;
void OnReceivedUplinkBandwidth(int uplink_bandwidth_bps) override;
@@ -100,8 +105,6 @@ class AudioEncoderOpus final : public AudioEncoder {
float uplink_packet_loss_fraction) override;
void OnReceivedTargetAudioBitrate(int target_audio_bitrate_bps) override;
void OnReceivedRtt(int rtt_ms) override;
- void SetReceiverFrameLengthRange(int min_frame_length_ms,
- int max_frame_length_ms) override;
// Getters for testing.
double packet_loss_rate() const { return packet_loss_rate_; }
@@ -127,6 +130,8 @@ class AudioEncoderOpus final : public AudioEncoder {
void ApplyAudioNetworkAdaptor();
std::unique_ptr<AudioNetworkAdaptor> DefaultAudioNetworkAdaptorCreator(
const std::string& config_string,
+ int min_receiver_frame_length_ms,
+ int max_receiver_frame_length_ms,
const Clock* clock) const;
Config config_;

Powered by Google App Engine
This is Rietveld 408576698