6 files changed, 80 insertions, 23 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a52f11bb..70c234d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -469,6 +469,7 @@ endfunction()
 
 # The actual unit tests follow.
 #
+unit_test(toxav rtp)
 unit_test(toxcore crypto_core)
 unit_test(toxcore util)
 
diff --git a/other/fun/BUILD.bazel b/other/fun/BUILD.bazel
index c3ab510e..93009543 100644
--- a/other/fun/BUILD.bazel
+++ b/other/fun/BUILD.bazel
@@ -10,18 +10,18 @@ cc_binary(
 cc_binary(
     name = "sign",
     srcs = ["sign.c"],
+    copts = ["-w"],
     deps = [
         "//c-toxcore/testing:misc_tools",
         "@libsodium",
     ],
-    copts = ["-w"],
 )
 
 cc_binary(
     name = "strkey",
     srcs = ["strkey.c"],
+    copts = ["-w"],
     deps = [
         "@libsodium",
     ],
-    copts = ["-w"],
 )
diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel
index ca354998..afb1a8aa 100644
--- a/testing/BUILD.bazel
+++ b/testing/BUILD.bazel
@@ -30,15 +30,13 @@ cc_binary(
 cc_binary(
     name = "av_test",
     srcs = ["av_test.c"],
-    linkopts = [
-        "-lopencv_highgui",
-        "-lopencv_core",
-    ],
     deps = [
         "//c-toxcore/toxav",
         "//c-toxcore/toxav:monolith",
         "//c-toxcore/toxcore",
         "@portaudio",
         "@sndfile",
+        "@opencv//:core",
+        "@opencv//:highgui",
     ],
 )
diff --git a/toxav/rtp.c b/toxav/rtp.c
index 650fbaf0..06bc6df5 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -52,8 +52,8 @@ size_t rtp_header_pack(uint8_t *const rdata, const struct RTPHeader *header)
     p += net_pack_u32(p, header->data_length_full);
     p += net_pack_u32(p, header->received_length_full);
 
-    for (size_t i = 0; i < sizeof header->csrc / sizeof header->csrc[0]; i++) {
-        p += net_pack_u32(p, header->csrc[i]);
+    for (size_t i = 0; i < RTP_PADDING_FIELDS; i++) {
+        p += net_pack_u32(p, 0);
     }
 
     p += net_pack_u16(p, header->offset_lower);
@@ -84,9 +84,7 @@ size_t rtp_header_unpack(const uint8_t *data, struct RTPHeader *header)
     p += net_unpack_u32(p, &header->data_length_full);
     p += net_unpack_u32(p, &header->received_length_full);
 
-    for (size_t i = 0; i < sizeof header->csrc / sizeof header->csrc[0]; i++) {
-        p += net_unpack_u32(p, &header->csrc[i]);
-    }
+    p += sizeof(uint32_t) * RTP_PADDING_FIELDS;
 
     p += net_unpack_u16(p, &header->offset_lower);
     p += net_unpack_u16(p, &header->data_length_lower);
diff --git a/toxav/rtp.h b/toxav/rtp.h
index 3f684ee5..c8af08d7 100644
--- a/toxav/rtp.h
+++ b/toxav/rtp.h
@@ -37,6 +37,12 @@ extern "C" {
 #define RTP_HEADER_SIZE 80
 
 /**
+ * Number of 32 bit padding fields between \ref RTPHeader::offset_lower and
+ * everything before it.
+ */
+#define RTP_PADDING_FIELDS 11
+
+/**
  * Payload type identifier. Also used as rtp callback prefix.
  */
 enum {
@@ -98,12 +104,6 @@ struct RTPHeader {
     uint32_t received_length_full;
 
     /**
-     * Unused fields. If you want to add more information to this header, remove
-     * one csrc and add the appropriate number of fields in its place.
-     */
-    uint32_t csrc[11];
-
-    /**
      * Data offset of the current part (lower bits).
      */
     uint16_t offset_lower;
diff --git a/toxav/rtp_test.cpp b/toxav/rtp_test.cpp
index e3b6f10e..60534b07 100644
--- a/toxav/rtp_test.cpp
+++ b/toxav/rtp_test.cpp
@@ -4,17 +4,77 @@
 
 #include <gtest/gtest.h>
 
+namespace
+{
+
+RTPHeader random_header()
+{
+    return {
+        random_u16(),
+        random_u16(),
+        random_u16(),
+        random_u16(),
+        random_u16(),
+        random_u16(),
+        random_u16(),
+        random_u32(),
+        random_u32(),
+        random_u64(),
+        random_u32(),
+        random_u32(),
+        random_u32(),
+        random_u16(),
+        random_u16(),
+    };
+}
+
 TEST(Rtp, Deserialisation)
 {
-    RTPHeader header;
-    random_bytes((uint8_t *)&header, sizeof header);
+    RTPHeader const header = random_header();
 
-    uint8_t rdata[sizeof(RTPHeader)];
+    uint8_t rdata[RTP_HEADER_SIZE];
     EXPECT_EQ(rtp_header_pack(rdata, &header), RTP_HEADER_SIZE);
 
-    RTPHeader unpacked;
+    RTPHeader unpacked = {0};
     EXPECT_EQ(rtp_header_unpack(rdata, &unpacked), RTP_HEADER_SIZE);
 
-    EXPECT_EQ(std::string((char const *)&header, sizeof header),
-              std::string((char const *)&unpacked, sizeof unpacked));
+    EXPECT_EQ(header.protocol_version, unpacked.protocol_version);
+    EXPECT_EQ(header.pe, unpacked.pe);
+    EXPECT_EQ(header.xe, unpacked.xe);
+    EXPECT_EQ(header.cc, unpacked.cc);
+    EXPECT_EQ(header.ma, unpacked.ma);
+    EXPECT_EQ(header.pt, unpacked.pt);
+    EXPECT_EQ(header.sequnum, unpacked.sequnum);
+    EXPECT_EQ(header.timestamp, unpacked.timestamp);
+    EXPECT_EQ(header.ssrc, unpacked.ssrc);
+    EXPECT_EQ(header.flags, unpacked.flags);
+    EXPECT_EQ(header.offset_full, unpacked.offset_full);
+    EXPECT_EQ(header.data_length_full, unpacked.data_length_full);
+    EXPECT_EQ(header.received_length_full, unpacked.received_length_full);
+    EXPECT_EQ(header.offset_lower, unpacked.offset_lower);
+    EXPECT_EQ(header.data_length_lower, unpacked.data_length_lower);
 }
+
+TEST(Rtp, SerialisingAllOnes)
+{
+    RTPHeader header;
+    memset(&header, 0xff, sizeof header);
+
+    uint8_t rdata[RTP_HEADER_SIZE];
+    rtp_header_pack(rdata, &header);
+
+    EXPECT_EQ(std::string((char const *)rdata, sizeof rdata),
+              std::string("\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
+                          "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
+                          "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
+                          "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
+                          "\x00\x00\x00\x00\x00\x00\x00\x00"
+                          "\x00\x00\x00\x00\x00\x00\x00\x00"
+                          "\x00\x00\x00\x00\x00\x00\x00\x00"
+                          "\x00\x00\x00\x00\x00\x00\x00\x00"
+                          "\x00\x00\x00\x00\x00\x00\x00\x00"
+                          "\x00\x00\x00\x00\xFF\xFF\xFF\xFF",
+                          RTP_HEADER_SIZE));
+}
+
+}  // namespace