[rtp_rtcp] rtcp::Sli packet moved into own file and got Parse function

webrtc/modules/rtp_rtcp/source/rtcp_packet/sli_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/sli_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2107ecaf44ebf924c5e9a3f290adf998223adfff
--- /dev/null
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli_unittest.cc
@@ -0,0 +1,89 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h"
+
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using testing::ElementsAreArray;
+using testing::Eq;
+using testing::make_tuple;
+using webrtc::rtcp::RawPacket;
+using webrtc::rtcp::Sli;
+
+namespace webrtc {
+namespace {
+
+const uint32_t kSenderSsrc = 0x12345678;
+const uint32_t kRemoteSsrc = 0x23456789;
+
+const uint8_t kPictureId = 0x3c;
+const uint16_t kFirstMb = 0x1e61;
+const uint16_t kNumberOfMb = 0x1a0a;
+const uint32_t kSliItem = (kFirstMb << 19) | (kNumberOfMb << 6) | kPictureId;
+
+// Manually created Sli packet matching constants above.
+const uint8_t kPacket[] = {0x82,  206, 0x00, 0x03,
+                           0x12, 0x34, 0x56, 0x78,
+                           0x23, 0x45, 0x67, 0x89,
+                           (kSliItem >> 24) & 0xff,
+                           (kSliItem >> 16) & 0xff,
+                           (kSliItem >> 8) & 0xff,
+                           kSliItem & 0xff};
+const size_t kPacketLength = sizeof(kPacket);
+
+bool ParseSli(const uint8_t* buffer, size_t length, Sli* sli) {
+  using RTCPUtility::RtcpCommonHeader;
+  using RTCPUtility::RtcpParseCommonHeader;

[åsapersson, 2016/01/11 12:13:54]

move line 44, 45 to other using above?

[danilchap, 2016/01/11 15:36:32]

Because of plans to drop dependency on RTCPUtility namespace, prefer to keep
this particular using as local as possible.

[åsapersson, 2016/01/12 12:35:26]

Acknowledged.

[danilchap, 2016/01/12 12:56:35]

Reconsidered: dropping will be equally easy from both places, so no need to
ignore consistency now.

+  RtcpCommonHeader header;
+  EXPECT_TRUE(RtcpParseCommonHeader(buffer, length, &header));
+  EXPECT_THAT(header.BlockSize(), Eq(length));

[åsapersson, 2016/01/11 12:13:54]

EXPECT_EQ(length, header.BlockSize());

[danilchap, 2016/01/11 15:36:32]

EXPECT_THAT syntax makes it more clear which value is tested, what is expected.
Should that advantage be dropped for consistency?

+  return sli->Parse(header, buffer + RtcpCommonHeader::kHeaderSizeBytes);
+}
+
+TEST(RtcpPacketSliTest, Create) {
+  Sli sli;
+  sli.From(kSenderSsrc);
+  sli.To(kRemoteSsrc);
+  sli.WithMacroblocks(kPictureId, kFirstMb, kNumberOfMb);
+
+  rtc::scoped_ptr<RawPacket> packet(sli.Build());
+
+  EXPECT_THAT(make_tuple(packet->Buffer(), packet->Length()),
+              ElementsAreArray(kPacket));
+}
+
+TEST(RtcpPacketSliTest, Parse) {
+  Sli mutable_parsed;
+  EXPECT_TRUE(ParseSli(kPacket, kPacketLength, &mutable_parsed));
+  const Sli& parsed = mutable_parsed;  // Read values from constant object.
+
+  EXPECT_THAT(parsed.sender_ssrc(), Eq(kSenderSsrc));

[åsapersson, 2016/01/11 12:13:54]

use EXPECT_EQ?
EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());

+  EXPECT_THAT(parsed.media_ssrc(), Eq(kRemoteSsrc));
+  EXPECT_THAT(parsed.macroblocks()[0].first(), Eq(kFirstMb));
+  EXPECT_THAT(parsed.macroblocks()[0].number(), Eq(kNumberOfMb));
+  EXPECT_THAT(parsed.macroblocks()[0].picture_id(), Eq(kPictureId));
+}
+
+TEST(RtcpPacketSliTest, ParseFailesOnSmallPacket) {

[åsapersson, 2016/01/11 12:13:54]

s/Failes/Fails

[åsapersson, 2016/01/11 12:13:54]

maybe ParseFailsOnTooSmallPacket

[danilchap, 2016/01/11 15:36:32]

Done.

+  Sli sli;
+  sli.From(kSenderSsrc);
+  sli.To(kRemoteSsrc);
+  sli.WithMacroblocks(kPictureId, kFirstMb, kNumberOfMb);
+
+  rtc::scoped_ptr<RawPacket> packet(sli.Build());
+  packet->MutableBuffer()[3]--;  // Decrease size by 1 word (4 bytes).
+
+  EXPECT_FALSE(ParseSli(packet->Buffer(), packet->Length() - 4, &sli));
+}
+
+}  // namespace
+}  // namespace webrtc