media config: expand is_encrypted to a struct.

media/base/fake_demuxer_stream.cc

 // Copyright (c) 2013 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.
 
 #include "media/base/fake_demuxer_stream.h"
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
+#include "media/base/encryption_scheme.h"
 #include "media/base/media_util.h"
 #include "media/base/test_helpers.h"
 #include "media/base/timestamp_constants.h"
 #include "media/base/video_frame.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace media {
 
 const int kStartTimestampMs = 0;
@@ skipping 110 matching lines @@
     base::ResetAndReturn(&read_cb_).Run(kAborted, NULL);
 }
 
 void FakeDemuxerStream::SeekToStart() {
   Reset();
   Initialize();
 }
 
 void FakeDemuxerStream::UpdateVideoDecoderConfig() {
   const gfx::Rect kVisibleRect(kStartWidth, kStartHeight);
-  video_decoder_config_.Initialize(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN,
-                                   PIXEL_FORMAT_YV12, COLOR_SPACE_UNSPECIFIED,
-                                   next_coded_size_, kVisibleRect,
-                                   next_coded_size_, EmptyExtraData(),
-                                   is_encrypted_);
+  EncryptionScheme encryption_scheme(
+      is_encrypted_ ? EncryptionScheme::CIPHER_MODE_AES_CTR
+                    : EncryptionScheme::CIPHER_MODE_UNENCRYPTED);
+  video_decoder_config_.Initialize(
+      kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN, PIXEL_FORMAT_YV12,
+      COLOR_SPACE_UNSPECIFIED, next_coded_size_, kVisibleRect, next_coded_size_,
+      EmptyExtraData(), encryption_scheme);

[xhwang, 2016/03/07 18:39:52]

nit: This can now be

is_encrypted_ ? AesCtrEncryptionScheme() : Unencrypted()

[dougsteed, 2016/03/07 21:12:40]

Done.

   next_coded_size_.Enlarge(kWidthDelta, kHeightDelta);
 }
 
 void FakeDemuxerStream::DoRead() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!read_cb_.is_null());
 
   next_read_num_++;
 
   if (num_buffers_left_in_current_config_ == 0) {
@@ skipping 46 matching lines @@
 FakeDemuxerStreamProvider::~FakeDemuxerStreamProvider() {
 }
 
 DemuxerStream* FakeDemuxerStreamProvider::GetStream(DemuxerStream::Type type) {
   if (type == DemuxerStream::Type::AUDIO)
     return nullptr;
   return &fake_video_stream_;
 };
 
 }  // namespace media