commit 703259c6e987b3f61e4e4cfd3572df173a8c667a
author Sam Zackrisson <saza@webrtc.org> Wed Oct 10 15:17:43 2018
committer Commit Bot <commit-bot@chromium.org> Thu Oct 11 10:37:41 2018
tree 44545862ddc91cb3e11f8dcff0565b568673dfd3
parent 80bf775ab3394f71d69f20c964032b87ea070244

Don't CHECK when parsing AEC3 parameters from json

This CL replaces CHECKs and crashes with DCHECKs and default values.

Bug: webrtc:9535
Change-Id: Ib4b16421699c633d0e9ef140189861c8179450f4
Reviewed-on: https://webrtc-review.googlesource.com/c/105003
Reviewed-by: Alex Loiko <aleloi@webrtc.org>
Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org>
Commit-Queue: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25111}

api/audio/echo_canceller3_config_json.cc

diff --git a/api/audio/echo_canceller3_config_json.cc b/api/audio/echo_canceller3_config_json.cc
index 6599ed6..cbe7513 100644
--- a/api/audio/echo_canceller3_config_json.cc
+++ b/api/audio/echo_canceller3_config_json.cc
@@ -53,14 +53,14 @@
 void ReadParam(const Json::Value& root,
                std::string param_name,
                EchoCanceller3Config::Filter::MainConfiguration* param) {
-  RTC_CHECK(param);
+  RTC_DCHECK(param);
   Json::Value json_array;
   if (rtc::GetValueFromJsonObject(root, param_name, &json_array)) {
     std::vector<double> v;
     rtc::JsonArrayToDoubleVector(json_array, &v);
     if (v.size() != 6) {
       RTC_LOG(LS_ERROR) << "Incorrect array size for " << param_name;
-      RTC_CHECK(false);
+      return;
     }
     param->length_blocks = static_cast<size_t>(v[0]);
     param->leakage_converged = static_cast<float>(v[1]);
@@ -74,14 +74,14 @@
 void ReadParam(const Json::Value& root,
                std::string param_name,
                EchoCanceller3Config::Filter::ShadowConfiguration* param) {
-  RTC_CHECK(param);
+  RTC_DCHECK(param);
   Json::Value json_array;
   if (rtc::GetValueFromJsonObject(root, param_name, &json_array)) {
     std::vector<double> v;
     rtc::JsonArrayToDoubleVector(json_array, &v);
     if (v.size() != 3) {
       RTC_LOG(LS_ERROR) << "Incorrect array size for " << param_name;
-      RTC_CHECK(false);
+      return;
     }
     param->length_blocks = static_cast<size_t>(v[0]);
     param->rate = static_cast<float>(v[1]);
@@ -92,14 +92,14 @@
 void ReadParam(const Json::Value& root,
                std::string param_name,
                EchoCanceller3Config::Suppressor::MaskingThresholds* param) {
-  RTC_CHECK(param);
+  RTC_DCHECK(param);
   Json::Value json_array;
   if (rtc::GetValueFromJsonObject(root, param_name, &json_array)) {
     std::vector<double> v;
     rtc::JsonArrayToDoubleVector(json_array, &v);
     if (v.size() != 3) {
       RTC_LOG(LS_ERROR) << "Incorrect array size for " << param_name;
-      RTC_CHECK(false);
+      return;
     }
     param->enr_transparent = static_cast<float>(v[0]);
     param->enr_suppress = static_cast<float>(v[1]);