media config: expand is_encrypted to a struct.

media/formats/mp2t/es_parser_h264.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_MP2T_ES_PARSER_H264_H_
 #define MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
 
-#include <list>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/base/media_export.h"
 #include "media/base/video_decoder_config.h"
 #include "media/formats/mp2t/es_adapter_video.h"
@@ skipping 40 matching lines @@
   // of the start code parser.
   bool FindAUD(int64* stream_pos);
 
   // Emit a frame whose position in the ES queue starts at |access_unit_pos|.
   // Returns true if successful, false if no PTS is available for the frame.
   bool EmitFrame(int64 access_unit_pos, int access_unit_size,
                  bool is_key_frame, int pps_id);
 
   // Update the video decoder config based on an H264 SPS.
   // Return true if successful.
-  bool UpdateVideoDecoderConfig(const H264SPS* sps);
+  bool UpdateVideoDecoderConfig(const H264SPS* sps,
+                                const EncryptionScheme& scheme);

[ddorwin, 2015/12/10 18:36:02]

Fwd declare?

[dougsteed, 2015/12/14 21:19:02]

Done.

 
   EsAdapterVideo es_adapter_;
 
   // H264 parser state.
   // - |current_access_unit_pos_| is pointing to an annexB syncword
   // representing the first NALU of an H264 access unit.
   scoped_ptr<H264Parser> h264_parser_;
   int64 current_access_unit_pos_;
   int64 next_access_unit_pos_;
 
   // Last video decoder config.
   VideoDecoderConfig last_video_decoder_config_;
 
   DISALLOW_COPY_AND_ASSIGN(EsParserH264);
 };
 
 }  // namespace mp2t
 }  // namespace media
 
 #endif