Fix AnnexB validation logic to work with encrypted content.

media/formats/mp4/avc.h

 // 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.
 
 #ifndef MEDIA_FORMATS_MP4_AVC_H_
 #define MEDIA_FORMATS_MP4_AVC_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 21 matching lines @@
       std::vector<uint8>* buffer,
       std::vector<SubsampleEntry>* subsamples);
 
   static bool ConvertConfigToAnnexB(
       const AVCDecoderConfigurationRecord& avc_config,
       std::vector<uint8>* buffer,
       std::vector<SubsampleEntry>* subsamples);
 
   // Verifies that the contents of |buffer| conform to
   // Section 7.4.1.2.3 of ISO/IEC 14496-10.
+  // |subsamples| contains the information about what parts of the buffer are
+  // encrypted and which parts are clear.
   // Returns true if |buffer| contains conformant Annex B data
   // TODO(acolwell): Remove the std::vector version when we can use,
   // C++11's std::vector<T>::data() method.
-  static bool IsValidAnnexB(const std::vector<uint8>& buffer);
-  static bool IsValidAnnexB(const uint8* buffer, size_t size);
+  static bool IsValidAnnexB(const std::vector<uint8>& buffer,
+                            const std::vector<SubsampleEntry>& subsamples);
+  static bool IsValidAnnexB(const uint8* buffer, size_t size,
+                            const std::vector<SubsampleEntry>& subsamples);
 };
 
 }  // namespace mp4
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_MP4_AVC_H_