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}
diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc
index 2a37b64..6649b68 100644
--- a/media/filters/decrypting_audio_decoder_unittest.cc
+++ b/media/filters/decrypting_audio_decoder_unittest.cc
@@ -120,7 +120,7 @@
config_.Initialize(kCodecVorbis, kSampleFormatPlanarF32,
CHANNEL_LAYOUT_STEREO, kSampleRate, EmptyExtraData(),
- true, base::TimeDelta(), 0);
+ AesCtrEncryptionScheme(), base::TimeDelta(), 0);
InitializeAndExpectResult(config_, true);
}
@@ -286,7 +286,7 @@
TEST_F(DecryptingAudioDecoderTest, Initialize_UnencryptedAudioConfig) {
AudioDecoderConfig config(kCodecVorbis, kSampleFormatPlanarF32,
CHANNEL_LAYOUT_STEREO, kSampleRate,
- EmptyExtraData(), false);
+ EmptyExtraData(), Unencrypted());
InitializeAndExpectResult(config, false);
}
@@ -294,7 +294,8 @@
// Ensure decoder handles invalid audio configs without crashing.
TEST_F(DecryptingAudioDecoderTest, Initialize_InvalidAudioConfig) {
AudioDecoderConfig config(kUnknownAudioCodec, kUnknownSampleFormat,
- CHANNEL_LAYOUT_STEREO, 0, EmptyExtraData(), true);
+ CHANNEL_LAYOUT_STEREO, 0, EmptyExtraData(),
+ AesCtrEncryptionScheme());
InitializeAndExpectResult(config, false);
}
@@ -307,7 +308,7 @@
AudioDecoderConfig config(kCodecVorbis, kSampleFormatPlanarF32,
CHANNEL_LAYOUT_STEREO, kSampleRate,
- EmptyExtraData(), true);
+ EmptyExtraData(), AesCtrEncryptionScheme());
InitializeAndExpectResult(config, false);
}
@@ -315,7 +316,7 @@
SetCdmType(CDM_WITHOUT_DECRYPTOR);
AudioDecoderConfig config(kCodecVorbis, kSampleFormatPlanarF32,
CHANNEL_LAYOUT_STEREO, kSampleRate,
- EmptyExtraData(), true);
+ EmptyExtraData(), AesCtrEncryptionScheme());
InitializeAndExpectResult(config, false);
}
@@ -384,7 +385,7 @@
// channel layout and samples_per_second.
AudioDecoderConfig new_config(kCodecVorbis, kSampleFormatPlanarS16,
CHANNEL_LAYOUT_5_1, 88200, EmptyExtraData(),
- true);
+ AesCtrEncryptionScheme());
EXPECT_NE(new_config.bits_per_channel(), config_.bits_per_channel());
EXPECT_NE(new_config.channel_layout(), config_.channel_layout());
EXPECT_NE(new_config.samples_per_second(), config_.samples_per_second());