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}
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index c350d76..9c87887 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1382,6 +1382,7 @@
"../../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 @@
"../../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 @@
"../../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 40b0dc7..5b940ae 100644
--- a/modules/audio_coding/neteq/decoder_database.cc
+++ b/modules/audio_coding/neteq/decoder_database.cc
@@ -230,7 +230,8 @@
}
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 bdb46eb..2b2f1f0 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 {