media config: expand is_encrypted to a struct.

media/formats/mp2t/es_parser_adts.cc

Index: media/formats/mp2t/es_parser_adts.cc
diff --git a/media/formats/mp2t/es_parser_adts.cc b/media/formats/mp2t/es_parser_adts.cc
index adf1dbe8ed1032aade94833e9609581d221cd3c9..78579db72756c12a402cd3e3a38a2d994b7eeca6 100644
--- a/media/formats/mp2t/es_parser_adts.cc
+++ b/media/formats/mp2t/es_parser_adts.cc
@@ -12,6 +12,7 @@
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/bit_reader.h"
 #include "media/base/channel_layout.h"
+#include "media/base/encryption_scheme.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/timestamp_constants.h"
 #include "media/formats/common/offset_byte_queue.h"
@@ -225,13 +226,12 @@ bool EsParserAdts::UpdateAudioConfiguration(const uint8* adts_header) {
   extra_data.push_back(static_cast<uint8>(extra_data_int >> 8));
   extra_data.push_back(static_cast<uint8>(extra_data_int & 0xff));
 
+  EncryptionScheme scheme(false);

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

Why do we need a local variable?

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

This is a placeholder for a change in the next CL, where the scheme variable is
computed in a more complicated way.

+
   AudioDecoderConfig audio_decoder_config(
-      kCodecAAC,
-      kSampleFormatS16,
+      kCodecAAC, kSampleFormatS16,
       kADTSChannelLayoutTable[channel_configuration],
-      extended_samples_per_second,
-      extra_data,
-      false);
+      extended_samples_per_second, extra_data, scheme);
 
   if (!audio_decoder_config.Matches(last_audio_decoder_config_)) {
     DVLOG(1) << "Sampling frequency: " << samples_per_second;