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

Unified Diff: webrtc/modules/audio_coding/codecs/audio_format.cc

Issue 2668523004: Move AudioDecoder and related stuff to the api/ directory (Closed)
Patch Set: more review fixes Created 3 years, 10 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
Index: webrtc/modules/audio_coding/codecs/audio_format.cc
diff --git a/webrtc/modules/audio_coding/codecs/audio_format.cc b/webrtc/modules/audio_coding/codecs/audio_format.cc
deleted file mode 100644
index f2a87d3d86afb4edd1d60b8f85e54981dec82a58..0000000000000000000000000000000000000000
--- a/webrtc/modules/audio_coding/codecs/audio_format.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2016 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/modules/audio_coding/codecs/audio_format.h"
-
-#include "webrtc/common_types.h"
-
-namespace webrtc {
-
-SdpAudioFormat::SdpAudioFormat(const SdpAudioFormat&) = default;
-SdpAudioFormat::SdpAudioFormat(SdpAudioFormat&&) = default;
-
-SdpAudioFormat::SdpAudioFormat(const char* name,
- int clockrate_hz,
- int num_channels)
- : name(name), clockrate_hz(clockrate_hz), num_channels(num_channels) {}
-
-SdpAudioFormat::SdpAudioFormat(const std::string& name,
- int clockrate_hz,
- int num_channels)
- : name(name), clockrate_hz(clockrate_hz), num_channels(num_channels) {}
-
-SdpAudioFormat::SdpAudioFormat(const char* name,
- int clockrate_hz,
- int num_channels,
- const Parameters& param)
- : name(name),
- clockrate_hz(clockrate_hz),
- num_channels(num_channels),
- parameters(param) {}
-
-SdpAudioFormat::SdpAudioFormat(const std::string& name,
- int clockrate_hz,
- int num_channels,
- const Parameters& param)
- : name(name),
- clockrate_hz(clockrate_hz),
- num_channels(num_channels),
- parameters(param) {}
-
-SdpAudioFormat::~SdpAudioFormat() = default;
-SdpAudioFormat& SdpAudioFormat::operator=(const SdpAudioFormat&) = default;
-SdpAudioFormat& SdpAudioFormat::operator=(SdpAudioFormat&&) = default;
-
-bool operator==(const SdpAudioFormat& a, const SdpAudioFormat& b) {
- return STR_CASE_CMP(a.name.c_str(), b.name.c_str()) == 0 &&
- a.clockrate_hz == b.clockrate_hz && a.num_channels == b.num_channels &&
- a.parameters == b.parameters;
-}
-
-void swap(SdpAudioFormat& a, SdpAudioFormat& b) {
- using std::swap;
- swap(a.name, b.name);
- swap(a.clockrate_hz, b.clockrate_hz);
- swap(a.num_channels, b.num_channels);
- swap(a.parameters, b.parameters);
-}
-
-std::ostream& operator<<(std::ostream& os, const SdpAudioFormat& saf) {
- os << "{name: " << saf.name;
- os << ", clockrate_hz: " << saf.clockrate_hz;
- os << ", num_channels: " << saf.num_channels;
- os << ", parameters: {";
- const char* sep = "";
- for (const auto& kv : saf.parameters) {
- os << sep << kv.first << ": " << kv.second;
- sep = ", ";
- }
- os << "}}";
- return os;
-}
-
-AudioCodecSpec::AudioCodecSpec(const SdpAudioFormat& format)
- : format(format) {}
-
-AudioCodecSpec::AudioCodecSpec(SdpAudioFormat&& format)
- : format(std::move(format)) {}
-
-} // namespace webrtc
« no previous file with comments | « webrtc/modules/audio_coding/codecs/audio_format.h ('k') | webrtc/modules/audio_coding/codecs/audio_format_conversion.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698