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

Unified Diff: chrome/browser/media/encrypted_media_browsertest.cc

Issue 2495193004: Refactor VP9 codec string parsing (Closed)
Patch Set: Add a comment to check |level_idc|. Created 4 years 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 | « no previous file | content/browser/media/media_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/encrypted_media_browsertest.cc
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index e76f0d8c342d5e70d3d22dd6668d0576d30e5793..d3ece5603c5aad24ebe88bec7d28226f80a08e8c 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -19,6 +19,7 @@
#include "chrome/test/base/test_launcher_utils.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
+#include "media/base/media_switches.h"
#include "ppapi/features/features.h"
#include "testing/gtest/include/gtest/gtest-spi.h"
@@ -66,6 +67,8 @@ const char kWebMVP9VideoOnly[] = "video/webm; codecs=\"vp9\"";
#if defined(USE_PROPRIETARY_CODECS)
const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\"";
const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D000C\"";
+const char kMP4VideoVp9Only[] =
+ "video/mp4; codecs=\"vp09.00.01.08.02.01.01.00\"";
#endif // defined(USE_PROPRIETARY_CODECS)
// Sessions to load.
@@ -242,6 +245,7 @@ class EncryptedMediaTestBase : public MediaBrowserTest {
void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(
switches::kDisableGestureRequirementForMediaPlayback);
+ command_line->AppendSwitch(switches::kEnableVp9InMp4);
}
#if BUILDFLAG(ENABLE_PEPPER_CDMS)
@@ -549,6 +553,15 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_MP4) {
TestSimplePlayback("bear-640x360-a_frag-cenc.mp4", kMP4AudioOnly);
}
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_MP4_VP9) {
+ // MP4 without MSE is not support yet, http://crbug.com/170793.
+ if (CurrentSourceType() != MSE) {
+ DVLOG(0) << "Skipping test; Can only play MP4 encrypted streams by MSE.";
+ return;
+ }
+ TestSimplePlayback("bear-320x240-v_frag-vp9-cenc.mp4", kMP4VideoVp9Only);
+}
+
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
Playback_EncryptedVideo_MP4_ClearAudio_WEBM) {
// MP4 without MSE is not support yet, http://crbug.com/170793.
« no previous file with comments | « no previous file | content/browser/media/media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698