Remove AudioConfig::Mode.

The Mode is currently redundant with the optional input_file_name.

Change-Id: Ib4f0a363e86d925107d61867a7f743d6663e7071
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/298743
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#39754}

api/test/pclf/media_configuration.h

@@ -375,19 +375,13 @@ struct VideoConfig {
 
 // Contains properties for audio in the call.
 struct AudioConfig {
-  enum Mode {
-    kGenerated,
-    kFile,
-  };
-
   AudioConfig() = default;
   explicit AudioConfig(absl::string_view stream_label);
 
   // Have to be unique among all specified configs for all peers in the call.
   // Will be auto generated if omitted.
   absl::optional<std::string> stream_label;
-  Mode mode = kGenerated;
+  // If no file is specified an audio will be generated.
-  // Have to be specified only if mode = kFile
   absl::optional<std::string> input_file_name;
   // If specified the input stream will be also copied to specified file.
   absl::optional<std::string> input_dump_file_name;

audio/test/pc_low_bandwidth_audio_test.cc

@@ -134,7 +134,6 @@ TEST(PCLowBandwidthAudioTest, PCGoodNetworkHighBitrate) {
       [](PeerConfigurer* alice) {
         AudioConfig audio;
         audio.stream_label = "alice-audio";
-        audio.mode = AudioConfig::Mode::kFile;
         audio.input_file_name = AudioInputFile();
         audio.output_dump_file_name = AudioOutputFile();
         audio.sampling_frequency_in_hz = absl::GetFlag(FLAGS_sample_rate_hz);
@@ -160,7 +159,6 @@ TEST(PCLowBandwidthAudioTest, PC40kbpsNetwork) {
       [](PeerConfigurer* alice) {
         AudioConfig audio;
         audio.stream_label = "alice-audio";
-        audio.mode = AudioConfig::Mode::kFile;
         audio.input_file_name = AudioInputFile();
         audio.output_dump_file_name = AudioOutputFile();
         audio.sampling_frequency_in_hz = absl::GetFlag(FLAGS_sample_rate_hz);

test/pc/e2e/peer_connection_e2e_smoke_test.cc

@@ -138,7 +138,6 @@ TEST_F(PeerConnectionE2EQualityTestSmokeTest, MAYBE_Smoke) {
 
     AudioConfig audio;
     audio.stream_label = "alice-audio";
-    audio.mode = AudioConfig::Mode::kFile;
     audio.input_file_name =
         test::ResourcePath("pc_quality_smoke_test_alice_source", "wav");
     audio.sampling_frequency_in_hz = 48000;
@@ -160,7 +159,6 @@ TEST_F(PeerConnectionE2EQualityTestSmokeTest, MAYBE_Smoke) {
 
     AudioConfig audio;
     audio.stream_label = "charlie-audio";
-    audio.mode = AudioConfig::Mode::kFile;
     audio.input_file_name =
         test::ResourcePath("pc_quality_smoke_test_bob_source", "wav");
     charlie->SetAudioConfig(std::move(audio));
@@ -211,7 +209,6 @@ TEST_F(PeerConnectionE2EQualityTestSmokeTest,
 
     AudioConfig audio;
     audio.stream_label = "alice-audio";
-    audio.mode = AudioConfig::Mode::kFile;
     audio.input_file_name =
         test::ResourcePath("pc_quality_smoke_test_alice_source", "wav");
     audio.sampling_frequency_in_hz = 48000;
@@ -231,7 +228,6 @@ TEST_F(PeerConnectionE2EQualityTestSmokeTest,
 
     AudioConfig audio;
     audio.stream_label = "charlie-audio";
-    audio.mode = AudioConfig::Mode::kFile;
     audio.input_file_name =
         test::ResourcePath("pc_quality_smoke_test_bob_source", "wav");
     charlie->SetAudioConfig(std::move(audio));
@@ -262,7 +258,6 @@ TEST_F(PeerConnectionE2EQualityTestSmokeTest, SmokeH264) {
 
     AudioConfig audio;
     audio.stream_label = "alice-audio";
-    audio.mode = AudioConfig::Mode::kFile;
     audio.input_file_name =
         test::ResourcePath("pc_quality_smoke_test_alice_source", "wav");
     audio.sampling_frequency_in_hz = 48000;
@@ -281,7 +276,6 @@ TEST_F(PeerConnectionE2EQualityTestSmokeTest, SmokeH264) {
 
     AudioConfig audio;
     audio.stream_label = "charlie-audio";
-    audio.mode = AudioConfig::Mode::kFile;
     audio.input_file_name =
         test::ResourcePath("pc_quality_smoke_test_bob_source", "wav");
     charlie->SetAudioConfig(std::move(audio));
@@ -413,7 +407,6 @@ TEST_F(PeerConnectionE2EQualityTestSmokeTest, MAYBE_Echo) {
   AddPeer(network_links.first, [](PeerConfigurer* alice) {
     AudioConfig audio;
     audio.stream_label = "alice-audio";
-    audio.mode = AudioConfig::Mode::kFile;
     audio.input_file_name =
         test::ResourcePath("pc_quality_smoke_test_alice_source", "wav");
     audio.sampling_frequency_in_hz = 48000;
@@ -422,7 +415,6 @@ TEST_F(PeerConnectionE2EQualityTestSmokeTest, MAYBE_Echo) {
   AddPeer(network_links.second, [](PeerConfigurer* bob) {
     AudioConfig audio;
     audio.stream_label = "bob-audio";
-    audio.mode = AudioConfig::Mode::kFile;
     audio.input_file_name =
         test::ResourcePath("pc_quality_smoke_test_bob_source", "wav");
     bob->SetAudioConfig(std::move(audio));
@@ -450,7 +442,6 @@ TEST_F(PeerConnectionE2EQualityTestSmokeTest, MAYBE_Simulcast) {
 
     AudioConfig audio;
     audio.stream_label = "alice-audio";
-    audio.mode = AudioConfig::Mode::kFile;
     audio.input_file_name =
         test::ResourcePath("pc_quality_smoke_test_alice_source", "wav");
     alice->SetAudioConfig(std::move(audio));
@@ -478,7 +469,6 @@ TEST_F(PeerConnectionE2EQualityTestSmokeTest, MAYBE_Svc) {
     alice->AddVideoConfig(std::move(simulcast));
 
     AudioConfig audio("alice-audio");
-    audio.mode = AudioConfig::Mode::kFile;
     audio.input_file_name =
         test::ResourcePath("pc_quality_smoke_test_alice_source", "wav");
     alice->SetAudioConfig(std::move(audio));
@@ -515,7 +505,6 @@ TEST_F(PeerConnectionE2EQualityTestSmokeTest, MAYBE_HighBitrate) {
 
     AudioConfig audio;
     audio.stream_label = "alice-audio";
-    audio.mode = AudioConfig::Mode::kFile;
     audio.input_file_name =
         test::ResourcePath("pc_quality_smoke_test_alice_source", "wav");
     audio.sampling_frequency_in_hz = 48000;