Fix SPS/PPS insertion logic in MP4StreamParser.

media/formats/mp4/mp4_stream_parser.cc

 // Copyright 2014 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/formats/mp4/mp4_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/time/time.h"
@@ skipping 347 matching lines @@
         subsamples->size() * nalu_size_diff;
     RCHECK(frame_buf->size() == expected_size);
     for (size_t i = 0; i < subsamples->size(); i++)
       (*subsamples)[i].clear_bytes += nalu_size_diff;
   }
 
   if (runs_->is_keyframe()) {
     // If this is a keyframe, we (re-)inject SPS and PPS headers at the start of
     // a frame. If subsample info is present, we also update the clear byte
     // count for that first subsample.
-    std::vector<uint8> param_sets;
-    RCHECK(AVC::ConvertConfigToAnnexB(avc_config, &param_sets));
-    frame_buf->insert(frame_buf->begin(),
-                      param_sets.begin(), param_sets.end());
+    size_t old_size = frame_buf->size();
+    RCHECK(AVC::InsertParamSetsAnnexB(avc_config, frame_buf));
     if (!subsamples->empty())

[damienv1, 2014/04/23 19:07:28]

Would be nice if InsertParamSetsAnnexB returns the insert position so that some
sanity check can be done for encrypted content:

if (!subsamples->empty() && frame_buf->size() > old_size) {
  DCHECK_LE(insert_position, (*subsamples)[0].clear_bytes);
  ...
}

[acolwell GONE FROM CHROMIUM, 2014/04/23 23:06:53]

This code was totally broken for the AUD case. Updated the code to what I
believe the correct fix is. Waiting on receiving an encrypted file from a
teammate to verify the changes.

-      (*subsamples)[0].clear_bytes += param_sets.size();
+      (*subsamples)[0].clear_bytes += frame_buf->size() - old_size;
   }
+
+  DCHECK(AVC::IsValidAnnexB(*frame_buf));
   return true;
 }
 
 bool MP4StreamParser::PrepareAACBuffer(
     const AAC& aac_config, std::vector<uint8>* frame_buf,
     std::vector<SubsampleEntry>* subsamples) const {
   // Append an ADTS header to every audio sample.
   RCHECK(aac_config.ConvertEsdsToADTS(frame_buf));
 
   // As above, adjust subsample information to account for the headers. AAC is
@@ skipping 190 matching lines @@
   return !err;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media