| Index: media/base/fake_demuxer_stream.cc
|
| diff --git a/media/base/fake_demuxer_stream.cc b/media/base/fake_demuxer_stream.cc
|
| index 267b3e5d8d23a6f21f1c6a8c1987b5787b5de360..32ee134f9e0f330b09e4e4a65a0a2be81ff4960f 100644
|
| --- a/media/base/fake_demuxer_stream.cc
|
| +++ b/media/base/fake_demuxer_stream.cc
|
| @@ -17,6 +17,7 @@
|
| #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"
|
| @@ -147,11 +148,13 @@ void FakeDemuxerStream::SeekToStart() {
|
|
|
| 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::kCipherModeAesCtr
|
| + : EncryptionScheme::kCipherModeUnencrypted);
|
| + 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);
|
| next_coded_size_.Enlarge(kWidthDelta, kHeightDelta);
|
| }
|
|
|
|
|