Disregard trailing null bytes when locating RBSP stop bits.

media/filters/h264_to_annex_b_bitstream_converter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/h264_to_annex_b_bitstream_converter.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "media/filters/h264_parser.h"
@@ skipping 247 matching lines @@
   }
   // Successful conversion, output the freshly allocated bitstream buffer.
   *output_size = static_cast<uint32_t>(outscan - output);
   return true;
 }
 
 bool H264ToAnnexBBitstreamConverter::WriteParamSet(
     const std::vector<uint8_t>& param_set,
     uint8_t** out,
     uint32_t* out_size) const {
+  // Strip trailing null bytes.
+  uint32_t size = param_set.size();

[Pawel Osciak, 2016/03/01 08:56:21]

s/uint32_t/size_t/

[sandersd (OOO until July 31), 2016/03/17 19:07:51]

Done.

+  while (size && param_set[size - 1] == 0)
+    size--;
+  if (!size)
+    return false;
+
+  // Verify space.
   uint32_t bytes_left = *out_size;
   if (bytes_left < kParamSetStartCodeSize ||
-      bytes_left - kParamSetStartCodeSize < param_set.size()) {
+      bytes_left - kParamSetStartCodeSize < size) {
     return false;
   }
 
   uint8_t* start = *out;
   uint8_t* buf = start;
 
   // Write the 4 byte Annex B start code.
   *buf++ = 0;  // zero byte
   memcpy(buf, kStartCodePrefix, sizeof(kStartCodePrefix));
   buf += sizeof(kStartCodePrefix);
 
-  memcpy(buf, &param_set[0], param_set.size());
-  buf += param_set.size();
+  // Copy the data.
+  memcpy(buf, &param_set[0], size);
+  buf += size;
 
   *out = buf;
   *out_size -= buf - start;
   return true;
 }
 
 }  // namespace media