Bug 1329543 - Amend comment in EMEDecoderModule to not mention Adobe. r=gerald
authorChris Pearce <cpearce@mozilla.com>
Sat, 14 Jan 2017 16:57:26 +0800
changeset 357875 7ab977888d473b8da3e1e18081339067a987c5be
parent 357874 943f58381a5f2916b86fd8242b4622370925f88e
child 357876 3554535605776dcbcbe561c934c28135838188ae
push id10621
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 16:02:43 +0000
treeherdermozilla-aurora@dca7b42e6c67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerald
bugs1329543
milestone53.0a1
Bug 1329543 - Amend comment in EMEDecoderModule to not mention Adobe. r=gerald MozReview-Commit-ID: IB5aSWwjF8I
dom/media/platforms/agnostic/eme/EMEDecoderModule.cpp
--- a/dom/media/platforms/agnostic/eme/EMEDecoderModule.cpp
+++ b/dom/media/platforms/agnostic/eme/EMEDecoderModule.cpp
@@ -94,21 +94,17 @@ public:
     } else if (aDecrypted.mStatus != Ok) {
       if (mCallback) {
         mCallback->Error(MediaResult(
           NS_ERROR_DOM_MEDIA_FATAL_ERR,
           RESULT_DETAIL("decrypted.mStatus=%u", uint32_t(aDecrypted.mStatus))));
       }
     } else {
       MOZ_ASSERT(!mIsShutdown);
-      // The Adobe GMP AAC decoder gets confused if we pass it non-encrypted
-      // samples with valid crypto data. So clear the crypto data, since the
-      // sample should be decrypted now anyway. If we don't do this and we're
-      // using the Adobe GMP for unencrypted decoding of data that is decrypted
-      // by gmp-clearkey, decoding will fail.
+      // The sample is no longer encrypted, so clear its crypto metadata.
       UniquePtr<MediaRawDataWriter> writer(aDecrypted.mSample->CreateWriter());
       writer->mCrypto = CryptoSample();
       mDecoder->Input(aDecrypted.mSample);
     }
   }
 
   void Flush() override {
     MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());