summaryrefslogtreecommitdiffstats
path: root/media/cast/video_sender
diff options
context:
space:
mode:
authormikhal@chromium.org <mikhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 00:26:10 +0000
committermikhal@chromium.org <mikhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 00:26:10 +0000
commit0bec2d88ede93585840b6775be337e5d6ce035d5 (patch)
tree2bb8cc56d6c60a6cb5b92ca77a002f0b1298fe57 /media/cast/video_sender
parent4be5aac332f8cd47b660f8b7b5d8e275d9388d78 (diff)
downloadchromium_src-0bec2d88ede93585840b6775be337e5d6ce035d5.zip
chromium_src-0bec2d88ede93585840b6775be337e5d6ce035d5.tar.gz
chromium_src-0bec2d88ede93585840b6775be337e5d6ce035d5.tar.bz2
Cast:Transport: Dividing A/V Initialization pipeline
This cl is part of the effort to split the A/V initialization pipeline, which started in https://chromiumcodereview.appspot.com/163553006/. Main changes in this cl: 1. Adding initialization functions to audio and video. 2. Changing the Create API to return a scoped ptr. 3. Using weak pointers in lieu of Unretained (part of BUG=344621) BUG=346822 This cl must be committed prior to issue 163553006 Review URL: https://codereview.chromium.org/174183003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cast/video_sender')
-rw-r--r--media/cast/video_sender/video_sender_unittest.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/media/cast/video_sender/video_sender_unittest.cc b/media/cast/video_sender/video_sender_unittest.cc
index 2f5c06e..130dac9 100644
--- a/media/cast/video_sender/video_sender_unittest.cc
+++ b/media/cast/video_sender/video_sender_unittest.cc
@@ -90,14 +90,17 @@ class VideoSenderTest : public ::testing::Test {
task_runner_,
task_runner_,
GetLoggingConfigWithRawEventsAndStatsEnabled());
- transport::CastTransportConfig transport_config;
+ transport::CastTransportVideoConfig transport_config;
+ net::IPEndPoint dummy_endpoint;
transport_sender_.reset(new transport::CastTransportSenderImpl(
NULL,
testing_clock_,
- transport_config,
+ dummy_endpoint,
+ dummy_endpoint,
base::Bind(&UpdateCastTransportStatus),
task_runner_,
&transport_));
+ transport_sender_->InitializeVideo(transport_config);
}
virtual ~VideoSenderTest() {}
@@ -108,7 +111,7 @@ class VideoSenderTest : public ::testing::Test {
}
static void UpdateCastTransportStatus(transport::CastTransportStatus status) {
- EXPECT_EQ(status, transport::TRANSPORT_INITIALIZED);
+ EXPECT_EQ(status, transport::TRANSPORT_VIDEO_INITIALIZED);
}
void InitEncoder(bool external) {