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

Side by Side Diff: media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc

Issue 268983002: Revert of Cast: Fix two video freezing problems (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h" 5 #include "media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/test/simple_test_tick_clock.h" 10 #include "base/test/simple_test_tick_clock.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 uint32 expectd_rtp_timestamp_; 95 uint32 expectd_rtp_timestamp_;
96 96
97 DISALLOW_COPY_AND_ASSIGN(TestRtpPacketTransport); 97 DISALLOW_COPY_AND_ASSIGN(TestRtpPacketTransport);
98 }; 98 };
99 99
100 class RtpPacketizerTest : public ::testing::Test { 100 class RtpPacketizerTest : public ::testing::Test {
101 protected: 101 protected:
102 RtpPacketizerTest() 102 RtpPacketizerTest()
103 : task_runner_(new test::FakeSingleThreadTaskRunner(&testing_clock_)), 103 : task_runner_(new test::FakeSingleThreadTaskRunner(&testing_clock_)),
104 video_frame_(), 104 video_frame_(),
105 packet_storage_(200) { 105 packet_storage_(&testing_clock_, kMaxPacketStorageTimeMs) {
106 config_.sequence_number = kSeqNum; 106 config_.sequence_number = kSeqNum;
107 config_.ssrc = kSsrc; 107 config_.ssrc = kSsrc;
108 config_.payload_type = kPayload; 108 config_.payload_type = kPayload;
109 config_.max_payload_length = kMaxPacketLength; 109 config_.max_payload_length = kMaxPacketLength;
110 transport_.reset(new TestRtpPacketTransport(config_)); 110 transport_.reset(new TestRtpPacketTransport(config_));
111 pacer_.reset(new PacedSender( 111 pacer_.reset(new PacedSender(
112 &testing_clock_, &logging_, transport_.get(), task_runner_)); 112 &testing_clock_, &logging_, transport_.get(), task_runner_));
113 pacer_->RegisterVideoSsrc(config_.ssrc); 113 pacer_->RegisterVideoSsrc(config_.ssrc);
114 rtp_packetizer_.reset(new RtpPacketizer( 114 rtp_packetizer_.reset(new RtpPacketizer(
115 pacer_.get(), &packet_storage_, config_)); 115 pacer_.get(), &packet_storage_, config_));
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 testing_clock_.NowTicks()); 167 testing_clock_.NowTicks());
168 RunTasks(33 + 1); 168 RunTasks(33 + 1);
169 EXPECT_EQ(expected_num_of_packets, rtp_packetizer_->send_packets_count()); 169 EXPECT_EQ(expected_num_of_packets, rtp_packetizer_->send_packets_count());
170 EXPECT_EQ(kFrameSize, rtp_packetizer_->send_octet_count()); 170 EXPECT_EQ(kFrameSize, rtp_packetizer_->send_octet_count());
171 EXPECT_EQ(expected_num_of_packets, transport_->number_of_packets_received()); 171 EXPECT_EQ(expected_num_of_packets, transport_->number_of_packets_received());
172 } 172 }
173 173
174 } // namespace transport 174 } // namespace transport
175 } // namespace cast 175 } // namespace cast
176 } // namespace media 176 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698