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

Side by Side Diff: webrtc/media/engine/webrtcvoiceengine_unittest.cc

Issue 2900713002: Increase number of unsignaled audio streams we handle to 4. (Closed)
Patch Set: Fix unit tests Created 3 years, 7 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
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2008 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2008 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 21 matching lines...) Expand all
32 #include "webrtc/test/mock_audio_decoder_factory.h" 32 #include "webrtc/test/mock_audio_decoder_factory.h"
33 #include "webrtc/test/mock_audio_encoder_factory.h" 33 #include "webrtc/test/mock_audio_encoder_factory.h"
34 #include "webrtc/voice_engine/transmit_mixer.h" 34 #include "webrtc/voice_engine/transmit_mixer.h"
35 35
36 using testing::ContainerEq; 36 using testing::ContainerEq;
37 using testing::Return; 37 using testing::Return;
38 using testing::StrictMock; 38 using testing::StrictMock;
39 39
40 namespace { 40 namespace {
41 41
42 constexpr uint32_t kMaxUnsignaledRecvStreams = 1; 42 constexpr uint32_t kMaxUnsignaledRecvStreams = 4;
43 43
44 const cricket::AudioCodec kPcmuCodec(0, "PCMU", 8000, 64000, 1); 44 const cricket::AudioCodec kPcmuCodec(0, "PCMU", 8000, 64000, 1);
45 const cricket::AudioCodec kIsacCodec(103, "ISAC", 16000, 32000, 1); 45 const cricket::AudioCodec kIsacCodec(103, "ISAC", 16000, 32000, 1);
46 const cricket::AudioCodec kOpusCodec(111, "opus", 48000, 32000, 2); 46 const cricket::AudioCodec kOpusCodec(111, "opus", 48000, 32000, 2);
47 const cricket::AudioCodec kG722CodecVoE(9, "G722", 16000, 64000, 1); 47 const cricket::AudioCodec kG722CodecVoE(9, "G722", 16000, 64000, 1);
48 const cricket::AudioCodec kG722CodecSdp(9, "G722", 8000, 64000, 1); 48 const cricket::AudioCodec kG722CodecSdp(9, "G722", 8000, 64000, 1);
49 const cricket::AudioCodec kCn8000Codec(13, "CN", 8000, 0, 1); 49 const cricket::AudioCodec kCn8000Codec(13, "CN", 8000, 0, 1);
50 const cricket::AudioCodec kCn16000Codec(105, "CN", 16000, 0, 1); 50 const cricket::AudioCodec kCn16000Codec(105, "CN", 16000, 0, 1);
51 const cricket::AudioCodec 51 const cricket::AudioCodec
52 kTelephoneEventCodec1(106, "telephone-event", 8000, 0, 1); 52 kTelephoneEventCodec1(106, "telephone-event", 8000, 0, 1);
(...skipping 3399 matching lines...) Expand 10 before | Expand all | Expand 10 after
3452 // Without this cast, the comparison turned unsigned and, thus, failed for -1. 3452 // Without this cast, the comparison turned unsigned and, thus, failed for -1.
3453 const int num_specs = static_cast<int>(specs.size()); 3453 const int num_specs = static_cast<int>(specs.size());
3454 EXPECT_GE(find_codec({"cn", 8000, 1}), num_specs); 3454 EXPECT_GE(find_codec({"cn", 8000, 1}), num_specs);
3455 EXPECT_GE(find_codec({"cn", 16000, 1}), num_specs); 3455 EXPECT_GE(find_codec({"cn", 16000, 1}), num_specs);
3456 EXPECT_EQ(find_codec({"cn", 32000, 1}), -1); 3456 EXPECT_EQ(find_codec({"cn", 32000, 1}), -1);
3457 EXPECT_GE(find_codec({"telephone-event", 8000, 1}), num_specs); 3457 EXPECT_GE(find_codec({"telephone-event", 8000, 1}), num_specs);
3458 EXPECT_GE(find_codec({"telephone-event", 16000, 1}), num_specs); 3458 EXPECT_GE(find_codec({"telephone-event", 16000, 1}), num_specs);
3459 EXPECT_GE(find_codec({"telephone-event", 32000, 1}), num_specs); 3459 EXPECT_GE(find_codec({"telephone-event", 32000, 1}), num_specs);
3460 EXPECT_GE(find_codec({"telephone-event", 48000, 1}), num_specs); 3460 EXPECT_GE(find_codec({"telephone-event", 48000, 1}), num_specs);
3461 } 3461 }
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698