Enable WebM encrypted playback test.

- bear-320x240-encrypted.webm was updated to match the
decryption code in
http://codereview.chromium.org/10824136/.

BUG=138261
TEST=media_unittests

Review URL: https://chromiumcodereview.appspot.com/10826131

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150173 0039d316-1c4b-4281-b951-d872f2087c98
parent 30080048
......@@ -19,8 +19,8 @@ static const uint8 kInitData[] = { 0x69, 0x6e, 0x69, 0x74 };
// Key used to encrypt video track in test file "bear-320x240-encrypted.webm".
static const uint8 kSecretKey[] = {
0xfb, 0x67, 0x8a, 0x91, 0x19, 0x12, 0x7b, 0x6b,
0x0b, 0x63, 0x11, 0xf8, 0x6f, 0xe1, 0xc4, 0x2d
0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,
0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c
};
// Helper class that emulates calls made on the ChunkDemuxer by the
......@@ -288,10 +288,8 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) {
ASSERT_TRUE(WaitUntilOnEnded());
}
// TODO(fgalligan): Enable test when encrypted test data is updated and new
// decryption code is landed. http://crbug.com/132801
TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback) {
MockMediaSource source("bear-320x240-encrypted.webm", 220730, true, true);
TEST_F(PipelineIntegrationTest, EncryptedPlayback) {
MockMediaSource source("bear-320x240-encrypted.webm", 220788, true, true);
FakeDecryptorClient encrypted_media;
StartPipelineWithEncryptedMedia(&source, &encrypted_media);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment