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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc

Issue 2871173008: Fix packetization logic to leave space for extensions in the last packet (Closed)
Patch Set: Implemented Sprang@ and Danilchap@ comments Created 3 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 side-by-side diff with in-line comments
Download patch
« webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc ('K') | « webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h » ('j') | webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
index 1f926d9eeb010246d7fa06190798f60eddd8b2d4..50da90bfe9badcb718eb0377f1d79b926322b182 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
@@ -66,7 +66,7 @@ RtpPacketizer* CreateH264Packetizer(H264PacketizationMode mode,
size_t max_payload_size) {
RTPVideoTypeHeader type_header;
type_header.H264.packetization_mode = mode;
- return RtpPacketizer::Create(kRtpVideoH264, max_payload_size, &type_header,
+ return RtpPacketizer::Create(kRtpVideoH264, max_payload_size, 0, &type_header,
kEmptyFrame);
}
@@ -111,20 +111,20 @@ void TestFua(size_t frame_size,
fragmentation.fragmentationLength[0] = frame_size;
std::unique_ptr<RtpPacketizer> packetizer(CreateH264Packetizer(
H264PacketizationMode::NonInterleaved, max_payload_size));
- packetizer->SetPayloadData(frame.get(), frame_size, &fragmentation);
+ EXPECT_EQ(
+ expected_sizes.size(),
+ packetizer->SetPayloadData(frame.get(), frame_size, &fragmentation));
RtpPacketToSend packet(kNoExtensions);
ASSERT_LE(max_payload_size, packet.FreeCapacity());
- bool last = false;
size_t offset = kNalHeaderSize;
for (size_t i = 0; i < expected_sizes.size(); ++i) {
- ASSERT_TRUE(packetizer->NextPacket(&packet, &last));
+ ASSERT_TRUE(packetizer->NextPacket(&packet));
VerifyFua(i, frame.get(), offset, packet.payload(), expected_sizes);
- EXPECT_EQ(i == expected_sizes.size() - 1, last) << "FUA index: " << i;
offset += expected_sizes[i];
}
- EXPECT_FALSE(packetizer->NextPacket(&packet, &last));
+ EXPECT_FALSE(packetizer->NextPacket(&packet));
}
size_t GetExpectedNaluOffset(const RTPFragmentationHeader& fragmentation,
@@ -183,15 +183,14 @@ TEST_P(RtpPacketizerH264ModeTest, TestSingleNalu) {
fragmentation.fragmentationLength[0] = sizeof(frame);
std::unique_ptr<RtpPacketizer> packetizer(
CreateH264Packetizer(GetParam(), kMaxPayloadSize));
- packetizer->SetPayloadData(frame, sizeof(frame), &fragmentation);
+ ASSERT_EQ(1u,
+ packetizer->SetPayloadData(frame, sizeof(frame), &fragmentation));
RtpPacketToSend packet(kNoExtensions);
ASSERT_LE(kMaxPayloadSize, packet.FreeCapacity());
- bool last = false;
- ASSERT_TRUE(packetizer->NextPacket(&packet, &last));
+ ASSERT_TRUE(packetizer->NextPacket(&packet));
EXPECT_EQ(2u, packet.payload_size());
- EXPECT_TRUE(last);
VerifySingleNaluPayload(fragmentation, 0, frame, packet.payload());
- EXPECT_FALSE(packetizer->NextPacket(&packet, &last));
+ EXPECT_FALSE(packetizer->NextPacket(&packet));
}
TEST_P(RtpPacketizerH264ModeTest, TestSingleNaluTwoPackets) {
@@ -211,20 +210,18 @@ TEST_P(RtpPacketizerH264ModeTest, TestSingleNaluTwoPackets) {
std::unique_ptr<RtpPacketizer> packetizer(
CreateH264Packetizer(GetParam(), kMaxPayloadSize));
- packetizer->SetPayloadData(frame, kFrameSize, &fragmentation);
+ ASSERT_EQ(2u, packetizer->SetPayloadData(frame, kFrameSize, &fragmentation));
RtpPacketToSend packet(kNoExtensions);
- bool last = false;
- ASSERT_TRUE(packetizer->NextPacket(&packet, &last));
+ ASSERT_TRUE(packetizer->NextPacket(&packet));
ASSERT_EQ(fragmentation.fragmentationOffset[1], packet.payload_size());
VerifySingleNaluPayload(fragmentation, 0, frame, packet.payload());
- ASSERT_TRUE(packetizer->NextPacket(&packet, &last));
+ ASSERT_TRUE(packetizer->NextPacket(&packet));
ASSERT_EQ(fragmentation.fragmentationLength[1], packet.payload_size());
VerifySingleNaluPayload(fragmentation, 1, frame, packet.payload());
- EXPECT_TRUE(last);
- EXPECT_FALSE(packetizer->NextPacket(&packet, &last));
+ EXPECT_FALSE(packetizer->NextPacket(&packet));
}
INSTANTIATE_TEST_CASE_P(
@@ -246,20 +243,19 @@ TEST(RtpPacketizerH264Test, TestStapA) {
CreateThreeFragments(&fragmentation, kFrameSize, kPayloadOffset);
std::unique_ptr<RtpPacketizer> packetizer(CreateH264Packetizer(
H264PacketizationMode::NonInterleaved, kMaxPayloadSize));
- packetizer->SetPayloadData(frame, kFrameSize, &fragmentation);
+ ASSERT_EQ(1u, packetizer->SetPayloadData(frame, kFrameSize, &fragmentation));
RtpPacketToSend packet(kNoExtensions);
ASSERT_LE(kMaxPayloadSize, packet.FreeCapacity());
- bool last = false;
- ASSERT_TRUE(packetizer->NextPacket(&packet, &last));
+ ASSERT_TRUE(packetizer->NextPacket(&packet));
size_t expected_packet_size =
kNalHeaderSize + 3 * kLengthFieldLength + kFrameSize;
ASSERT_EQ(expected_packet_size, packet.payload_size());
- EXPECT_TRUE(last);
+
for (size_t i = 0; i < fragmentation.fragmentationVectorSize; ++i)
VerifyStapAPayload(fragmentation, 0, i, frame, packet.payload());
- EXPECT_FALSE(packetizer->NextPacket(&packet, &last));
+ EXPECT_FALSE(packetizer->NextPacket(&packet));
}
TEST(RtpPacketizerH264Test, TestSingleNalUnitModeHasNoStapA) {
@@ -279,12 +275,11 @@ TEST(RtpPacketizerH264Test, TestSingleNalUnitModeHasNoStapA) {
packetizer->SetPayloadData(frame, kFrameSize, &fragmentation);
RtpPacketToSend packet(kNoExtensions);
- bool last = false;
// The three fragments should be returned as three packets.
- ASSERT_TRUE(packetizer->NextPacket(&packet, &last));
- ASSERT_TRUE(packetizer->NextPacket(&packet, &last));
- ASSERT_TRUE(packetizer->NextPacket(&packet, &last));
- EXPECT_FALSE(packetizer->NextPacket(&packet, &last));
+ ASSERT_TRUE(packetizer->NextPacket(&packet));
+ ASSERT_TRUE(packetizer->NextPacket(&packet));
+ ASSERT_TRUE(packetizer->NextPacket(&packet));
+ EXPECT_FALSE(packetizer->NextPacket(&packet));
}
TEST(RtpPacketizerH264Test, TestTooSmallForStapAHeaders) {
@@ -306,29 +301,26 @@ TEST(RtpPacketizerH264Test, TestTooSmallForStapAHeaders) {
kNalHeaderSize + kFrameSize - kPayloadOffset;
std::unique_ptr<RtpPacketizer> packetizer(CreateH264Packetizer(
H264PacketizationMode::NonInterleaved, kMaxPayloadSize));
- packetizer->SetPayloadData(frame, kFrameSize, &fragmentation);
+ ASSERT_EQ(2u, packetizer->SetPayloadData(frame, kFrameSize, &fragmentation));
RtpPacketToSend packet(kNoExtensions);
ASSERT_LE(kMaxPayloadSize, packet.FreeCapacity());
- bool last = false;
- ASSERT_TRUE(packetizer->NextPacket(&packet, &last));
+ ASSERT_TRUE(packetizer->NextPacket(&packet));
size_t expected_packet_size = kNalHeaderSize;
for (size_t i = 0; i < 2; ++i) {
expected_packet_size +=
kLengthFieldLength + fragmentation.fragmentationLength[i];
}
ASSERT_EQ(expected_packet_size, packet.payload_size());
- EXPECT_FALSE(last);
for (size_t i = 0; i < 2; ++i)
VerifyStapAPayload(fragmentation, 0, i, frame, packet.payload());
- ASSERT_TRUE(packetizer->NextPacket(&packet, &last));
+ ASSERT_TRUE(packetizer->NextPacket(&packet));
expected_packet_size = fragmentation.fragmentationLength[2];
ASSERT_EQ(expected_packet_size, packet.payload_size());
- EXPECT_TRUE(last);
VerifySingleNaluPayload(fragmentation, 2, frame, packet.payload());
- EXPECT_FALSE(packetizer->NextPacket(&packet, &last));
+ EXPECT_FALSE(packetizer->NextPacket(&packet));
}
TEST(RtpPacketizerH264Test, TestMixedStapA_FUA) {
@@ -354,32 +346,29 @@ TEST(RtpPacketizerH264Test, TestMixedStapA_FUA) {
}
std::unique_ptr<RtpPacketizer> packetizer(CreateH264Packetizer(
H264PacketizationMode::NonInterleaved, kMaxPayloadSize));
- packetizer->SetPayloadData(frame, kFrameSize, &fragmentation);
+ ASSERT_EQ(3u, packetizer->SetPayloadData(frame, kFrameSize, &fragmentation));
// First expecting two FU-A packets.
std::vector<size_t> fua_sizes;
- fua_sizes.push_back(1100);
fua_sizes.push_back(1099);
+ fua_sizes.push_back(1100);
RtpPacketToSend packet(kNoExtensions);
ASSERT_LE(kMaxPayloadSize, packet.FreeCapacity());
- bool last = false;
int fua_offset = kNalHeaderSize;
for (size_t i = 0; i < 2; ++i) {
- ASSERT_TRUE(packetizer->NextPacket(&packet, &last));
+ ASSERT_TRUE(packetizer->NextPacket(&packet));
VerifyFua(i, frame, fua_offset, packet.payload(), fua_sizes);
- EXPECT_FALSE(last);
fua_offset += fua_sizes[i];
}
// Then expecting one STAP-A packet with two nal units.
- ASSERT_TRUE(packetizer->NextPacket(&packet, &last));
+ ASSERT_TRUE(packetizer->NextPacket(&packet));
size_t expected_packet_size =
kNalHeaderSize + 2 * kLengthFieldLength + 2 * kStapANaluSize;
ASSERT_EQ(expected_packet_size, packet.payload_size());
- EXPECT_TRUE(last);
for (size_t i = 1; i < fragmentation.fragmentationVectorSize; ++i)
VerifyStapAPayload(fragmentation, 1, i, frame, packet.payload());
- EXPECT_FALSE(packetizer->NextPacket(&packet, &last));
+ EXPECT_FALSE(packetizer->NextPacket(&packet));
}
TEST(RtpPacketizerH264Test, TestFUAOddSize) {
@@ -393,7 +382,7 @@ TEST(RtpPacketizerH264Test, TestFUAOddSize) {
}
TEST(RtpPacketizerH264Test, TestFUAEvenSize) {
- const size_t kExpectedPayloadSizes[2] = {601, 600};
+ const size_t kExpectedPayloadSizes[2] = {600, 601};
TestFua(
kMaxPayloadSize + 2,
kMaxPayloadSize,
@@ -403,8 +392,8 @@ TEST(RtpPacketizerH264Test, TestFUAEvenSize) {
}
TEST(RtpPacketizerH264Test, TestFUARounding) {
- const size_t kExpectedPayloadSizes[8] = {1266, 1266, 1266, 1266,
- 1266, 1266, 1266, 1261};
+ const size_t kExpectedPayloadSizes[8] = {1265, 1265, 1265, 1265,
+ 1265, 1266, 1266, 1266};
TestFua(
10124,
1448,
@@ -495,18 +484,17 @@ TEST_F(RtpPacketizerH264TestSpsRewriting, FuASps) {
packetizer_->SetPayloadData(in_buffer_.data(), in_buffer_.size(),
&fragmentation_header_);
- bool last_packet = true;
RtpPacketToSend packet(kNoExtensions);
ASSERT_LE(sizeof(kOriginalSps) + kHeaderOverhead, packet.FreeCapacity());
- EXPECT_TRUE(packetizer_->NextPacket(&packet, &last_packet));
+ EXPECT_TRUE(packetizer_->NextPacket(&packet));
size_t offset = H264::kNaluTypeSize;
size_t length = packet.payload_size() - kFuAHeaderSize;
EXPECT_THAT(packet.payload().subview(kFuAHeaderSize),
ElementsAreArray(&kRewrittenSps[offset], length));
offset += length;
- EXPECT_TRUE(packetizer_->NextPacket(&packet, &last_packet));
+ EXPECT_TRUE(packetizer_->NextPacket(&packet));
length = packet.payload_size() - kFuAHeaderSize;
EXPECT_THAT(packet.payload().subview(kFuAHeaderSize),
ElementsAreArray(&kRewrittenSps[offset], length));
@@ -528,11 +516,10 @@ TEST_F(RtpPacketizerH264TestSpsRewriting, StapASps) {
packetizer_->SetPayloadData(in_buffer_.data(), in_buffer_.size(),
&fragmentation_header_);
- bool last_packet = true;
RtpPacketToSend packet(kNoExtensions);
ASSERT_LE(kExpectedTotalSize + kHeaderOverhead, packet.FreeCapacity());
- EXPECT_TRUE(packetizer_->NextPacket(&packet, &last_packet));
+ EXPECT_TRUE(packetizer_->NextPacket(&packet));
EXPECT_EQ(kExpectedTotalSize, packet.payload_size());
EXPECT_THAT(packet.payload().subview(H264::kNaluTypeSize + kLengthFieldLength,
sizeof(kRewrittenSps)),
« webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc ('K') | « webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h » ('j') | webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698