widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 66cadaa9 to master

Browse Source 
Change-Id: I2a052d56516f0e246d77148a38191430ff139c3e
This commit is contained in:
Jeff Tinker
2014-03-29 12:33:46 -07:00
parent f23c54d834 66cadaa9fa
commit 55f1de2fe5
16 changed files with 107 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/test/unit/WVDrmFactory_test.cpp
View File

@@ -46,14 +46,14 @@ TEST(WVDrmFactoryTest, SupportsSupportedContainerFormats) {
EXPECT_TRUE(factory.isContentTypeSupported(String8("video/mp4"))) <<
"WVPluginFactory does not support ISO-BMFF";
EXPECT_TRUE(factory.isContentTypeSupported(String8("video/webm"))) <<
"WVPluginFactory does not support WebM";
}
TEST(WVDrmFactoryTest, DoesNotSupportUnsupportedContainerFormats) {
WVDrmFactory factory;
EXPECT_FALSE(factory.isContentTypeSupported(String8("video/webm"))) <<
"WVPluginFactory incorrectly claims to support Web-M";
// Taken from Encoding.com's list of the most common internet video MIME-types
EXPECT_FALSE(factory.isContentTypeSupported(String8("video/x-matroska"))) <<
"WVPluginFactory incorrectly claims to support Matroska";