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

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

Issue 1335923002: Add RTC_ prefix to (D)CHECKs and related macros. (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
« no previous file with comments | « talk/media/webrtc/webrtcvoiceengine.cc ('k') | talk/session/media/channelmanager_unittest.cc » ('j') | 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 * libjingle 2 * libjingle
3 * Copyright 2008 Google Inc. 3 * Copyright 2008 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 int SetTraceCallback(webrtc::TraceCallback* callback) override { return 0; } 90 int SetTraceCallback(webrtc::TraceCallback* callback) override { return 0; }
91 unsigned int filter_; 91 unsigned int filter_;
92 }; 92 };
93 93
94 class WebRtcVoiceEngineTestFake : public testing::Test { 94 class WebRtcVoiceEngineTestFake : public testing::Test {
95 public: 95 public:
96 class ChannelErrorListener : public sigslot::has_slots<> { 96 class ChannelErrorListener : public sigslot::has_slots<> {
97 public: 97 public:
98 explicit ChannelErrorListener(cricket::VoiceMediaChannel* channel) 98 explicit ChannelErrorListener(cricket::VoiceMediaChannel* channel)
99 : ssrc_(0), error_(cricket::VoiceMediaChannel::ERROR_NONE) { 99 : ssrc_(0), error_(cricket::VoiceMediaChannel::ERROR_NONE) {
100 DCHECK(channel != NULL); 100 RTC_DCHECK(channel != NULL);
101 channel->SignalMediaError.connect( 101 channel->SignalMediaError.connect(
102 this, &ChannelErrorListener::OnVoiceChannelError); 102 this, &ChannelErrorListener::OnVoiceChannelError);
103 } 103 }
104 void OnVoiceChannelError(uint32 ssrc, 104 void OnVoiceChannelError(uint32 ssrc,
105 cricket::VoiceMediaChannel::Error error) { 105 cricket::VoiceMediaChannel::Error error) {
106 ssrc_ = ssrc; 106 ssrc_ = ssrc;
107 error_ = error; 107 error_ = error;
108 } 108 }
109 void Reset() { 109 void Reset() {
110 ssrc_ = 0; 110 ssrc_ = 0;
(...skipping 3448 matching lines...) Expand 10 before | Expand all | Expand 10 after
3559 3559
3560 // Test that we set our preferred codecs properly. 3560 // Test that we set our preferred codecs properly.
3561 TEST(WebRtcVoiceEngineTest, SetRecvCodecs) { 3561 TEST(WebRtcVoiceEngineTest, SetRecvCodecs) {
3562 cricket::WebRtcVoiceEngine engine; 3562 cricket::WebRtcVoiceEngine engine;
3563 EXPECT_TRUE(engine.Init(rtc::Thread::Current())); 3563 EXPECT_TRUE(engine.Init(rtc::Thread::Current()));
3564 rtc::scoped_ptr<webrtc::Call> call( 3564 rtc::scoped_ptr<webrtc::Call> call(
3565 webrtc::Call::Create(webrtc::Call::Config())); 3565 webrtc::Call::Create(webrtc::Call::Config()));
3566 cricket::WebRtcVoiceMediaChannel channel(&engine, call.get()); 3566 cricket::WebRtcVoiceMediaChannel channel(&engine, call.get());
3567 EXPECT_TRUE(channel.SetRecvCodecs(engine.codecs())); 3567 EXPECT_TRUE(channel.SetRecvCodecs(engine.codecs()));
3568 } 3568 }
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvoiceengine.cc ('k') | talk/session/media/channelmanager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698