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

Side by Side Diff: media/cast/net/rtp/packet_storage_unittest.cc

Issue 1487223002: Change PacketKey to be unique for each frame packet by including (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 | « media/cast/net/pacing/paced_sender_unittest.cc ('k') | media/cast/net/rtp/rtp_packetizer.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 "media/cast/net/rtp/packet_storage.h" 5 #include "media/cast/net/rtp/packet_storage.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/test/simple_test_tick_clock.h" 12 #include "base/test/simple_test_tick_clock.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "media/cast/constants.h" 14 #include "media/cast/constants.h"
15 #include "testing/gmock/include/gmock/gmock.h" 15 #include "testing/gmock/include/gmock/gmock.h"
16 16
17 namespace media { 17 namespace media {
18 namespace cast { 18 namespace cast {
19 19
20 static const size_t kStoredFrames = 10; 20 static const size_t kStoredFrames = 10;
21 21
22 // Generate |number_of_frames| and store into |*storage|. 22 // Generate |number_of_frames| and store into |*storage|.
23 // First frame has 1 packet, second frame has 2 packets, etc. 23 // First frame has 1 packet, second frame has 2 packets, etc.
24 static void StoreFrames(size_t number_of_frames, 24 static void StoreFrames(size_t number_of_frames,
25 uint32 first_frame_id, 25 uint32 first_frame_id,
26 PacketStorage* storage) { 26 PacketStorage* storage) {
27 const base::TimeTicks kTicks; 27 const base::TimeTicks kTicks;
miu 2015/12/03 02:42:12 Looks like you can delete this line now.
xjz 2015/12/03 19:15:29 Done.
28 const int kSsrc = 1; 28 const int kSsrc = 1;
29 for (size_t i = 0; i < number_of_frames; ++i) { 29 for (size_t i = 0; i < number_of_frames; ++i) {
30 SendPacketVector packets; 30 SendPacketVector packets;
31 // First frame has 1 packet, second frame has 2 packets, etc. 31 // First frame has 1 packet, second frame has 2 packets, etc.
32 const size_t kNumberOfPackets = i + 1; 32 const size_t kNumberOfPackets = i + 1;
33 for (size_t j = 0; j < kNumberOfPackets; ++j) { 33 for (size_t j = 0; j < kNumberOfPackets; ++j) {
34 Packet test_packet(1, 0); 34 Packet test_packet(1, 0);
35 packets.push_back( 35 packets.push_back(std::make_pair(
36 std::make_pair(PacedPacketSender::MakePacketKey( 36 PacedPacketSender::MakePacketKey(PacketKey::RTP, i, kSsrc,
37 kTicks, kSsrc, base::checked_cast<uint16>(j)), 37 base::checked_cast<uint16>(j)),
38 new base::RefCountedData<Packet>(test_packet))); 38 new base::RefCountedData<Packet>(test_packet)));
39 } 39 }
40 storage->StoreFrame(first_frame_id, packets); 40 storage->StoreFrame(first_frame_id, packets);
41 ++first_frame_id; 41 ++first_frame_id;
42 } 42 }
43 } 43 }
44 44
45 TEST(PacketStorageTest, NumberOfStoredFrames) { 45 TEST(PacketStorageTest, NumberOfStoredFrames) {
46 PacketStorage storage; 46 PacketStorage storage;
47 47
48 uint32 frame_id = 0; 48 uint32 frame_id = 0;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 EXPECT_EQ(1u, storage.GetNumberOfStoredFrames()); 118 EXPECT_EQ(1u, storage.GetNumberOfStoredFrames());
119 EXPECT_FALSE(storage.GetFrame8(kFirstFrameId + 4)); 119 EXPECT_FALSE(storage.GetFrame8(kFirstFrameId + 4));
120 120
121 storage.ReleaseFrame(kFirstFrameId + 1); 121 storage.ReleaseFrame(kFirstFrameId + 1);
122 EXPECT_EQ(0u, storage.GetNumberOfStoredFrames()); 122 EXPECT_EQ(0u, storage.GetNumberOfStoredFrames());
123 EXPECT_FALSE(storage.GetFrame8(kFirstFrameId + 1)); 123 EXPECT_FALSE(storage.GetFrame8(kFirstFrameId + 1));
124 } 124 }
125 125
126 } // namespace cast 126 } // namespace cast
127 } // namespace media 127 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/net/pacing/paced_sender_unittest.cc ('k') | media/cast/net/rtp/rtp_packetizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698