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

Side by Side Diff: talk/app/webrtc/videotrack_unittest.cc

Issue 1346153002: Remove use of DeviceManager from ChannelManager. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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 2012 Google Inc. 3 * Copyright 2012 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 14 matching lines...) Expand all
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include <string> 28 #include <string>
29 29
30 #include "talk/app/webrtc/remotevideocapturer.h" 30 #include "talk/app/webrtc/remotevideocapturer.h"
31 #include "talk/app/webrtc/test/fakevideotrackrenderer.h" 31 #include "talk/app/webrtc/test/fakevideotrackrenderer.h"
32 #include "talk/app/webrtc/videosource.h" 32 #include "talk/app/webrtc/videosource.h"
33 #include "talk/app/webrtc/videotrack.h" 33 #include "talk/app/webrtc/videotrack.h"
34 #include "talk/media/base/fakemediaengine.h" 34 #include "talk/media/base/fakemediaengine.h"
35 #include "talk/media/devices/fakedevicemanager.h"
36 #include "talk/media/webrtc/webrtcvideoframe.h" 35 #include "talk/media/webrtc/webrtcvideoframe.h"
37 #include "talk/session/media/channelmanager.h" 36 #include "talk/session/media/channelmanager.h"
38 #include "webrtc/base/gunit.h" 37 #include "webrtc/base/gunit.h"
39 #include "webrtc/base/scoped_ptr.h" 38 #include "webrtc/base/scoped_ptr.h"
40 39
41 using webrtc::FakeVideoTrackRenderer; 40 using webrtc::FakeVideoTrackRenderer;
42 using webrtc::VideoSource; 41 using webrtc::VideoSource;
43 using webrtc::VideoTrack; 42 using webrtc::VideoTrack;
44 using webrtc::VideoTrackInterface; 43 using webrtc::VideoTrackInterface;
45 44
46 namespace { 45 namespace {
47 46
48 class WebRtcVideoTestFrame : public cricket::WebRtcVideoFrame { 47 class WebRtcVideoTestFrame : public cricket::WebRtcVideoFrame {
49 public: 48 public:
50 using cricket::WebRtcVideoFrame::SetRotation; 49 using cricket::WebRtcVideoFrame::SetRotation;
51 }; 50 };
52 51
53 } // namespace 52 } // namespace
54 53
55 class VideoTrackTest : public testing::Test { 54 class VideoTrackTest : public testing::Test {
56 public: 55 public:
57 VideoTrackTest() { 56 VideoTrackTest() {
58 static const char kVideoTrackId[] = "track_id"; 57 static const char kVideoTrackId[] = "track_id";
59 58
60 channel_manager_.reset(new cricket::ChannelManager( 59 channel_manager_.reset(new cricket::ChannelManager(
61 new cricket::FakeMediaEngine(), new cricket::FakeDeviceManager(), 60 new cricket::FakeMediaEngine(), rtc::Thread::Current()));
62 rtc::Thread::Current()));
63 EXPECT_TRUE(channel_manager_->Init()); 61 EXPECT_TRUE(channel_manager_->Init());
64 video_track_ = VideoTrack::Create( 62 video_track_ = VideoTrack::Create(
65 kVideoTrackId, 63 kVideoTrackId,
66 VideoSource::Create(channel_manager_.get(), 64 VideoSource::Create(channel_manager_.get(),
67 new webrtc::RemoteVideoCapturer(), NULL)); 65 new webrtc::RemoteVideoCapturer(), NULL));
68 } 66 }
69 67
70 protected: 68 protected:
71 rtc::scoped_ptr<cricket::ChannelManager> channel_manager_; 69 rtc::scoped_ptr<cricket::ChannelManager> channel_manager_;
72 rtc::scoped_refptr<VideoTrackInterface> video_track_; 70 rtc::scoped_refptr<VideoTrackInterface> video_track_;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 102
105 EXPECT_EQ(2, renderer_1->num_rendered_frames()); 103 EXPECT_EQ(2, renderer_1->num_rendered_frames());
106 EXPECT_EQ(1, renderer_2->num_rendered_frames()); 104 EXPECT_EQ(1, renderer_2->num_rendered_frames());
107 105
108 video_track_->RemoveRenderer(renderer_1.get()); 106 video_track_->RemoveRenderer(renderer_1.get());
109 renderer_input->RenderFrame(&frame); 107 renderer_input->RenderFrame(&frame);
110 108
111 EXPECT_EQ(2, renderer_1->num_rendered_frames()); 109 EXPECT_EQ(2, renderer_1->num_rendered_frames());
112 EXPECT_EQ(2, renderer_2->num_rendered_frames()); 110 EXPECT_EQ(2, renderer_2->num_rendered_frames());
113 } 111 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698