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

Unified Diff: media/test/pipeline_integration_test.cc

Issue 2320043005: Read directly from 'senc' box when 'senc' box is present (Closed)
Patch Set: git cl format Created 4 years, 2 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
« no previous file with comments | « media/test/data/bear-640x360-v_frag-cenc-senc-no-saiz-saio.mp4 ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..ed4bb08e0f23f85f9dadf0547bf8080808227c07 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -1952,6 +1952,28 @@ TEST_F(PipelineIntegrationTest,
Stop();
}
+// 'SAIZ' and 'SAIO' boxes contain redundant information which is already
+// available in 'SENC' box. Although 'SAIZ' and 'SAIO' boxes are required per
+// CENC spec for backward compatibility reasons, but we do not use the two
+// boxes if 'SENC' box is present, so the code should work even if the two
+// boxes are not present.
+TEST_F(PipelineIntegrationTest,
+ MAYBE_EME(EncryptedPlayback_MP4_CENC_SENC_NO_SAIZ_SAIO_Video)) {
+ MockMediaSource source("bear-640x360-v_frag-cenc-senc-no-saiz-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",
« no previous file with comments | « media/test/data/bear-640x360-v_frag-cenc-senc-no-saiz-saio.mp4 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698