Bug 1159300 - Change GMP RemoveAndDeleteDeferredInUse test to ask for an EME plugin. r=edwin
authorChris Pearce <cpearce@mozilla.com>
Thu, 30 Apr 2015 21:13:48 +1200
changeset 241779 a7da86419656e127226f53e302c82bf3ed23e563
parent 241778 491bcd3dba9fd637ed821ed3620d3a2dcf027ad4
child 241780 2a4864545b47eb36c526408cded4c79eff399bcd
push id28669
push userryanvm@gmail.com
push dateThu, 30 Apr 2015 17:57:05 +0000
treeherdermozilla-central@7723b15ea695 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersedwin
bugs1159300
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1159300 - Change GMP RemoveAndDeleteDeferredInUse test to ask for an EME plugin. r=edwin
dom/media/gmp-plugin/fake.info
dom/media/gtest/TestGMPRemoveAndDelete.cpp
--- a/dom/media/gmp-plugin/fake.info
+++ b/dom/media/gmp-plugin/fake.info
@@ -1,5 +1,5 @@
 Name: fake
 Description: Fake GMP Plugin
 Version: 1.0
-APIs: encode-video[h264], decode-video[h264], eme-decrypt-v7[fake]
+APIs: encode-video[h264:fake], decode-video[h264:fake], eme-decrypt-v7[fake]
 Libraries: dxva2.dll
--- a/dom/media/gtest/TestGMPRemoveAndDelete.cpp
+++ b/dom/media/gtest/TestGMPRemoveAndDelete.cpp
@@ -270,16 +270,17 @@ GMPRemoveTest::CreateVideoDecoder(nsCStr
 
 void
 GMPRemoveTest::gmp_GetVideoDecoder(nsCString aNodeId,
                                    GMPVideoDecoderProxy** aOutDecoder,
                                    GMPVideoHost** aOutHost)
 {
   nsTArray<nsCString> tags;
   tags.AppendElement(NS_LITERAL_CSTRING("h264"));
+  tags.AppendElement(NS_LITERAL_CSTRING("fake"));
 
   class Callback : public GetGMPVideoDecoderCallback
   {
   public:
     Callback(GMPTestMonitor* aMonitor, GMPVideoDecoderProxy** aDecoder, GMPVideoHost** aHost)
       : mMonitor(aMonitor), mDecoder(aDecoder), mHost(aHost) { }
     virtual void Done(GMPVideoDecoderProxy* aDecoder, GMPVideoHost* aHost) override {
       *mDecoder = aDecoder;