media config: expand is_encrypted to a struct.

media/formats/mp2t/es_parser_mpeg1audio.cc

Index: media/formats/mp2t/es_parser_mpeg1audio.cc
diff --git a/media/formats/mp2t/es_parser_mpeg1audio.cc b/media/formats/mp2t/es_parser_mpeg1audio.cc
index 5032887593c0ef78ea2e0095f89828a890b5f58a..49f34894f5b444e496e752d05987b6c8d5c27ec2 100644
--- a/media/formats/mp2t/es_parser_mpeg1audio.cc
+++ b/media/formats/mp2t/es_parser_mpeg1audio.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"
@@ -170,12 +171,8 @@ bool EsParserMpeg1Audio::UpdateAudioConfiguration(
   // TODO(damienv): Verify whether Android playback requires the extra data
   // field for Mpeg1 audio. If yes, we should generate this field.
   AudioDecoderConfig audio_decoder_config(
-      kCodecMP3,
-      kSampleFormatS16,
-      header.channel_layout,
-      header.sample_rate,
-      std::vector<uint8_t>(),
-      false);
+      kCodecMP3, kSampleFormatS16, header.channel_layout, header.sample_rate,
+      std::vector<uint8_t>(), EncryptionScheme::unencrypted());

[ddorwin, 2016/03/01 02:17:42]

This codec cannot be encrypted? Is that guaranteed somehow?

[dougsteed, 2016/03/02 18:07:53]

My understanding is that it is not supported for HLS, and thus can not be
encrypted.

 
   if (!audio_decoder_config.Matches(last_audio_decoder_config_)) {
     DVLOG(1) << "Sampling frequency: " << header.sample_rate;