Update reference indices according to updates in the RTP payload profile.

webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc

 /*
  *  Copyright (c) 2015 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 79 matching lines @@
 //        0 1 2 3 4 5 6 7
 //        +-+-+-+-+-+-+-+-+
 //        |I|P|L|F|B|E|V|-| (REQUIRED)
 //        +-+-+-+-+-+-+-+-+
 //   I:   |M| PICTURE ID  | (RECOMMENDED)
 //        +-+-+-+-+-+-+-+-+
 //   M:   | EXTENDED PID  | (RECOMMENDED)
 //        +-+-+-+-+-+-+-+-+
 //   L:   |  T  |U|  S  |D| (CONDITIONALLY RECOMMENDED)
 //        +-+-+-+-+-+-+-+-+                             -|
-//   P,F: | P_DIFF    |X|N| (CONDITIONALLY RECOMMENDED)  .
-//        +-+-+-+-+-+-+-+-+                              . up to 3 times
-//   X:   |EXTENDED P_DIFF| (OPTIONAL)                   .
+//   P,F: | P_DIFF      |N| (CONDITIONALLY RECOMMENDED)  . up to 3 times
 //        +-+-+-+-+-+-+-+-+                             -|
 //   V:   | SS            |
 //        | ..            |
 //        +-+-+-+-+-+-+-+-+
 //
 // Payload descriptor for non-flexible mode
 //        0 1 2 3 4 5 6 7
 //        +-+-+-+-+-+-+-+-+
 //        |I|P|L|F|B|E|V|-| (REQUIRED)
 //        +-+-+-+-+-+-+-+-+
@@ skipping 178 matching lines @@
   // I:0, P:0, L:1, F:1, B:1, E:1, V:0 (2hdr + 21 payload)
   // L:   T:3, U:1, S:2, D:0
   const size_t kExpectedHdrSizes[] = {2};
   const size_t kExpectedSizes[] = {23};
   const size_t kExpectedNum = GTEST_ARRAY_SIZE_(kExpectedSizes);
   CreateParseAndCheckPackets(kExpectedHdrSizes, kExpectedSizes, kExpectedNum);
 }
 
 TEST_F(RtpPacketizerVp9Test, TestRefIdx) {
   const size_t kFrameSize = 16;
-  const size_t kPacketSize = 22;
+  const size_t kPacketSize = 21;
 
   expected_.inter_pic_predicted = true;  // P
   expected_.flexible_mode = true;        // F
-  expected_.picture_id = 100;
-  expected_.num_ref_pics = 2;
-  expected_.pid_diff[0] = 3;
-  expected_.pid_diff[1] = 1171;
-  expected_.ref_picture_id[0] = 97;     // 100 - 3 = 97
-  expected_.ref_picture_id[1] = 31697;  // 0x7FFF + 1 + 100 - 1171 = 31697
+  expected_.picture_id = 2;
+  expected_.max_picture_id = kMaxOneBytePictureId;
+
+  expected_.num_ref_pics = 3;
+  expected_.pid_diff[0] = 1;
+  expected_.pid_diff[1] = 3;
+  expected_.pid_diff[2] = 127;
+  expected_.ref_picture_id[0] = 1;    // 2 - 1 = 1
+  expected_.ref_picture_id[1] = 127;  // 0x7F + 1 + 2 - 3 = 127
+  expected_.ref_picture_id[2] = 3;    // 0x7F + 1 + 2 - 127 = 3
   Init(kFrameSize, kPacketSize);
 
   // Two packets:
-  // I:1, P:1, L:0, F:1, B:1, E:1, V:0 (6hdr + 16 payload)
-  // I:   100 (2 bytes)
-  // P,F: P_DIFF:3, X:0, N:1
-  //      P_DIFF:1171, X:1, N:0 (2 bytes)
-  const size_t kExpectedHdrSizes[] = {6};
-  const size_t kExpectedSizes[] = {22};
+  // I:1, P:1, L:0, F:1, B:1, E:1, V:0 (5hdr + 16 payload)
+  // I:   2
+  // P,F: P_DIFF:1,   N:1
+  //      P_DIFF:3,   N:1
+  //      P_DIFF:127, N:0

[stefan-webrtc, 2015/10/28 12:35:52]

Shouldn't 127 be the second one?

[åsapersson, 2015/10/28 12:48:21]

For
1: p_diff = 1   => ref_picture_id = 1
2: p_diff = 3   => ref_picture_id = 127
3: p_diff = 127 => ref_picture_id = 3

[stefan-webrtc, 2015/10/28 13:04:48]

Makes sense, my bad. Maybe you could express liens 307-312 in terms of
kMaxPictureId to clarify?

[åsapersson, 2015/10/28 13:55:24]

Updated comments.
And added a todo for max picture id used.

+  const size_t kExpectedHdrSizes[] = {5};
+  const size_t kExpectedSizes[] = {21};
   const size_t kExpectedNum = GTEST_ARRAY_SIZE_(kExpectedSizes);
   CreateParseAndCheckPackets(kExpectedHdrSizes, kExpectedSizes, kExpectedNum);
 }
 
 TEST_F(RtpPacketizerVp9Test, TestRefIdxFailsWithoutPictureId) {
   const size_t kFrameSize = 16;
-  const size_t kPacketSize = 22;
+  const size_t kPacketSize = 21;
 
   expected_.inter_pic_predicted = true;
   expected_.flexible_mode = true;
   expected_.num_ref_pics = 1;
   expected_.pid_diff[0] = 3;
   Init(kFrameSize, kPacketSize);
 
   const size_t kExpectedNum = 0;
   CreateParseAndCheckPackets(NULL, NULL, kExpectedNum);
 }
@@ skipping 175 matching lines @@
   expected_.beginning_of_frame = true;
   expected_.flexible_mode = true;
   expected_.temporal_idx = kTemporalIdx;
   expected_.temporal_up_switch = kUbit ? true : false;
   expected_.spatial_idx = kSpatialIdx;
   expected_.inter_layer_predicted = kDbit ? true : false;
   ParseAndCheckPacket(packet, expected_, kHeaderLength, sizeof(packet));
 }
 
 TEST_F(RtpDepacketizerVp9Test, ParseRefIdx) {
-  const uint8_t kHeaderLength = 7;
+  const uint8_t kHeaderLength = 6;
   const int16_t kPictureId = 17;
   const int16_t kPdiff1 = 17;
   const int16_t kPdiff2 = 18;
-  const int16_t kExtPdiff3 = 2171;
+  const int16_t kPdiff3 = 127;
   uint8_t packet[13] = {0};
   packet[0] = 0xD8;  // I:1 P:1 L:0 F:1 B:1 E:0 V:0 R:0
   packet[1] = 0x80 | ((kPictureId >> 8) & 0x7F);  // Two byte pictureID.
   packet[2] = kPictureId;
-  packet[3] = (kPdiff1 << 2) | (0 << 1) | 1;            // P_DIFF X:0 N:1
-  packet[4] = (kPdiff2 << 2) | (0 << 1) | 1;            // P_DIFF X:0 N:1
-  packet[5] = ((kExtPdiff3 >> 8) << 2) | (1 << 1) | 0;  // P_DIFF X:1 N:0
-  packet[6] = kExtPdiff3 & 0xff;                        // EXTENDED P_DIFF
+  packet[3] = (kPdiff1 << 1) | 1;  // P_DIFF N:1
+  packet[4] = (kPdiff2 << 1) | 1;  // P_DIFF N:1
+  packet[5] = (kPdiff3 << 1) | 0;  // P_DIFF N:0
 
   // I:1 P:1 L:0 F:1 B:1 E:0 V:0
   // I:    PICTURE ID:17
   // I:
-  // P,F:  P_DIFF:17 X:0 N:1   => refPictureId = 17 - 17 = 0
-  // P,F:  P_DIFF:18 X:0 N:1   => refPictureId = 0x7FFF + 1 + 17 - 18 = 0x7FFF
-  // P,F:  P_DIFF:2171 X:1 N:0 => refPictureId = 0x7FFF + 1 + 17 - 2171 = 30614
+  // P,F:  P_DIFF:17  N:1 => refPictureId = 17 - 17 = 0
+  // P,F:  P_DIFF:18  N:1 => refPictureId = 0x7FFF + 1 + 17 - 18 = 0x7FFF
+  // P,F:  P_DIFF:127 N:0 => refPictureId = 0x7FFF + 1 + 17 - 127 = 32658
   expected_.beginning_of_frame = true;
   expected_.inter_pic_predicted = true;
   expected_.flexible_mode = true;
   expected_.picture_id = kPictureId;
   expected_.num_ref_pics = 3;
   expected_.pid_diff[0] = kPdiff1;
   expected_.pid_diff[1] = kPdiff2;
-  expected_.pid_diff[2] = kExtPdiff3;
+  expected_.pid_diff[2] = kPdiff3;
   expected_.ref_picture_id[0] = 0;
   expected_.ref_picture_id[1] = 0x7FFF;
-  expected_.ref_picture_id[2] = 30614;
+  expected_.ref_picture_id[2] = 32658;
   ParseAndCheckPacket(packet, expected_, kHeaderLength, sizeof(packet));
 }
 
 TEST_F(RtpDepacketizerVp9Test, ParseRefIdxFailsWithNoPictureId) {
   const int16_t kPdiff = 3;
   uint8_t packet[13] = {0};
-  packet[0] = 0x58;                          // I:0 P:1 L:0 F:1 B:1 E:0 V:0 R:0
-  packet[1] = (kPdiff << 2) | (0 << 1) | 0;  // P,F:  P_DIFF:3 X:0 N:0
+  packet[0] = 0x58;            // I:0 P:1 L:0 F:1 B:1 E:0 V:0 R:0
+  packet[1] = (kPdiff << 1);   // P,F:  P_DIFF:3 N:0
 
   RtpDepacketizer::ParsedPayload parsed;
   EXPECT_FALSE(depacketizer_->Parse(&parsed, packet, sizeof(packet)));
 }
 
 TEST_F(RtpDepacketizerVp9Test, ParseRefIdxFailsWithTooManyRefPics) {
   const int16_t kPdiff = 3;
   uint8_t packet[13] = {0};
-  packet[0] = 0xD8;                          // I:1 P:1 L:0 F:1 B:1 E:0 V:0 R:0
-  packet[1] = kMaxOneBytePictureId;          // I:    PICTURE ID:127
-  packet[2] = (kPdiff << 2) | (0 << 1) | 1;  // P,F:  P_DIFF:3 X:0 N:1
-  packet[3] = (kPdiff << 2) | (0 << 1) | 1;  // P,F:  P_DIFF:3 X:0 N:1
-  packet[4] = (kPdiff << 2) | (0 << 1) | 1;  // P,F:  P_DIFF:3 X:0 N:1
-  packet[5] = (kPdiff << 2) | (0 << 1) | 0;  // P,F:  P_DIFF:3 X:0 N:0
+  packet[0] = 0xD8;                  // I:1 P:1 L:0 F:1 B:1 E:0 V:0 R:0
+  packet[1] = kMaxOneBytePictureId;  // I:    PICTURE ID:127
+  packet[2] = (kPdiff << 1) | 1;     // P,F:  P_DIFF:3 N:1
+  packet[3] = (kPdiff << 1) | 1;     // P,F:  P_DIFF:3 N:1
+  packet[4] = (kPdiff << 1) | 1;     // P,F:  P_DIFF:3 N:1
+  packet[5] = (kPdiff << 1) | 0;     // P,F:  P_DIFF:3 N:0
 
   RtpDepacketizer::ParsedPayload parsed;
   EXPECT_FALSE(depacketizer_->Parse(&parsed, packet, sizeof(packet)));
 }
 
 TEST_F(RtpDepacketizerVp9Test, ParseSsData) {
   const uint8_t kHeaderLength = 5;
   const uint8_t kYbit = 0;
   const size_t kNs = 2;
   const size_t kNg = 2;
@@ skipping 68 matching lines @@
 }
 
 TEST_F(RtpDepacketizerVp9Test, ParseFailsForTooShortBufferToFitPayload) {
   const uint8_t kHeaderLength = 1;
   uint8_t packet[kHeaderLength] = {0};
   RtpDepacketizer::ParsedPayload parsed;
   EXPECT_FALSE(depacketizer_->Parse(&parsed, packet, sizeof(packet)));
 }
 
 }  // namespace webrtc