Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1152)

Unified Diff: media/test/pipeline_integration_test.cc

Issue 2320043005: Read directly from 'senc' box when 'senc' box is present (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index a979e7a4044cce46ced754942b6cff1b4da33fa4..2e3f814baa20879294044d4e0a95867710f61fc8 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -1953,6 +1953,23 @@ TEST_F(PipelineIntegrationTest,
}
TEST_F(PipelineIntegrationTest,
+ MAYBE_EME(EncryptedPlayback_MP4_CENC_SENC_NO_SAIO_Video)) {
xhwang 2016/10/07 18:31:27 Could you please add more comments here or in the
+ MockMediaSource source("bear-640x360-v_frag-cenc-senc-no-saio.mp4", kMP4Video,
+ kAppendWholeFile);
+ FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
+ EXPECT_EQ(PIPELINE_OK,
+ StartPipelineWithEncryptedMedia(&source, &encrypted_media));
+
+ source.EndOfStream();
+
+ Play();
+
+ ASSERT_TRUE(WaitUntilOnEnded());
+ source.Shutdown();
+ Stop();
+}
+
+TEST_F(PipelineIntegrationTest,
MAYBE_EME(EncryptedPlayback_MP4_CENC_KeyRotation_Video)) {
MockMediaSource source("bear-1280x720-v_frag-cenc-key_rotation.mp4",
kMP4Video, kAppendWholeFile);

Powered by Google App Engine
This is Rietveld 408576698