media config: expand is_encrypted to a struct.

media/ffmpeg/ffmpeg_common.cc

Index: media/ffmpeg/ffmpeg_common.cc
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
index 1f0cc92e4926eb631d187ec6fe3102026f3126de..fc687d1bfe7b8c1389f18a9722b6c3fe1438c7b7 100644
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -12,6 +12,7 @@
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "media/base/decoder_buffer.h"
+#include "media/base/encryption_scheme.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_util.h"
 #include "media/media_features.h"
@@ -370,13 +371,8 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context,
     extra_data.assign(codec_context->extradata,
                       codec_context->extradata + codec_context->extradata_size);
   }
-  config->Initialize(codec,
-                     sample_format,
-                     channel_layout,
-                     sample_rate,
-                     extra_data,
-                     is_encrypted,
-                     seek_preroll,
+  config->Initialize(codec, sample_format, channel_layout, sample_rate,
+                     extra_data, EncryptionScheme(is_encrypted), seek_preroll,

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

FFmpeg only supports CTR without a pattern, so we should not hide that
information. Perhaps this should be pushed up the the call stack, but for now we
can pass the correct scheme.

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

Done.

                      codec_context->delay);
 
   // Verify that AudioConfig.bits_per_channel was calculated correctly for
@@ -534,7 +530,8 @@ bool AVStreamToVideoDecoderConfig(const AVStream* stream,
                       stream->codec->extradata + stream->codec->extradata_size);
   }
   config->Initialize(codec, profile, format, color_space, coded_size,
-                     visible_rect, natural_size, extra_data, is_encrypted);
+                     visible_rect, natural_size, extra_data,
+                     EncryptionScheme(is_encrypted));

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

ditto

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

Done.

   return true;
 }