Bug 1329543 - Amend comment in EMEDecoderModule to not mention Adobe. r=gerald draft
authorChris Pearce <cpearce@mozilla.com>
Sat, 14 Jan 2017 16:57:26 +0800
changeset 462837 8fe87d0064c0bf3d9651f78d86d9da760bf278af
parent 462836 f1aa42bbb8e55b97cac88295ba54780378ba8dfa
child 462838 372bc7f4771ec0268535e3df2a745bc9fae8bd3b
push id41860
push userbmo:cpearce@mozilla.com
push dateWed, 18 Jan 2017 00:45:46 +0000
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());