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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/media/media_canplaytype_browsertest.cc

Issue 1624703002: Implement support for vp9 in ISO-BMFF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a flag ENABLE_MP4_VP8_VP9_DEMUXING for this change. Created 4 years, 11 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 | « chrome/renderer/media/chrome_key_systems.cc ('k') | media/BUILD.gn » ('j') | media/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/media_canplaytype_browsertest.cc
diff --git a/content/browser/media/media_canplaytype_browsertest.cc b/content/browser/media/media_canplaytype_browsertest.cc
index 83493ccc317e55bfa32469eddf24d5ab49aa6550..1d2b115b261eed8cf42e4f49fb5dbbbac58d8669 100644
--- a/content/browser/media/media_canplaytype_browsertest.cc
+++ b/content/browser/media/media_canplaytype_browsertest.cc
@@ -69,6 +69,12 @@ const char* kMp2tsAc3Eac3Probably = kPropProbably;
const char* kMp2tsAc3Eac3Probably = kNot;
#endif
+#if BUILDFLAG(ENABLE_MP4_VP8_VP9_DEMUXING)
+const char* kMp4Vp8Vp9Probably = kPropProbably;
+#else
+const char* kMp4Vp8Vp9Probably = kNot;
+#endif
+
namespace content {
class MediaCanPlayTypeTest : public MediaBrowserTest {
@@ -304,6 +310,11 @@ class MediaCanPlayTypeTest : public MediaBrowserTest {
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vp8, opus\"'"));
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vp8, vorbis\"'"));
+ EXPECT_EQ(kNot,
+ CanPlay("'" + mime + "; codecs=\"vp08.00.00.08.00.00.00.00\"'"));
+ EXPECT_EQ(kNot,
+ CanPlay("'" + mime + "; codecs=\"vp09.01.01.08.02.01.01.00\"'"));
+
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vp9\"'"));
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vp9.0\"'"));
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vp9, opus\"'"));
@@ -359,6 +370,11 @@ class MediaCanPlayTypeTest : public MediaBrowserTest {
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vp8.0, 1\"'"));
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vp9.0, 1\"'"));
+ EXPECT_EQ(kNot,
+ CanPlay("'" + mime + "; codecs=\"vp08.00.00.08.00.00.00.00\"'"));
+ EXPECT_EQ(kNot,
+ CanPlay("'" + mime + "; codecs=\"vp09.01.01.08.02.01.01.00\"'"));
ddorwin 2016/02/25 00:27:47 Should we be supporting this or other new strings
kqyang 2016/03/01 01:18:51 I like this idea. Keep it as not supported for now
+
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"theora\"'"));
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"theora, vorbis\"'"));
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"theora, opus\"'"));
@@ -410,6 +426,11 @@ class MediaCanPlayTypeTest : public MediaBrowserTest {
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vp8.0, 1\"'"));
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vp9.0, 1\"'"));
+ EXPECT_EQ(kNot,
+ CanPlay("'" + mime + "; codecs=\"vp08.00.00.08.00.00.00.00\"'"));
+ EXPECT_EQ(kNot,
+ CanPlay("'" + mime + "; codecs=\"vp09.01.01.08.02.01.01.00\"'"));
+
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vorbis\"'"));
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"opus\"'"));
EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"theora\"'"));
@@ -690,6 +711,11 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
EXPECT_EQ(kHevcSupported,
CanPlay("'video/mp4; codecs=\"hvc1.1.6.L93.B0, mp4a.40.5\"'"));
+ EXPECT_EQ(kMp4Vp8Vp9Probably,
+ CanPlay("'video/mp4; codecs=\"vp08.00.00.08.00.00.00.00\"'"));
+ EXPECT_EQ(kMp4Vp8Vp9Probably,
+ CanPlay("'video/mp4; codecs=\"vp09.01.01.08.02.01.01.00\"'"));
+
TestMPEGUnacceptableCombinations("video/mp4");
EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v'"));
@@ -746,6 +772,11 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
EXPECT_EQ(kHevcSupported,
CanPlay("'video/x-m4v; codecs=\"hvc1.1.6.L93.B0, mp4a.40.5\"'"));
+ EXPECT_EQ(kMp4Vp8Vp9Probably,
+ CanPlay("'video/x-m4v; codecs=\"vp08.00.00.08.00.00.00.00\"'"));
ddorwin 2016/02/24 22:44:32 I wonder if we should *not* allow new codecs with
ddorwin 2016/02/25 00:27:47 I filed https://bugs.chromium.org/p/chromium/issue
kqyang 2016/03/01 01:18:51 Test removed. As discussed offline, I won't do any
ddorwin 2016/03/02 00:58:21 Keep the test. We should test all of the cases. Yo
kqyang 2016/03/10 01:16:27 Done.
+ EXPECT_EQ(kMp4Vp8Vp9Probably,
+ CanPlay("'video/x-m4v; codecs=\"vp09.01.01.08.02.01.01.00\"'"));
+
EXPECT_EQ(kAc3Eac3Probably, CanPlay("'video/x-m4v; codecs=\"ac-3\"'"));
EXPECT_EQ(kAc3Eac3Probably, CanPlay("'video/x-m4v; codecs=\"mp4a.a5\"'"));
EXPECT_EQ(kAc3Eac3Probably, CanPlay("'video/x-m4v; codecs=\"mp4a.A5\"'"));
@@ -789,6 +820,9 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"hev1.1.6.L93.B0,mp4a.40.5\"'"));
EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"hvc1.1.6.L93.B0,mp4a.40.5\"'"));
+ EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"vp08.00.00.08.00.00.00.00\"'"));
+ EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"vp09.01.01.08.02.01.01.00\"'"));
+
EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"ac-3\"'"));
EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.a5\"'"));
EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.A5\"'"));
@@ -822,6 +856,11 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
EXPECT_EQ(kNot,
CanPlay("'audio/x-m4a; codecs=\"hvc1.1.6.L93.B0, mp4a.40.5\"'"));
+ EXPECT_EQ(kNot,
+ CanPlay("'audio/x-m4a; codecs=\"vp08.00.00.08.00.00.00.00\"'"));
+ EXPECT_EQ(kNot,
+ CanPlay("'audio/x-m4a; codecs=\"vp09.01.01.08.02.01.01.00\"'"));
+
EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/x-m4a; codecs=\"ac-3\"'"));
EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/x-m4a; codecs=\"mp4a.a5\"'"));
EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/x-m4a; codecs=\"mp4a.A5\"'"));
@@ -1061,6 +1100,34 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_AvcLevels) {
EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.42E052\"'"));
}
+IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_Mp4VpxVariants) {
+ // Malformed codecs string.
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"vp09.00.-1.08\"'"));
+
+ // Codecs strings with missing fields.
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"vp08\"'"));
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"vp08.00.01.08\"'"));
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"vp09\"'"));
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"vp09.00.01.08\"'"));
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"vp09.01.01..02.01.01.00\"'"));
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"vp09.01.01.08.05.01.01\"'"));
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"vp09.04\"'"));
+
+ // Unexpected bit depth.
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"vp09.01.01.09.02.01.01.00\"'"));
+ // Unexpected chroma subsampling.
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"vp09.01.01.08.04.04.00.00\"'"));
+ // Unexpected transfer function.
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"vp09.01.01.08.04.03.02.00\"'"));
+
+ EXPECT_EQ(kMp4Vp8Vp9Probably,
+ CanPlay("'video/mp4; codecs=\"vp08.00.00.08.00.00.00.00\"'"));
+ EXPECT_EQ(kMp4Vp8Vp9Probably,
+ CanPlay("'video/mp4; codecs=\"vp09.01.01.08.02.01.01.00\"'"));
+ EXPECT_EQ(kMp4Vp8Vp9Probably,
+ CanPlay("'video/mp4; codecs=\"vp09.01.01.08.04.03.00.00\"'"));
+}
+
// TODO(servolk): Add extensive tests for various HEVC profiles, levels and
// tiers, similar to avc1/avc3 tests above, after proper HEVC codec id parsing
// is implemented (crbug.com/482761)
« no previous file with comments | « chrome/renderer/media/chrome_key_systems.cc ('k') | media/BUILD.gn » ('j') | media/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698