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

webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu.h

 /*
  *  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.
  *
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_NALU_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_NALU_H_
 
 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
 
 #if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
 
 #include <CoreMedia/CoreMedia.h>
+#include <vector>
 
 #include "webrtc/base/buffer.h"
+#include "webrtc/common_video/h264/h264_common.h"
 #include "webrtc/modules/include/module_common_types.h"
 
+using webrtc::H264::NaluIndex;
+
 namespace webrtc {
 
 // Converts a sample buffer emitted from the VideoToolbox encoder into a buffer
 // suitable for RTP. The sample buffer is in avcc format whereas the rtp buffer
 // needs to be in Annex B format. Data is written directly to |annexb_buffer|
 // and a new RTPFragmentationHeader is returned in |out_header|.
 bool H264CMSampleBufferToAnnexBBuffer(
     CMSampleBufferRef avcc_sample_buffer,
     bool is_keyframe,
     rtc::Buffer* annexb_buffer,
@@ skipping 38 matching lines @@
   // If the buffer has no remaining NALUs this will return zero.
   size_t BytesRemaining() const;
 
  private:
   // Returns the the next offset that contains NALU data.
   size_t FindNextNaluHeader(const uint8_t* start,
                             size_t length,
                             size_t offset) const;
 
   const uint8_t* const start_;
-  size_t offset_;
-  size_t next_offset_;
+  std::vector<NaluIndex> offsets_;
+  std::vector<NaluIndex>::iterator offset_;
   const size_t length_;
 };
 
 // Helper class for writing NALUs using avcc format into a buffer.
 class AvccBufferWriter final {
  public:
   AvccBufferWriter(uint8_t* const avcc_buffer, size_t length);
   ~AvccBufferWriter() {}
   AvccBufferWriter(const AvccBufferWriter& other) = delete;
   void operator=(const AvccBufferWriter& other) = delete;
 
   // Writes the data slice into the buffer. Returns false if there isn't
   // enough space left.
   bool WriteNalu(const uint8_t* data, size_t data_size);
 
   // Returns the unused bytes in the buffer.
   size_t BytesRemaining() const;
 
  private:
   uint8_t* const start_;
   size_t offset_;
   const size_t length_;
 };
 
 }  // namespace webrtc
 
 #endif  // defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_NALU_H_