zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Enable using a custom NetEqFactory in simulations"

Browse Source 
This reverts commit 2a11b2451a4068746fa0c55fa210efd4a15e4423.

Reason for revert: Causes b/147826709

Original change's description:
> Enable using a custom NetEqFactory in simulations
> 
> Bug: webrtc:11005
> Change-Id: I8a15f77953cbd3c29a75c7cfc77f926b138994b9
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165580
> Commit-Queue: Ivo Creusen <ivoc@webrtc.org>
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#30286}

TBR=kwiberg@webrtc.org,ivoc@webrtc.org

Change-Id: I14a0bd6ad2a90f1686b8b1a78f18aea9325871fe
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:11005
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166403
Reviewed-by: Qingsi Wang <qingsi@webrtc.org>
Commit-Queue: Sandeep Siddhartha <sansid@google.com>
Cr-Commit-Position: refs/heads/master@{#30288}
This commit is contained in:
Sandeep Siddhartha
2020-01-16 22:48:36 +00:00
committed by Commit Bot
parent 8daecc0e1e
commit 3f0bc2c176
13 changed files with 19 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/BUILD.gn
View File

@ -678,7 +678,6 @@ if (rtc_include_tests) {
":neteq_simulator_api",
"../modules/audio_coding:neteq_test_factory",
"../rtc_base:checks",
"neteq:neteq_api",
"//third_party/abseil-cpp/absl/flags:flag",
"//third_party/abseil-cpp/absl/flags:parse",
"//third_party/abseil-cpp/absl/strings",

10
api/test/neteq_simulator_factory.cc
View File

@ -50,8 +50,7 @@ std::unique_ptr<NetEqSimulator> NetEqSimulatorFactory::CreateSimulator(
config.max_nr_packets_in_buffer =
absl::GetFlag(FLAGS_max_nr_packets_in_buffer);
config.output_audio_filename = output_audio_filename;
return factory_->InitializeTestFromFile(/*input_file_name=*/args[1],
/*factory=*/nullptr, config);
return factory_->InitializeTestFromFile(args[1], config);
}
std::unique_ptr<NetEqSimulator> NetEqSimulatorFactory::CreateSimulatorFromFile(
@ -64,8 +63,8 @@ std::unique_ptr<NetEqSimulator> NetEqSimulatorFactory::CreateSimulatorFromFile(
config.initial_dummy_packets = simulation_config.initial_dummy_packets;
config.skip_get_audio_events = simulation_config.skip_get_audio_events;
config.field_trial_string = simulation_config.field_trial_string;
return factory_->InitializeTestFromFile(
std::string(event_log_filename), simulation_config.neteq_factory, config);
return factory_->InitializeTestFromFile(std::string(event_log_filename),
config);
}
std::unique_ptr<NetEqSimulator>
@ -80,8 +79,7 @@ NetEqSimulatorFactory::CreateSimulatorFromString(
config.skip_get_audio_events = simulation_config.skip_get_audio_events;
config.field_trial_string = simulation_config.field_trial_string;
return factory_->InitializeTestFromString(
std::string(event_log_file_contents), simulation_config.neteq_factory,
config);
std::string(event_log_file_contents), config);
}
} // namespace test

3
api/test/neteq_simulator_factory.h
View File

@ -15,7 +15,6 @@
#include <string>
#include "absl/strings/string_view.h"
#include "api/neteq/neteq_factory.h"
#include "api/test/neteq_simulator.h"
namespace webrtc {
@ -41,8 +40,6 @@ class NetEqSimulatorFactory {
int skip_get_audio_events = 0;
// A WebRTC field trial string to be used during the simulation.
std::string field_trial_string;
// A custom NetEqFactory can be used.
NetEqFactory* neteq_factory = nullptr;
};
// This function takes the same arguments as the neteq_rtpplay utility.
std::unique_ptr<NetEqSimulator> CreateSimulator(int argc, char* argv[]);