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

Remove incompatiblities with absl::optional in audio_coding

Browse Source 
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}
This commit is contained in:
Danil Chapovalov
2018-04-17 10:10:57 +02:00
committed by Commit Bot
parent 70595c1c35
commit 8aba6b4114
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/audio_coding/BUILD.gn
View File

@ -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",

3
modules/audio_coding/neteq/decoder_database.cc
View File

@ -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);

1
modules/audio_coding/test/PCMFile.cc
View File

@ -14,6 +14,7 @@
#include <stdio.h>
#include <string.h>
#include "rtc_base/checks.h"
#include "test/gtest.h"
namespace webrtc {