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

Side by Side Diff: talk/session/media/channelmanager_unittest.cc

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Cleanups. Created 5 years, 2 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 * 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,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "talk/app/webrtc/mediacontroller.h" 28 #include "talk/app/webrtc/fakemediacontroller.h"
29 #include "talk/media/base/fakecapturemanager.h" 29 #include "talk/media/base/fakecapturemanager.h"
30 #include "talk/media/base/fakemediaengine.h" 30 #include "talk/media/base/fakemediaengine.h"
31 #include "talk/media/base/fakevideocapturer.h" 31 #include "talk/media/base/fakevideocapturer.h"
32 #include "talk/media/base/testutils.h" 32 #include "talk/media/base/testutils.h"
33 #include "talk/media/webrtc/fakewebrtccall.h" 33 #include "talk/media/webrtc/fakewebrtccall.h"
34 #include "talk/session/media/channelmanager.h" 34 #include "talk/session/media/channelmanager.h"
35 #include "webrtc/base/gunit.h" 35 #include "webrtc/base/gunit.h"
36 #include "webrtc/base/logging.h" 36 #include "webrtc/base/logging.h"
37 #include "webrtc/base/thread.h" 37 #include "webrtc/base/thread.h"
38 #include "webrtc/p2p/base/faketransportcontroller.h" 38 #include "webrtc/p2p/base/faketransportcontroller.h"
39 39
40 namespace cricket { 40 namespace cricket {
41 41
42 static const AudioCodec kAudioCodecs[] = { 42 static const AudioCodec kAudioCodecs[] = {
43 AudioCodec(97, "voice", 1, 2, 3, 0), 43 AudioCodec(97, "voice", 1, 2, 3, 0),
44 AudioCodec(111, "OPUS", 48000, 32000, 2, 0), 44 AudioCodec(111, "OPUS", 48000, 32000, 2, 0),
45 }; 45 };
46 46
47 static const VideoCodec kVideoCodecs[] = { 47 static const VideoCodec kVideoCodecs[] = {
48 VideoCodec(99, "H264", 100, 200, 300, 0), 48 VideoCodec(99, "H264", 100, 200, 300, 0),
49 VideoCodec(100, "VP8", 100, 200, 300, 0), 49 VideoCodec(100, "VP8", 100, 200, 300, 0),
50 VideoCodec(96, "rtx", 100, 200, 300, 0), 50 VideoCodec(96, "rtx", 100, 200, 300, 0),
51 }; 51 };
52 52
53 class FakeMediaController : public webrtc::MediaControllerInterface {
54 public:
55 explicit FakeMediaController(webrtc::Call* call) : call_(call) {
56 RTC_DCHECK(nullptr != call);
57 }
58 ~FakeMediaController() override {}
59 webrtc::Call* call_w() override { return call_; }
60
61 private:
62 webrtc::Call* call_;
63 };
64
65 class ChannelManagerTest : public testing::Test { 53 class ChannelManagerTest : public testing::Test {
66 protected: 54 protected:
67 ChannelManagerTest() 55 ChannelManagerTest()
68 : fake_call_(webrtc::Call::Config()), 56 : fake_call_(webrtc::Call::Config()),
69 fake_mc_(&fake_call_), 57 fake_mc_(&fake_call_),
70 fme_(NULL), 58 fme_(NULL),
71 fcm_(NULL), 59 fcm_(NULL),
72 cm_(NULL) {} 60 cm_(NULL) {}
73 61
74 virtual void SetUp() { 62 virtual void SetUp() {
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 EXPECT_FALSE(cm_->SetVideoRtxEnabled(false)); 302 EXPECT_FALSE(cm_->SetVideoRtxEnabled(false));
315 303
316 // Can set again after terminate. 304 // Can set again after terminate.
317 cm_->Terminate(); 305 cm_->Terminate();
318 EXPECT_TRUE(cm_->SetVideoRtxEnabled(true)); 306 EXPECT_TRUE(cm_->SetVideoRtxEnabled(true));
319 cm_->GetSupportedVideoCodecs(&codecs); 307 cm_->GetSupportedVideoCodecs(&codecs);
320 EXPECT_TRUE(ContainsMatchingCodec(codecs, rtx_codec)); 308 EXPECT_TRUE(ContainsMatchingCodec(codecs, rtx_codec));
321 } 309 }
322 310
323 } // namespace cricket 311 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698