Add support for 3-byte headers in VideoToolbox NALU parser.

webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_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 70 matching lines @@
   EXPECT_EQ(arraysize(annex_b_test_data), reader.BytesRemaining());
   EXPECT_TRUE(reader.ReadNalu(&nalu, &nalu_length));
   EXPECT_EQ(annex_b_test_data + 4, nalu);
   EXPECT_EQ(1u, nalu_length);
   EXPECT_EQ(0u, reader.BytesRemaining());
   EXPECT_FALSE(reader.ReadNalu(&nalu, &nalu_length));
   EXPECT_EQ(nullptr, nalu);
   EXPECT_EQ(0u, nalu_length);
 }
 
+TEST(AnnexBBufferReaderTest, TestReadSingleNalu3ByteHeader) {
+  const uint8_t annex_b_test_data[] = {0x00, 0x00, 0x01, 0xAA};
+  AnnexBBufferReader reader(annex_b_test_data, arraysize(annex_b_test_data));
+  const uint8_t* nalu = nullptr;
+  size_t nalu_length = 0;
+  EXPECT_EQ(arraysize(annex_b_test_data), reader.BytesRemaining());
+  EXPECT_TRUE(reader.ReadNalu(&nalu, &nalu_length));
+  EXPECT_EQ(annex_b_test_data + 3, nalu);
+  EXPECT_EQ(1u, nalu_length);
+  EXPECT_EQ(0u, reader.BytesRemaining());
+  EXPECT_FALSE(reader.ReadNalu(&nalu, &nalu_length));
+  EXPECT_EQ(nullptr, nalu);
+  EXPECT_EQ(0u, nalu_length);
+}
+
 TEST(AnnexBBufferReaderTest, TestReadMissingNalu) {
   // clang-format off
   const uint8_t annex_b_test_data[] = {0x01,
                                        0x00, 0x01,
-                                       0x00, 0x00, 0x01,
                                        0x00, 0x00, 0x00, 0xFF};
   // clang-format on
   AnnexBBufferReader reader(annex_b_test_data, arraysize(annex_b_test_data));
   const uint8_t* nalu = nullptr;
   size_t nalu_length = 0;
   EXPECT_EQ(0u, reader.BytesRemaining());
   EXPECT_FALSE(reader.ReadNalu(&nalu, &nalu_length));
   EXPECT_EQ(nullptr, nalu);
   EXPECT_EQ(0u, nalu_length);
 }
 
 TEST(AnnexBBufferReaderTest, TestReadMultipleNalus) {
   // clang-format off
   const uint8_t annex_b_test_data[] = {0x00, 0x00, 0x00, 0x01, 0xFF,
                                        0x01,
                                        0x00, 0x01,
-                                       0x00, 0x00, 0x01,
                                        0x00, 0x00, 0x00, 0xFF,
-                                       0x00, 0x00, 0x00, 0x01, 0xAA, 0xBB};
+                                       0x00, 0x00, 0x01, 0xAA, 0xBB};
   // clang-format on
   AnnexBBufferReader reader(annex_b_test_data, arraysize(annex_b_test_data));
   const uint8_t* nalu = nullptr;
   size_t nalu_length = 0;
   EXPECT_EQ(arraysize(annex_b_test_data), reader.BytesRemaining());
   EXPECT_TRUE(reader.ReadNalu(&nalu, &nalu_length));
   EXPECT_EQ(annex_b_test_data + 4, nalu);
-  EXPECT_EQ(11u, nalu_length);
+  EXPECT_EQ(8u, nalu_length);
   EXPECT_EQ(6u, reader.BytesRemaining());
   EXPECT_TRUE(reader.ReadNalu(&nalu, &nalu_length));
-  EXPECT_EQ(annex_b_test_data + 19, nalu);
+  EXPECT_EQ(annex_b_test_data + 16, nalu);
   EXPECT_EQ(2u, nalu_length);
   EXPECT_EQ(0u, reader.BytesRemaining());
   EXPECT_FALSE(reader.ReadNalu(&nalu, &nalu_length));
   EXPECT_EQ(nullptr, nalu);
   EXPECT_EQ(0u, nalu_length);
 }
 
 TEST(AvccBufferWriterTest, TestEmptyOutputBuffer) {
   const uint8_t expected_buffer[] = {0x00};
   const size_t buffer_size = 1;
@@ skipping 51 matching lines @@
   EXPECT_EQ(buffer_size, writer.BytesRemaining());
   EXPECT_FALSE(writer.WriteNalu(NALU_TEST_DATA_0, arraysize(NALU_TEST_DATA_0)));
   EXPECT_EQ(buffer_size, writer.BytesRemaining());
   EXPECT_EQ(0,
             memcmp(expected_buffer, buffer.get(), arraysize(expected_buffer)));
 }
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_TOOLBOX_SUPPORTED