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

webrtc/common_video/h264/pps_parser_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.
  */
 
 #include "webrtc/common_video/h264/pps_parser.h"
 
 #include <limits>
+#include <memory>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "webrtc/base/bitbuffer.h"
 #include "webrtc/base/buffer.h"
 #include "webrtc/common_video/h264/h264_common.h"
 
 namespace webrtc {
 
-static const size_t kPpsBufferMaxSize = 256;
-static const uint32_t kIgnored = 0;
+namespace {
+// Contains enough of the image slice to contain slice QP.
+const uint8_t kH264BitstreamChunk[] = {
+    0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x80, 0x20, 0xda, 0x01, 0x40, 0x16,
+    0xe8, 0x06, 0xd0, 0xa1, 0x35, 0x00, 0x00, 0x00, 0x01, 0x68, 0xce, 0x06,
+    0xe2, 0x00, 0x00, 0x00, 0x01, 0x65, 0xb8, 0x40, 0xf0, 0x8c, 0x03, 0xf2,
+    0x75, 0x67, 0xad, 0x41, 0x64, 0x24, 0x0e, 0xa0, 0xb2, 0x12, 0x1e, 0xf8,
+};
+const size_t kPpsBufferMaxSize = 256;
+const uint32_t kIgnored = 0;
+}  // namespace
 
 void WritePps(const PpsParser::PpsState& pps,
               int slice_group_map_type,
               int num_slice_groups,
               int pic_size_in_map_units,
               rtc::Buffer* out_buffer) {
   uint8_t data[kPpsBufferMaxSize] = {0};
   rtc::BitBufferWriter bit_buffer(data, kPpsBufferMaxSize);
 
   // pic_parameter_set_id: ue(v)
-  bit_buffer.WriteExponentialGolomb(kIgnored);
+  bit_buffer.WriteExponentialGolomb(pps.id);
   // seq_parameter_set_id: ue(v)
-  bit_buffer.WriteExponentialGolomb(kIgnored);
+  bit_buffer.WriteExponentialGolomb(pps.sps_id);
   // entropy_coding_mode_flag: u(1)
   bit_buffer.WriteBits(kIgnored, 1);
   // bottom_field_pic_order_in_frame_present_flag: u(1)
   bit_buffer.WriteBits(pps.bottom_field_pic_order_in_frame_present_flag ? 1 : 0,
                        1);
   // num_slice_groups_minus1: ue(v)
   RTC_CHECK_GT(num_slice_groups, 0);
   bit_buffer.WriteExponentialGolomb(num_slice_groups - 1);
 
   if (num_slice_groups > 1) {
@@ skipping 120 matching lines @@
              &buffer_);
     parsed_pps_ = PpsParser::ParsePps(buffer_.data(), buffer_.size());
     EXPECT_TRUE(static_cast<bool>(parsed_pps_));
     EXPECT_EQ(pps.bottom_field_pic_order_in_frame_present_flag,
               parsed_pps_->bottom_field_pic_order_in_frame_present_flag);
     EXPECT_EQ(pps.weighted_pred_flag, parsed_pps_->weighted_pred_flag);
     EXPECT_EQ(pps.weighted_bipred_idc, parsed_pps_->weighted_bipred_idc);
     EXPECT_EQ(pps.redundant_pic_cnt_present_flag,
               parsed_pps_->redundant_pic_cnt_present_flag);
     EXPECT_EQ(pps.pic_init_qp_minus26, parsed_pps_->pic_init_qp_minus26);
+    EXPECT_EQ(pps.id, parsed_pps_->id);
+    EXPECT_EQ(pps.sps_id, parsed_pps_->sps_id);
   }
 
   PpsParser::PpsState generated_pps_;
   rtc::Buffer buffer_;
   rtc::Optional<PpsParser::PpsState> parsed_pps_;
 };
 
 TEST_F(PpsParserTest, ZeroPps) {
   RunTest();
 }
 
 TEST_F(PpsParserTest, MaxPps) {
   generated_pps_.bottom_field_pic_order_in_frame_present_flag = true;
   generated_pps_.pic_init_qp_minus26 = std::numeric_limits<int32_t>::max();
   generated_pps_.redundant_pic_cnt_present_flag = 1;  // 1 bit value.
   generated_pps_.weighted_bipred_idc = (1 << 2) - 1;  // 2 bit value.
   generated_pps_.weighted_pred_flag = true;
+  generated_pps_.id = 2;
+  generated_pps_.sps_id = 1;
   RunTest();
 
   generated_pps_.pic_init_qp_minus26 = std::numeric_limits<int32_t>::min() + 1;
   RunTest();
 }
 
+TEST_F(PpsParserTest, PpsIdFromSlice) {
+  rtc::Optional<uint32_t> pps_id = PpsParser::ParsePpsIdFromSlice(
+      kH264BitstreamChunk, sizeof(kH264BitstreamChunk));
+  ASSERT_TRUE(pps_id);
+  EXPECT_EQ(2u, *pps_id);
+}
+
 }  // namespace webrtc