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

Unified Diff: media/cast/test/end2end_unittest.cc

Issue 2048033003: Refactoring: CastTransport InitializeAudio/InitializeVideo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comments. Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/test/cast_benchmarks.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/test/end2end_unittest.cc
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index c1012325b69e8d163d6522789236cbdcf8c4d15e..7e13e32acc7b8cd66302bfcae078acbc34e2f528 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -469,6 +469,7 @@ class End2EndTest : public ::testing::Test {
base::TimeDelta::FromMilliseconds(kTargetPlayoutDelayMs);
video_sender_config_.rtp_payload_type = RtpPayloadType::VIDEO_VP8;
video_sender_config_.use_external_encoder = false;
+ video_sender_config_.rtp_timebase = kVideoFrequency;
video_sender_config_.max_bitrate = 50000;
video_sender_config_.min_bitrate = 10000;
video_sender_config_.start_bitrate = 10000;
@@ -894,9 +895,7 @@ class TransportClient : public CastTransport::Client {
: log_event_dispatcher_(log_event_dispatcher), e2e_test_(e2e_test) {}
void OnStatusChanged(media::cast::CastTransportStatus status) final {
- bool result = (status == TRANSPORT_AUDIO_INITIALIZED ||
- status == TRANSPORT_VIDEO_INITIALIZED);
- EXPECT_TRUE(result);
+ EXPECT_EQ(TRANSPORT_STREAM_INITIALIZED, status);
};
void OnLoggingEventsReceived(
std::unique_ptr<std::vector<FrameEvent>> frame_events,
@@ -921,14 +920,14 @@ class TransportClient : public CastTransport::Client {
void End2EndTest::Create() {
transport_sender_.reset(new CastTransportImpl(
testing_clock_sender_, base::TimeDelta::FromMilliseconds(1),
- base::WrapUnique(
- new TransportClient(cast_environment_sender_->logger(), nullptr)),
+ base::MakeUnique<TransportClient>(cast_environment_sender_->logger(),
+ nullptr),
base::WrapUnique(sender_to_receiver_), task_runner_sender_));
transport_receiver_.reset(new CastTransportImpl(
testing_clock_sender_, base::TimeDelta::FromMilliseconds(1),
- base::WrapUnique(
- new TransportClient(cast_environment_receiver_->logger(), this)),
+ base::MakeUnique<TransportClient>(cast_environment_receiver_->logger(),
+ this),
base::WrapUnique(receiver_to_sender_), task_runner_sender_));
cast_receiver_ =
« no previous file with comments | « media/cast/test/cast_benchmarks.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698