Reland of Add pps id and sps id parsing to the h.264 depacketizer.

webrtc/common_video/h264/sps_parser_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 23 matching lines @@
 // two start codes (0 0 0 1 or 0 0 1). The first byte should be 0x67,
 // which should be stripped out before being passed to the parser.
 
 static const size_t kSpsBufferMaxSize = 256;
 
 // Generates a fake SPS with basically everything empty but the width/height.
 // Pass in a buffer of at least kSpsBufferMaxSize.
 // The fake SPS that this generates also always has at least one emulation byte
 // at offset 2, since the first two bytes are always 0, and has a 0x3 as the
 // level_idc, to make sure the parser doesn't eat all 0x3 bytes.
-void GenerateFakeSps(uint16_t width, uint16_t height, rtc::Buffer* out_buffer) {
+void GenerateFakeSps(uint16_t width,
+                     uint16_t height,
+                     int id,
+                     rtc::Buffer* out_buffer) {
   uint8_t rbsp[kSpsBufferMaxSize] = {0};
   rtc::BitBufferWriter writer(rbsp, kSpsBufferMaxSize);
   // Profile byte.
   writer.WriteUInt8(0);
   // Constraint sets and reserved zero bits.
   writer.WriteUInt8(0);
   // level_idc.
   writer.WriteUInt8(0x3u);
   // seq_paramter_set_id.
-  writer.WriteExponentialGolomb(0);
+  writer.WriteExponentialGolomb(id);
   // Profile is not special, so we skip all the chroma format settings.
 
   // Now some bit magic.
   // log2_max_frame_num_minus4: ue(v). 0 is fine.
   writer.WriteExponentialGolomb(0);
   // pic_order_cnt_type: ue(v). 0 is the type we want.
   writer.WriteExponentialGolomb(0);
   // log2_max_pic_order_cnt_lsb_minus4: ue(v). 0 is fine.
   writer.WriteExponentialGolomb(0);
   // max_num_ref_frames: ue(v). 0 is fine.
@@ skipping 79 matching lines @@
                             0x5E, 0x10, 0x00, 0x00, 0x03, 0x00, 0x60, 0x00,
                             0x00, 0x15, 0xA0, 0xF1, 0x42, 0x99, 0x60};
   EXPECT_TRUE(
       static_cast<bool>(sps_ = SpsParser::ParseSps(buffer, arraysize(buffer))));
   EXPECT_EQ(200u, sps_->width);
   EXPECT_EQ(400u, sps_->height);
 }
 
 TEST_F(H264SpsParserTest, TestSyntheticSPSQvgaLandscape) {
   rtc::Buffer buffer;
-  GenerateFakeSps(320u, 180u, &buffer);
+  GenerateFakeSps(320u, 180u, 1, &buffer);
   EXPECT_TRUE(static_cast<bool>(
       sps_ = SpsParser::ParseSps(buffer.data(), buffer.size())));
   EXPECT_EQ(320u, sps_->width);
   EXPECT_EQ(180u, sps_->height);
+  EXPECT_EQ(1u, sps_->id);
 }
 
 TEST_F(H264SpsParserTest, TestSyntheticSPSWeirdResolution) {
   rtc::Buffer buffer;
-  GenerateFakeSps(156u, 122u, &buffer);
+  GenerateFakeSps(156u, 122u, 2, &buffer);
   EXPECT_TRUE(static_cast<bool>(
       sps_ = SpsParser::ParseSps(buffer.data(), buffer.size())));
   EXPECT_EQ(156u, sps_->width);
   EXPECT_EQ(122u, sps_->height);
+  EXPECT_EQ(2u, sps_->id);
 }
 
 }  // namespace webrtc