From 8aba6b41144360a375e87990f680cde9b56f88d9 Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Tue, 17 Apr 2018 10:10:57 +0200
Subject: [PATCH] Remove incompatiblities with absl::optional in audio_coding

PCMFile.cc uses RTC_DCHECK. include and depend on rtc_base:checks target directly

change usage of value_or by using explicit constructor instead of implicit

Bug: webrtc:9078
Change-Id: I63c596b8a05b387e56df846b15c33a605fbad4e6
Reviewed-on: https://webrtc-review.googlesource.com/69985
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22897}
---
 modules/audio_coding/BUILD.gn                  | 3 +++
 modules/audio_coding/neteq/decoder_database.cc | 3 ++-
 modules/audio_coding/test/PCMFile.cc           | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index c350d76ba7..9c87887bf5 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1382,6 +1382,7 @@ if (rtc_include_tests) {
       "../../api:optional",
       "../../api/audio:audio_frame_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
+      "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base/synchronization:rw_lock_wrapper",
       "../../system_wrappers",
@@ -1496,6 +1497,7 @@ if (rtc_include_tests) {
       "../../api:optional",
       "../../api/audio:audio_frame_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
+      "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
       "../../system_wrappers:system_wrappers_default",
@@ -1530,6 +1532,7 @@ if (rtc_include_tests) {
       "../../api:optional",
       "../../api/audio:audio_frame_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
+      "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
       "../../system_wrappers:system_wrappers_default",
diff --git a/modules/audio_coding/neteq/decoder_database.cc b/modules/audio_coding/neteq/decoder_database.cc
index 40b0dc7104..5b940aead2 100644
--- a/modules/audio_coding/neteq/decoder_database.cc
+++ b/modules/audio_coding/neteq/decoder_database.cc
@@ -230,7 +230,8 @@ int DecoderDatabase::InsertExternal(uint8_t rtp_payload_type,
   }
 
   const auto opt_db_format = NetEqDecoderToSdpAudioFormat(codec_type);
-  const SdpAudioFormat format = opt_db_format.value_or({"arbitrary", 0, 0});
+  const SdpAudioFormat format =
+      opt_db_format.value_or(SdpAudioFormat("arbitrary", 0, 0));
 
   std::pair<DecoderMap::iterator, bool> ret;
   DecoderInfo info(format, decoder, codec_name);
diff --git a/modules/audio_coding/test/PCMFile.cc b/modules/audio_coding/test/PCMFile.cc
index bdb46eb5a8..2b2f1f08c8 100644
--- a/modules/audio_coding/test/PCMFile.cc
+++ b/modules/audio_coding/test/PCMFile.cc
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "rtc_base/checks.h"
 #include "test/gtest.h"
 
 namespace webrtc {