Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Unified Diff: webrtc/api/audio_codecs/opus/audio_encoder_opus_config.cc

Issue 2947563002: Revert of Opus implementation of the AudioEncoderFactoryTemplate API (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h ('k') | webrtc/api/audio_codecs/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/audio_codecs/opus/audio_encoder_opus_config.cc
diff --git a/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.cc b/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.cc
deleted file mode 100644
index d4e12e8ce8facb09e6c58d583c23c146f0a58180..0000000000000000000000000000000000000000
--- a/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h"
-
-namespace webrtc {
-
-namespace {
-
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS) || defined(WEBRTC_ARCH_ARM)
-// If we are on Android, iOS and/or ARM, use a lower complexity setting by
-// default, to save encoder complexity.
-constexpr int kDefaultComplexity = 5;
-#else
-constexpr int kDefaultComplexity = 9;
-#endif
-
-constexpr int kDefaultLowRateComplexity =
- WEBRTC_OPUS_VARIABLE_COMPLEXITY ? 9 : kDefaultComplexity;
-
-} // namespace
-
-constexpr int AudioEncoderOpusConfig::kDefaultFrameSizeMs;
-constexpr int AudioEncoderOpusConfig::kMinBitrateBps;
-constexpr int AudioEncoderOpusConfig::kMaxBitrateBps;
-
-AudioEncoderOpusConfig::AudioEncoderOpusConfig()
- : frame_size_ms(kDefaultFrameSizeMs),
- num_channels(1),
- application(ApplicationMode::kVoip),
- bitrate_bps(32000),
- fec_enabled(false),
- cbr_enabled(false),
- max_playback_rate_hz(48000),
- complexity(kDefaultComplexity),
- low_rate_complexity(kDefaultLowRateComplexity),
- complexity_threshold_bps(12500),
- complexity_threshold_window_bps(1500),
- dtx_enabled(false),
- uplink_bandwidth_update_interval_ms(200) {}
-AudioEncoderOpusConfig::AudioEncoderOpusConfig(const AudioEncoderOpusConfig&) =
- default;
-AudioEncoderOpusConfig::~AudioEncoderOpusConfig() = default;
-AudioEncoderOpusConfig& AudioEncoderOpusConfig::operator=(
- const AudioEncoderOpusConfig&) = default;
-
-bool AudioEncoderOpusConfig::IsOk() const {
- if (frame_size_ms <= 0 || frame_size_ms % 10 != 0)
- return false;
- if (num_channels != 1 && num_channels != 2)
- return false;
- if (bitrate_bps < kMinBitrateBps || bitrate_bps > kMaxBitrateBps)
- return false;
- if (complexity < 0 || complexity > 10)
- return false;
- if (low_rate_complexity < 0 || low_rate_complexity > 10)
- return false;
- return true;
-}
-} // namespace webrtc
« no previous file with comments | « webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h ('k') | webrtc/api/audio_codecs/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698