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

Side by Side Diff: media/cast/net/rtcp/rtcp_builder_unittest.cc

Issue 1488893003: Fix size_t truncations in media for 64-bit VS 2015 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
« no previous file with comments | « no previous file | media/cast/net/rtp/packet_storage_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/test/simple_test_tick_clock.h" 6 #include "base/test/simple_test_tick_clock.h"
7 #include "media/cast/cast_defines.h" 7 #include "media/cast/cast_defines.h"
8 #include "media/cast/cast_environment.h" 8 #include "media/cast/cast_environment.h"
9 #include "media/cast/net/cast_transport_defines.h" 9 #include "media/cast/net/cast_transport_defines.h"
10 #include "media/cast/net/pacing/paced_sender.h" 10 #include "media/cast/net/pacing/paced_sender.h"
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 p.AddRb(kMediaSsrc); 406 p.AddRb(kMediaSsrc);
407 407
408 p.AddReceiverLog(kSendingSsrc); 408 p.AddReceiverLog(kSendingSsrc);
409 409
410 int num_events = (i + kResendDelay) / kResendDelay; 410 int num_events = (i + kResendDelay) / kResendDelay;
411 num_events = std::min<int>(num_events, kNumResends); 411 num_events = std::min<int>(num_events, kNumResends);
412 p.AddReceiverFrameLog(kRtpTimestamp, num_events, 412 p.AddReceiverFrameLog(kRtpTimestamp, num_events,
413 time_base_ms - (num_events - 1) * kResendDelay * 413 time_base_ms - (num_events - 1) * kResendDelay *
414 kTimeBetweenEventsMs); 414 kTimeBetweenEventsMs);
415 for (int i = 0; i < num_events; i++) { 415 for (int i = 0; i < num_events; i++) {
416 p.AddReceiverEventLog(0, FRAME_ACK_SENT, 416 p.AddReceiverEventLog(
417 i * kResendDelay * kTimeBetweenEventsMs); 417 0, FRAME_ACK_SENT,
418 base::checked_cast<uint16>(i * kResendDelay * kTimeBetweenEventsMs));
418 } 419 }
419 420
420 FrameEvent frame_event; 421 FrameEvent frame_event;
421 frame_event.rtp_timestamp = kRtpTimestamp; 422 frame_event.rtp_timestamp = kRtpTimestamp;
422 frame_event.type = FRAME_ACK_SENT; 423 frame_event.type = FRAME_ACK_SENT;
423 frame_event.media_type = VIDEO_EVENT; 424 frame_event.media_type = VIDEO_EVENT;
424 frame_event.timestamp = testing_clock.NowTicks(); 425 frame_event.timestamp = testing_clock.NowTicks();
425 event_subscriber.OnReceiveFrameEvent(frame_event); 426 event_subscriber.OnReceiveFrameEvent(frame_event);
426 427
427 ReceiverRtcpEventSubscriber::RtcpEvents rtcp_events; 428 ReceiverRtcpEventSubscriber::RtcpEvents rtcp_events;
(...skipping 24 matching lines...) Expand all
452 // Sender report. 453 // Sender report.
453 TestRtcpPacketBuilder p; 454 TestRtcpPacketBuilder p;
454 p.AddSr(kSendingSsrc, 0); 455 p.AddSr(kSendingSsrc, 0);
455 456
456 ExpectPacketEQ(p.GetPacket().Pass(), 457 ExpectPacketEQ(p.GetPacket().Pass(),
457 rtcp_builder_->BuildRtcpFromSender(sender_info)); 458 rtcp_builder_->BuildRtcpFromSender(sender_info));
458 } 459 }
459 460
460 } // namespace cast 461 } // namespace cast
461 } // namespace media 462 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | media/cast/net/rtp/packet_storage_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698