diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-20 22:22:11 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-20 22:22:11 +0000 |
| commit | 97c73d207cd65033def86f6b431f86537c95c7d1 (patch) | |
| tree | c73996259ae8fe275c892917b39dbffa2004b606 /media | |
| parent | 5da1aea20236cdf5ccdc937671d10e37640f1b58 (diff) | |
| download | chromium_src-97c73d207cd65033def86f6b431f86537c95c7d1.zip chromium_src-97c73d207cd65033def86f6b431f86537c95c7d1.tar.gz chromium_src-97c73d207cd65033def86f6b431f86537c95c7d1.tar.bz2 | |
Enable encrytped media tests for FFmpeg demuxer
The necessary FFmpeg roll has occurred (r200467).
BUG=189221,123426
Review URL: https://chromiumcodereview.appspot.com/15235003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/ffmpeg_demuxer_unittest.cc | 4 | ||||
| -rw-r--r-- | media/filters/pipeline_integration_test.cc | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc index 62ffffd..163ad98 100644 --- a/media/filters/ffmpeg_demuxer_unittest.cc +++ b/media/filters/ffmpeg_demuxer_unittest.cc @@ -294,9 +294,7 @@ TEST_F(FFmpegDemuxerTest, Initialize_Multitrack) { EXPECT_FALSE(demuxer_->GetStream(DemuxerStream::UNKNOWN)); } -// TODO(fgalligan): Enable test when code to parse encrypted WebM files lands -// in Chromium's FFmpeg. crbug.com/189221 -TEST_F(FFmpegDemuxerTest, DISABLED_Initialize_Encrypted) { +TEST_F(FFmpegDemuxerTest, Initialize_Encrypted) { EXPECT_CALL(*this, NeedKeyCBMock(kWebMEncryptInitDataType, NotNull(), DecryptConfig::kDecryptionKeySize)) .Times(Exactly(2)); diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc index 3b456a1..63a6892 100644 --- a/media/filters/pipeline_integration_test.cc +++ b/media/filters/pipeline_integration_test.cc @@ -431,9 +431,7 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) { EXPECT_EQ("-3.59,-2.06,-0.43,2.15,0.77,-0.95,", GetAudioHash()); } -// TODO(fgalligan): Enable test when code to parse encrypted WebM files lands -// in Chromium's FFmpeg. crbug.com/189221 -TEST_F(PipelineIntegrationTest, DISABLED_BasicPlaybackEncrypted) { +TEST_F(PipelineIntegrationTest, BasicPlaybackEncrypted) { FakeEncryptedMedia encrypted_media(new KeyProvidingApp()); set_need_key_cb(base::Bind(&FakeEncryptedMedia::NeedKey, base::Unretained(&encrypted_media))); |