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

webrtc/common_video/h264/sps_vui_rewriter_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 146 matching lines @@
       H264::FindNaluIndices(buffer.data(), buffer.size());
   EXPECT_EQ(1u, start_offsets.size());
   H264::NaluIndex index = start_offsets[0];
 
   H264::NaluType nal_type =
       H264::ParseNaluType(buffer[index.payload_start_offset]);
   EXPECT_EQ(H264::kSps, nal_type);
   index.payload_start_offset += H264::kNaluTypeSize;
   index.payload_size -= H264::kNaluTypeSize;
 
+  std::unique_ptr<rtc::Buffer> rbsp_decoded =
+      H264::ParseRbsp(&buffer[index.payload_start_offset], index.payload_size);
   rtc::Optional<SpsParser::SpsState> sps;
   rtc::Buffer out_buffer;
-  SpsVuiRewriter::ParseResult result =
-      SpsVuiRewriter::ParseAndRewriteSps(&buffer[index.payload_start_offset],
-                                         index.payload_size, &sps, &out_buffer);
+  SpsVuiRewriter::ParseResult result = SpsVuiRewriter::ParseAndRewriteSps(
+      rbsp_decoded->data(), rbsp_decoded->size(), &sps, &out_buffer);
   EXPECT_EQ(expected_parse_result, result);
 }
 
 #define REWRITE_TEST(test_name, mode, expected_parse_result) \
   TEST(SpsVuiRewriterTest, test_name) { TestSps(mode, expected_parse_result); }
 
 REWRITE_TEST(PocCorrect,
              kNoRewriteRequired_PocCorrect,
              SpsVuiRewriter::ParseResult::kPocOk);
 REWRITE_TEST(VuiAlreadyOptimal,
              kNoRewriteRequired_VuiOptimal,
              SpsVuiRewriter::ParseResult::kVuiOk);
 REWRITE_TEST(RewriteFullVui,
              kRewriteRequired_NoVui,
              SpsVuiRewriter::ParseResult::kVuiRewritten);
 REWRITE_TEST(AddBitstreamRestriction,
              kRewriteRequired_NoBitstreamRestriction,
              SpsVuiRewriter::ParseResult::kVuiRewritten);
 REWRITE_TEST(RewriteSuboptimalVui,
              kRewriteRequired_VuiSuboptimal,
              SpsVuiRewriter::ParseResult::kVuiRewritten);
 
 }  // namespace webrtc