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

Side by Side Diff: webrtc/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc

Issue 2516993002: Pass SdpAudioFormat through Channel, without converting to CodecInst (Closed)
Patch Set: add TODO Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 ASSERT_TRUE(adf); 115 ASSERT_TRUE(adf);
116 // Opus supports 48 kHz, 2 channels, and wants a "stereo" parameter whose 116 // Opus supports 48 kHz, 2 channels, and wants a "stereo" parameter whose
117 // value is either "0" or "1". 117 // value is either "0" or "1".
118 for (int hz : {8000, 16000, 32000, 48000}) { 118 for (int hz : {8000, 16000, 32000, 48000}) {
119 for (int channels : {0, 1, 2, 3}) { 119 for (int channels : {0, 1, 2, 3}) {
120 for (std::string stereo : {"XX", "0", "1", "2"}) { 120 for (std::string stereo : {"XX", "0", "1", "2"}) {
121 std::map<std::string, std::string> params; 121 std::map<std::string, std::string> params;
122 if (stereo != "XX") { 122 if (stereo != "XX") {
123 params["stereo"] = stereo; 123 params["stereo"] = stereo;
124 } 124 }
125 bool good = 125 const bool good = (hz == 48000 && channels == 2 &&
126 (hz == 48000 && channels == 2 && (stereo == "0" || stereo == "1")); 126 (stereo == "XX" || stereo == "0" || stereo == "1"));
127 EXPECT_EQ(good, static_cast<bool>(adf->MakeAudioDecoder(SdpAudioFormat( 127 EXPECT_EQ(good, static_cast<bool>(adf->MakeAudioDecoder(SdpAudioFormat(
128 "opus", hz, channels, std::move(params))))); 128 "opus", hz, channels, std::move(params)))));
129 } 129 }
130 } 130 }
131 } 131 }
132 } 132 }
133 133
134 } // namespace webrtc 134 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/codecs/audio_decoder_factory.h ('k') | webrtc/modules/audio_coding/codecs/audio_format.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698