From 423bae437ce1394c07783575b7f9ed686a4cdab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20Ivarsson=E2=80=8E?= Date: Tue, 5 Mar 2019 09:16:06 +0000 Subject: [PATCH] Revert "Remove field trial include from decision logic." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d9f798a6b368024513b0dee5456703849608827d. Reason for revert: Original change's description: > Remove field trial include from decision logic. > > Bug: webrtc:9289 > Change-Id: I2e465bf9eddda8bde50daeb14cfd51405e536ff4 > Reviewed-on: https://webrtc-review.googlesource.com/c/125097 > Reviewed-by: Minyue Li > Commit-Queue: Jakob Ivarsson‎ > Cr-Commit-Position: refs/heads/master@{#26925} TBR=minyue@webrtc.org,jakobi@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:9289 Change-Id: I439a7477c9b0d94abe815b375b05b7545e3617f1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/125683 Reviewed-by: Jakob Ivarsson‎ Commit-Queue: Jakob Ivarsson‎ Cr-Commit-Position: refs/heads/master@{#26967} --- modules/audio_coding/neteq/decision_logic.cc | 1 + modules/audio_coding/neteq/decision_logic_unittest.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/audio_coding/neteq/decision_logic.cc b/modules/audio_coding/neteq/decision_logic.cc index b2a45d50ab..5976410aac 100644 --- a/modules/audio_coding/neteq/decision_logic.cc +++ b/modules/audio_coding/neteq/decision_logic.cc @@ -23,6 +23,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" +#include "system_wrappers/include/field_trial.h" namespace { diff --git a/modules/audio_coding/neteq/decision_logic_unittest.cc b/modules/audio_coding/neteq/decision_logic_unittest.cc index 453e8707a1..17840d1a28 100644 --- a/modules/audio_coding/neteq/decision_logic_unittest.cc +++ b/modules/audio_coding/neteq/decision_logic_unittest.cc @@ -17,6 +17,7 @@ #include "modules/audio_coding/neteq/delay_peak_detector.h" #include "modules/audio_coding/neteq/packet_buffer.h" #include "modules/audio_coding/neteq/tick_timer.h" +#include "test/field_trial.h" #include "test/gtest.h" #include "test/mock_audio_decoder_factory.h"