diff options
| author | dougsteed <dougsteed@chromium.org> | 2016-03-11 16:04:30 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-12 00:05:22 +0000 |
| commit | 8d5275f7bbb6f79c83829a7931f1500128ef3f8f (patch) | |
| tree | 06d53aa908b22da47f819afbf815aa941f709ef9 /media/base/fake_demuxer_stream.cc | |
| parent | c5bf1a9a84aadcf927f94e806f4647d65e3da2c1 (diff) | |
| download | chromium_src-8d5275f7bbb6f79c83829a7931f1500128ef3f8f.zip chromium_src-8d5275f7bbb6f79c83829a7931f1500128ef3f8f.tar.gz chromium_src-8d5275f7bbb6f79c83829a7931f1500128ef3f8f.tar.bz2 | |
media config: expand is_encrypted to a struct.
Provide more complete encryption metadata, rather than
just a bool. EncryptionScheme also allows specification
of the mode and the pattern, as will be allowed by
CENC (ISO's Common Encryption standard), 3rd Edition.
BUG=568326
Committed: https://crrev.com/c9d2206c62f65e29b141e08df2b2dcb88f54162f
Cr-Commit-Position: refs/heads/master@{#380710}
Review URL: https://codereview.chromium.org/1490613005
Cr-Commit-Position: refs/heads/master@{#380791}
Diffstat (limited to 'media/base/fake_demuxer_stream.cc')
| -rw-r--r-- | media/base/fake_demuxer_stream.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/base/fake_demuxer_stream.cc b/media/base/fake_demuxer_stream.cc index 267b3e5..7ed5841 100644 --- a/media/base/fake_demuxer_stream.cc +++ b/media/base/fake_demuxer_stream.cc @@ -147,11 +147,11 @@ 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_); + 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_ ? AesCtrEncryptionScheme() : Unencrypted()); next_coded_size_.Enlarge(kWidthDelta, kHeightDelta); } |