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

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: More ios deps 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,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 { 53 class FakeMediaController : public webrtc::MediaControllerInterface {
54 public: 54 public:
55 explicit FakeMediaController(webrtc::Call* call) : call_(call) { 55 explicit FakeMediaController(webrtc::Call* call) : call_(call) {
56 RTC_DCHECK(nullptr != call); 56 RTC_DCHECK(nullptr != call_);
57 } 57 }
58 ~FakeMediaController() override {} 58 ~FakeMediaController() override {}
59 webrtc::Call* call_w() override { return call_; } 59 webrtc::Call* call_w() override { return call_; }
60 void ConnectToSignalSentPacket_w(
61 cricket::TransportChannel* transport_channel) override {}
60 62
61 private: 63 private:
62 webrtc::Call* call_; 64 webrtc::Call* call_;
63 }; 65 };
64 66
65 class ChannelManagerTest : public testing::Test { 67 class ChannelManagerTest : public testing::Test {
66 protected: 68 protected:
67 ChannelManagerTest() 69 ChannelManagerTest()
68 : fake_call_(webrtc::Call::Config()), 70 : fake_call_(webrtc::Call::Config()),
69 fake_mc_(&fake_call_), 71 fake_mc_(&fake_call_),
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 EXPECT_FALSE(cm_->SetVideoRtxEnabled(false)); 316 EXPECT_FALSE(cm_->SetVideoRtxEnabled(false));
315 317
316 // Can set again after terminate. 318 // Can set again after terminate.
317 cm_->Terminate(); 319 cm_->Terminate();
318 EXPECT_TRUE(cm_->SetVideoRtxEnabled(true)); 320 EXPECT_TRUE(cm_->SetVideoRtxEnabled(true));
319 cm_->GetSupportedVideoCodecs(&codecs); 321 cm_->GetSupportedVideoCodecs(&codecs);
320 EXPECT_TRUE(ContainsMatchingCodec(codecs, rtx_codec)); 322 EXPECT_TRUE(ContainsMatchingCodec(codecs, rtx_codec));
321 } 323 }
322 324
323 } // namespace cricket 325 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698