Reland of "Change type of pid_diff (int16_t -> uint8_t) according to updates in 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 37 matching lines @@
         EXPECT_EQ(expected.width[i], actual.width[i]);
         EXPECT_EQ(expected.height[i], actual.height[i]);
       }
     }
     EXPECT_EQ(expected.gof.num_frames_in_gof, actual.gof.num_frames_in_gof);
     for (size_t i = 0; i < expected.gof.num_frames_in_gof; i++) {
       EXPECT_EQ(expected.gof.temporal_up_switch[i],
                 actual.gof.temporal_up_switch[i]);
       EXPECT_EQ(expected.gof.temporal_idx[i], actual.gof.temporal_idx[i]);
       EXPECT_EQ(expected.gof.num_ref_pics[i], actual.gof.num_ref_pics[i]);
-      for (size_t j = 0; j < expected.gof.num_ref_pics[i]; j++) {
+      for (uint8_t j = 0; j < expected.gof.num_ref_pics[i]; j++) {
         EXPECT_EQ(expected.gof.pid_diff[i][j], actual.gof.pid_diff[i][j]);
       }
     }
   }
 }
 
 void VerifyPayload(const RtpDepacketizer::ParsedPayload& parsed,
                    const uint8_t* payload,
                    size_t payload_length) {
   EXPECT_EQ(payload, parsed.payload);
@@ skipping 474 matching lines @@
   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 = 6;
   const int16_t kPictureId = 17;
-  const int16_t kPdiff1 = 17;
-  const int16_t kPdiff2 = 18;
-  const int16_t kPdiff3 = 127;
+  const uint8_t kPdiff1 = 17;
+  const uint8_t kPdiff2 = 18;
+  const uint8_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 << 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  N:1 => refPicId = 17 - 17 = 0
   // P,F:  P_DIFF:18  N:1 => refPicId = (kMaxPictureId + 1) + 17 - 18 = 0x7FFF
   // P,F:  P_DIFF:127 N:0 => refPicId = (kMaxPictureId + 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] = kPdiff3;
   expected_.ref_picture_id[0] = 0;
   expected_.ref_picture_id[1] = 0x7FFF;
   expected_.ref_picture_id[2] = 32658;
   ParseAndCheckPacket(packet, expected_, kHeaderLength, sizeof(packet));
 }
 
 TEST_F(RtpDepacketizerVp9Test, ParseRefIdxFailsWithNoPictureId) {
-  const int16_t kPdiff = 3;
+  const uint8_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 << 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;
+  const uint8_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 << 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)));
@@ skipping 75 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