Fix AnnexB validation logic to work with encrypted content.

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 364 matching lines @@
       (*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.
     RCHECK(AVC::InsertParamSetsAnnexB(avc_config, frame_buf, subsamples));
   }
 
-  // TODO(acolwell): Improve IsValidAnnexB() so it can handle encrypted content.
-  DCHECK(runs_->is_encrypted() || AVC::IsValidAnnexB(*frame_buf));
+  DCHECK(AVC::IsValidAnnexB(*frame_buf, *subsamples));
   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 229 matching lines @@
       runs.AdvanceSample();
     }
     runs.AdvanceRun();
   }
 
   return true;
 }
 
 }  // namespace mp4
 }  // namespace media