Update header formatterts to FlexFEC draft 03.

webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc

 /*
  *  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.
  */
 
@@ skipping 25 matching lines @@
 constexpr uint16_t kMediaStartSeqNum = 825;
 constexpr size_t kMediaPacketLength = 1234;
 constexpr uint32_t kFlexfecSsrc = 52142;
 
 constexpr size_t kFlexfecHeaderSizes[] = {20, 24, 32};
 constexpr size_t kFlexfecPacketMaskOffset = 18;
 constexpr size_t kFlexfecPacketMaskSizes[] = {2, 6, 14};
 constexpr size_t kFlexfecMaxPacketSize = kFlexfecPacketMaskSizes[2];
 
 // Reader tests.
-constexpr uint8_t kNoFBit = 0 << 7;
-constexpr uint8_t kNoRBit = 0 << 6;
+constexpr uint8_t kNoRBit = 0 << 7;
+constexpr uint8_t kNoFBit = 0 << 6;
 constexpr uint8_t kPtRecovery = 123;
 constexpr uint8_t kLengthRecov[] = {0xab, 0xcd};
 constexpr uint8_t kTsRecovery[] = {0x01, 0x23, 0x45, 0x67};
 constexpr uint8_t kSsrcCount = 1;
 constexpr uint8_t kReservedBits = 0x00;
 constexpr uint8_t kProtSsrc[] = {0x11, 0x22, 0x33, 0x44};
 constexpr uint8_t kSnBase[] = {0xaa, 0xbb};
 constexpr uint8_t kPayloadBits = 0x00;
 
 std::unique_ptr<uint8_t[]> GeneratePacketMask(size_t packet_mask_size,
@@ skipping 108 matching lines @@
 
 TEST(FlexfecHeaderReaderTest, ReadsHeaderWithKBit0Set) {
   constexpr uint8_t kKBit0 = 1 << 7;
   constexpr size_t kExpectedPacketMaskSize = 2;
   constexpr size_t kExpectedFecHeaderSize = 20;
   // clang-format off
   constexpr uint8_t kFlexfecPktMask[] = {kKBit0 | 0x08, 0x81};
   constexpr uint8_t kUlpfecPacketMask[] =        {0x11, 0x02};
   // clang-format on
   constexpr uint8_t kPacketData[] = {
-      kNoFBit | kNoRBit, kPtRecovery,    kLengthRecov[0],    kLengthRecov[1],
+      kNoRBit | kNoFBit, kPtRecovery,    kLengthRecov[0],    kLengthRecov[1],
       kTsRecovery[0],    kTsRecovery[1], kTsRecovery[2],     kTsRecovery[3],
       kSsrcCount,        kReservedBits,  kReservedBits,      kReservedBits,
       kProtSsrc[0],      kProtSsrc[1],   kProtSsrc[2],       kProtSsrc[3],
       kSnBase[0],        kSnBase[1],     kFlexfecPktMask[0], kFlexfecPktMask[1],
       kPayloadBits,      kPayloadBits,   kPayloadBits,       kPayloadBits};
   const size_t packet_length = sizeof(kPacketData);
   ReceivedFecPacket read_packet;
   read_packet.pkt = rtc::scoped_refptr<Packet>(new Packet());
   memcpy(read_packet.pkt->data, kPacketData, packet_length);
   read_packet.pkt->length = packet_length;
@@ skipping 10 matching lines @@
   constexpr uint8_t kKBit1 = 1 << 7;
   constexpr size_t kExpectedPacketMaskSize = 6;
   constexpr size_t kExpectedFecHeaderSize = 24;
   // clang-format off
   constexpr uint8_t kFlxfecPktMsk[] = {kKBit0 | 0x48, 0x81,
                                        kKBit1 | 0x02, 0x11, 0x00, 0x21};
   constexpr uint8_t kUlpfecPacketMask[] =      {0x91, 0x02,
                                                 0x08, 0x44, 0x00, 0x84};
   // clang-format on
   constexpr uint8_t kPacketData[] = {
-      kNoFBit | kNoRBit, kPtRecovery,      kLengthRecov[0],  kLengthRecov[1],
+      kNoRBit | kNoFBit, kPtRecovery,      kLengthRecov[0],  kLengthRecov[1],
       kTsRecovery[0],    kTsRecovery[1],   kTsRecovery[2],   kTsRecovery[3],
       kSsrcCount,        kReservedBits,    kReservedBits,    kReservedBits,
       kProtSsrc[0],      kProtSsrc[1],     kProtSsrc[2],     kProtSsrc[3],
       kSnBase[0],        kSnBase[1],       kFlxfecPktMsk[0], kFlxfecPktMsk[1],
       kFlxfecPktMsk[2],  kFlxfecPktMsk[3], kFlxfecPktMsk[4], kFlxfecPktMsk[5],
       kPayloadBits,      kPayloadBits,     kPayloadBits,     kPayloadBits};
   const size_t packet_length = sizeof(kPacketData);
   ReceivedFecPacket read_packet;
   read_packet.pkt = rtc::scoped_refptr<Packet>(new Packet());
   memcpy(read_packet.pkt->data, kPacketData, packet_length);
@@ skipping 16 matching lines @@
   constexpr uint8_t kFlxfcPktMsk[] = {kKBit0 | 0x48, 0x81,
                                       kKBit1 | 0x02, 0x11, 0x00, 0x21,
                                       kKBit2 | 0x01, 0x11, 0x11, 0x11,
                                                0x11, 0x11, 0x11, 0x11};
   constexpr uint8_t kUlpfecPacketMask[] =     {0x91, 0x02,
                                                0x08, 0x44, 0x00, 0x84,
                                                0x08, 0x88, 0x88, 0x88,
                                                0x88, 0x88, 0x88, 0x88};
   // clang-format on
   constexpr uint8_t kPacketData[] = {
-      kNoFBit | kNoRBit, kPtRecovery,      kLengthRecov[0],  kLengthRecov[1],
+      kNoRBit | kNoFBit, kPtRecovery,      kLengthRecov[0],  kLengthRecov[1],
       kTsRecovery[0],    kTsRecovery[1],   kTsRecovery[2],   kTsRecovery[3],
       kSsrcCount,        kReservedBits,    kReservedBits,    kReservedBits,
       kProtSsrc[0],      kProtSsrc[1],     kProtSsrc[2],     kProtSsrc[3],
       kSnBase[0],        kSnBase[1],       kFlxfcPktMsk[0],  kFlxfcPktMsk[1],
       kFlxfcPktMsk[2],   kFlxfcPktMsk[3],  kFlxfcPktMsk[4],  kFlxfcPktMsk[5],
       kFlxfcPktMsk[6],   kFlxfcPktMsk[7],  kFlxfcPktMsk[8],  kFlxfcPktMsk[9],
       kFlxfcPktMsk[10],  kFlxfcPktMsk[11], kFlxfcPktMsk[12], kFlxfcPktMsk[13],
       kPayloadBits,      kPayloadBits,     kPayloadBits,     kPayloadBits};
   const size_t packet_length = sizeof(kPacketData);
   ReceivedFecPacket read_packet;
@@ skipping 295 matching lines @@
 
   auto written_packet = WriteHeader(packet_mask.get(), packet_mask_size);
   auto read_packet = ReadHeader(*written_packet);
 
   VerifyWrittenAndReadHeaders(kFlexfecHeaderSizes[2], packet_mask.get(),
                               kFlexfecPacketMaskSizes[2], *written_packet,
                               *read_packet);
 }
 
 }  // namespace webrtc