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

Side by Side Diff: webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.cc

Issue 1335353005: Remove channel ids from various interfaces. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 3 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 EXPECT_EQ(0, voe_base_->StartReceive(channel_)); 54 EXPECT_EQ(0, voe_base_->StartReceive(channel_));
55 EXPECT_EQ(0, voe_base_->StartPlayout(channel_)); 55 EXPECT_EQ(0, voe_base_->StartPlayout(channel_));
56 EXPECT_EQ(0, voe_base_->StartSend(channel_)); 56 EXPECT_EQ(0, voe_base_->StartSend(channel_));
57 } 57 }
58 58
59 void BeforeStreamingFixture::WaitForTransmittedPackets(int32_t packet_count) { 59 void BeforeStreamingFixture::WaitForTransmittedPackets(int32_t packet_count) {
60 transport_->WaitForTransmittedPackets(packet_count); 60 transport_->WaitForTransmittedPackets(packet_count);
61 } 61 }
62 62
63 void BeforeStreamingFixture::SetUpLocalPlayback() { 63 void BeforeStreamingFixture::SetUpLocalPlayback() {
64 transport_ = new LoopBackTransport(voe_network_); 64 transport_ = new LoopBackTransport(voe_network_, channel_);
65 EXPECT_EQ(0, voe_network_->RegisterExternalTransport(channel_, *transport_)); 65 EXPECT_EQ(0, voe_network_->RegisterExternalTransport(channel_, *transport_));
66 66
67 webrtc::CodecInst codec; 67 webrtc::CodecInst codec;
68 codec.channels = 1; 68 codec.channels = 1;
69 codec.pacsize = 160; 69 codec.pacsize = 160;
70 codec.plfreq = 8000; 70 codec.plfreq = 8000;
71 codec.pltype = 0; 71 codec.pltype = 0;
72 codec.rate = 64000; 72 codec.rate = 64000;
73 #if defined(_MSC_VER) && defined(_WIN32) 73 #if defined(_MSC_VER) && defined(_WIN32)
74 _snprintf(codec.plname, RTP_PAYLOAD_NAME_SIZE - 1, "PCMU"); 74 _snprintf(codec.plname, RTP_PAYLOAD_NAME_SIZE - 1, "PCMU");
75 #else 75 #else
76 snprintf(codec.plname, RTP_PAYLOAD_NAME_SIZE, "PCMU"); 76 snprintf(codec.plname, RTP_PAYLOAD_NAME_SIZE, "PCMU");
77 #endif 77 #endif
78 voe_codec_->SetSendCodec(channel_, codec); 78 voe_codec_->SetSendCodec(channel_, codec);
79 } 79 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698