Add m-esr52 at 52.6.0

1 files changed, 649 insertions, 0 deletions

diff --git a/dom/media/webaudio/MediaBufferDecoder.cpp b/dom/media/webaudio/MediaBufferDecoder.cpp
new file mode 100644
index 000000000..e9f1d5a47
--- /dev/null
+++ b/dom/media/webaudio/MediaBufferDecoder.cpp
@@ -0,0 +1,649 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "MediaBufferDecoder.h"
+#include "BufferDecoder.h"
+#include "mozilla/dom/AudioContextBinding.h"
+#include "mozilla/dom/ScriptSettings.h"
+#include <speex/speex_resampler.h>
+#include "nsXPCOMCIDInternal.h"
+#include "nsComponentManagerUtils.h"
+#include "MediaDecoderReader.h"
+#include "BufferMediaResource.h"
+#include "DecoderTraits.h"
+#include "AudioContext.h"
+#include "AudioBuffer.h"
+#include "nsContentUtils.h"
+#include "nsIScriptObjectPrincipal.h"
+#include "nsIScriptError.h"
+#include "nsMimeTypes.h"
+#include "VideoUtils.h"
+#include "WebAudioUtils.h"
+#include "mozilla/dom/Promise.h"
+#include "mozilla/Telemetry.h"
+#include "nsPrintfCString.h"
+#include "GMPService.h"
+
+namespace mozilla {
+
+extern LazyLogModule gMediaDecoderLog;
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(WebAudioDecodeJob)
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(WebAudioDecodeJob)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mContext)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mOutput)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mSuccessCallback)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mFailureCallback)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(WebAudioDecodeJob)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mContext)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOutput)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSuccessCallback)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFailureCallback)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(WebAudioDecodeJob)
+NS_IMPL_CYCLE_COLLECTION_TRACE_END
+NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(WebAudioDecodeJob, AddRef)
+NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(WebAudioDecodeJob, Release)
+
+using namespace dom;
+
+class ReportResultTask final : public Runnable
+{
+public:
+  ReportResultTask(WebAudioDecodeJob& aDecodeJob,
+                   WebAudioDecodeJob::ResultFn aFunction,
+                   WebAudioDecodeJob::ErrorCode aErrorCode)
+    : mDecodeJob(aDecodeJob)
+    , mFunction(aFunction)
+    , mErrorCode(aErrorCode)
+  {
+    MOZ_ASSERT(aFunction);
+  }
+
+  NS_IMETHOD Run() override
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    (mDecodeJob.*mFunction)(mErrorCode);
+
+    return NS_OK;
+  }
+
+private:
+  // Note that the mDecodeJob member will probably die when mFunction is run.
+  // Therefore, it is not safe to do anything fancy with it in this class.
+  // Really, this class is only used because nsRunnableMethod doesn't support
+  // methods accepting arguments.
+  WebAudioDecodeJob& mDecodeJob;
+  WebAudioDecodeJob::ResultFn mFunction;
+  WebAudioDecodeJob::ErrorCode mErrorCode;
+};
+
+enum class PhaseEnum : int
+{
+  Decode,
+  AllocateBuffer,
+  Done
+};
+
+class MediaDecodeTask final : public Runnable
+{
+public:
+  MediaDecodeTask(const char* aContentType, uint8_t* aBuffer,
+                  uint32_t aLength,
+                  WebAudioDecodeJob& aDecodeJob)
+    : mContentType(aContentType)
+    , mBuffer(aBuffer)
+    , mLength(aLength)
+    , mDecodeJob(aDecodeJob)
+    , mPhase(PhaseEnum::Decode)
+    , mFirstFrameDecoded(false)
+  {
+    MOZ_ASSERT(aBuffer);
+    MOZ_ASSERT(NS_IsMainThread());
+  }
+
+  NS_IMETHOD Run();
+  bool CreateReader();
+  MediaDecoderReader* Reader() { MOZ_ASSERT(mDecoderReader); return mDecoderReader; }
+
+private:
+  void ReportFailureOnMainThread(WebAudioDecodeJob::ErrorCode aErrorCode) {
+    if (NS_IsMainThread()) {
+      Cleanup();
+      mDecodeJob.OnFailure(aErrorCode);
+    } else {
+      // Take extra care to cleanup on the main thread
+      NS_DispatchToMainThread(NewRunnableMethod(this, &MediaDecodeTask::Cleanup));
+
+      nsCOMPtr<nsIRunnable> event =
+        new ReportResultTask(mDecodeJob, &WebAudioDecodeJob::OnFailure, aErrorCode);
+      NS_DispatchToMainThread(event);
+    }
+  }
+
+  void Decode();
+  void OnMetadataRead(MetadataHolder* aMetadata);
+  void OnMetadataNotRead(const MediaResult& aError);
+  void RequestSample();
+  void SampleDecoded(MediaData* aData);
+  void SampleNotDecoded(const MediaResult& aError);
+  void FinishDecode();
+  void AllocateBuffer();
+  void CallbackTheResult();
+
+  void Cleanup()
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    // MediaDecoderReader expects that BufferDecoder is alive.
+    // Destruct MediaDecoderReader first.
+    mDecoderReader = nullptr;
+    mBufferDecoder = nullptr;
+    JS_free(nullptr, mBuffer);
+  }
+
+private:
+  nsCString mContentType;
+  uint8_t* mBuffer;
+  uint32_t mLength;
+  WebAudioDecodeJob& mDecodeJob;
+  PhaseEnum mPhase;
+  RefPtr<BufferDecoder> mBufferDecoder;
+  RefPtr<MediaDecoderReader> mDecoderReader;
+  MediaInfo mMediaInfo;
+  MediaQueue<MediaData> mAudioQueue;
+  bool mFirstFrameDecoded;
+};
+
+NS_IMETHODIMP
+MediaDecodeTask::Run()
+{
+  MOZ_ASSERT(mBufferDecoder);
+  MOZ_ASSERT(mDecoderReader);
+  switch (mPhase) {
+  case PhaseEnum::Decode:
+    Decode();
+    break;
+  case PhaseEnum::AllocateBuffer:
+    AllocateBuffer();
+    break;
+  case PhaseEnum::Done:
+    break;
+  }
+
+  return NS_OK;
+}
+
+class BufferDecoderGMPCrashHelper : public GMPCrashHelper
+{
+public:
+  explicit BufferDecoderGMPCrashHelper(nsPIDOMWindowInner* aParent)
+    : mParent(do_GetWeakReference(aParent))
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+  }
+  already_AddRefed<nsPIDOMWindowInner> GetPluginCrashedEventTarget() override
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    nsCOMPtr<nsPIDOMWindowInner> window = do_QueryReferent(mParent);
+    return window.forget();
+  }
+private:
+  nsWeakPtr mParent;
+};
+
+bool
+MediaDecodeTask::CreateReader()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+
+  nsCOMPtr<nsIPrincipal> principal;
+  nsCOMPtr<nsIScriptObjectPrincipal> sop = do_QueryInterface(mDecodeJob.mContext->GetParentObject());
+  if (sop) {
+    principal = sop->GetPrincipal();
+  }
+
+  RefPtr<BufferMediaResource> resource =
+    new BufferMediaResource(static_cast<uint8_t*> (mBuffer),
+                            mLength, principal, mContentType);
+
+  MOZ_ASSERT(!mBufferDecoder);
+  mBufferDecoder = new BufferDecoder(resource,
+    new BufferDecoderGMPCrashHelper(mDecodeJob.mContext->GetParentObject()));
+
+  // If you change this list to add support for new decoders, please consider
+  // updating HTMLMediaElement::CreateDecoder as well.
+
+  mDecoderReader = DecoderTraits::CreateReader(mContentType, mBufferDecoder);
+
+  if (!mDecoderReader) {
+    return false;
+  }
+
+  nsresult rv = mDecoderReader->Init();
+  if (NS_FAILED(rv)) {
+    return false;
+  }
+
+  return true;
+}
+
+class AutoResampler final
+{
+public:
+  AutoResampler()
+    : mResampler(nullptr)
+  {}
+  ~AutoResampler()
+  {
+    if (mResampler) {
+      speex_resampler_destroy(mResampler);
+    }
+  }
+  operator SpeexResamplerState*() const
+  {
+    MOZ_ASSERT(mResampler);
+    return mResampler;
+  }
+  void operator=(SpeexResamplerState* aResampler)
+  {
+    mResampler = aResampler;
+  }
+
+private:
+  SpeexResamplerState* mResampler;
+};
+
+void
+MediaDecodeTask::Decode()
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+
+  mBufferDecoder->BeginDecoding(mDecoderReader->OwnerThread());
+
+  // Tell the decoder reader that we are not going to play the data directly,
+  // and that we should not reject files with more channels than the audio
+  // backend support.
+  mDecoderReader->SetIgnoreAudioOutputFormat();
+
+  mDecoderReader->AsyncReadMetadata()->Then(mDecoderReader->OwnerThread(), __func__, this,
+                                       &MediaDecodeTask::OnMetadataRead,
+                                       &MediaDecodeTask::OnMetadataNotRead);
+}
+
+void
+MediaDecodeTask::OnMetadataRead(MetadataHolder* aMetadata)
+{
+  mMediaInfo = aMetadata->mInfo;
+  if (!mMediaInfo.HasAudio()) {
+    mDecoderReader->Shutdown();
+    ReportFailureOnMainThread(WebAudioDecodeJob::NoAudio);
+    return;
+  }
+
+  nsCString codec;
+  if (!mMediaInfo.mAudio.GetAsAudioInfo()->mMimeType.IsEmpty()) {
+    codec = nsPrintfCString("webaudio; %s", mMediaInfo.mAudio.GetAsAudioInfo()->mMimeType.get());
+  } else {
+    codec = nsPrintfCString("webaudio;resource; %s", mContentType.get());
+  }
+
+  nsCOMPtr<nsIRunnable> task = NS_NewRunnableFunction([codec]() -> void {
+    MOZ_ASSERT(!codec.IsEmpty());
+    MOZ_LOG(gMediaDecoderLog,
+            LogLevel::Debug,
+            ("Telemetry (WebAudio) MEDIA_CODEC_USED= '%s'", codec.get()));
+    Telemetry::Accumulate(Telemetry::ID::MEDIA_CODEC_USED, codec);
+  });
+  AbstractThread::MainThread()->Dispatch(task.forget());
+
+  RequestSample();
+}
+
+void
+MediaDecodeTask::OnMetadataNotRead(const MediaResult& aReason)
+{
+  mDecoderReader->Shutdown();
+  ReportFailureOnMainThread(WebAudioDecodeJob::InvalidContent);
+}
+
+void
+MediaDecodeTask::RequestSample()
+{
+  mDecoderReader->RequestAudioData()->Then(mDecoderReader->OwnerThread(), __func__, this,
+                                           &MediaDecodeTask::SampleDecoded,
+                                           &MediaDecodeTask::SampleNotDecoded);
+}
+
+void
+MediaDecodeTask::SampleDecoded(MediaData* aData)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  mAudioQueue.Push(aData);
+  if (!mFirstFrameDecoded) {
+    mDecoderReader->ReadUpdatedMetadata(&mMediaInfo);
+    mFirstFrameDecoded = true;
+  }
+  RequestSample();
+}
+
+void
+MediaDecodeTask::SampleNotDecoded(const MediaResult& aError)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+  if (aError == NS_ERROR_DOM_MEDIA_END_OF_STREAM) {
+    FinishDecode();
+  } else {
+    mDecoderReader->Shutdown();
+    ReportFailureOnMainThread(WebAudioDecodeJob::InvalidContent);
+  }
+}
+
+void
+MediaDecodeTask::FinishDecode()
+{
+  mDecoderReader->Shutdown();
+
+  uint32_t frameCount = mAudioQueue.FrameCount();
+  uint32_t channelCount = mMediaInfo.mAudio.mChannels;
+  uint32_t sampleRate = mMediaInfo.mAudio.mRate;
+
+  if (!frameCount || !channelCount || !sampleRate) {
+    ReportFailureOnMainThread(WebAudioDecodeJob::InvalidContent);
+    return;
+  }
+
+  const uint32_t destSampleRate = mDecodeJob.mContext->SampleRate();
+  AutoResampler resampler;
+
+  uint32_t resampledFrames = frameCount;
+  if (sampleRate != destSampleRate) {
+    resampledFrames = static_cast<uint32_t>(
+        static_cast<uint64_t>(destSampleRate) *
+        static_cast<uint64_t>(frameCount) /
+        static_cast<uint64_t>(sampleRate)
+      );
+
+    resampler = speex_resampler_init(channelCount,
+                                     sampleRate,
+                                     destSampleRate,
+                                     SPEEX_RESAMPLER_QUALITY_DEFAULT, nullptr);
+    speex_resampler_skip_zeros(resampler);
+    resampledFrames += speex_resampler_get_output_latency(resampler);
+  }
+
+  // Allocate the channel buffers.  Note that if we end up resampling, we may
+  // write fewer bytes than mResampledFrames to the output buffer, in which
+  // case mWriteIndex will tell us how many valid samples we have.
+  mDecodeJob.mBuffer = ThreadSharedFloatArrayBufferList::
+    Create(channelCount, resampledFrames, fallible);
+  if (!mDecodeJob.mBuffer) {
+    ReportFailureOnMainThread(WebAudioDecodeJob::UnknownError);
+    return;
+  }
+
+  RefPtr<MediaData> mediaData;
+  while ((mediaData = mAudioQueue.PopFront())) {
+    RefPtr<AudioData> audioData = mediaData->As<AudioData>();
+    audioData->EnsureAudioBuffer(); // could lead to a copy :(
+    AudioDataValue* bufferData = static_cast<AudioDataValue*>
+      (audioData->mAudioBuffer->Data());
+
+    if (sampleRate != destSampleRate) {
+      const uint32_t maxOutSamples = resampledFrames - mDecodeJob.mWriteIndex;
+
+      for (uint32_t i = 0; i < audioData->mChannels; ++i) {
+        uint32_t inSamples = audioData->mFrames;
+        uint32_t outSamples = maxOutSamples;
+        float* outData =
+          mDecodeJob.mBuffer->GetDataForWrite(i) + mDecodeJob.mWriteIndex;
+
+        WebAudioUtils::SpeexResamplerProcess(
+            resampler, i, &bufferData[i * audioData->mFrames], &inSamples,
+            outData, &outSamples);
+
+        if (i == audioData->mChannels - 1) {
+          mDecodeJob.mWriteIndex += outSamples;
+          MOZ_ASSERT(mDecodeJob.mWriteIndex <= resampledFrames);
+          MOZ_ASSERT(inSamples == audioData->mFrames);
+        }
+      }
+    } else {
+      for (uint32_t i = 0; i < audioData->mChannels; ++i) {
+        float* outData =
+          mDecodeJob.mBuffer->GetDataForWrite(i) + mDecodeJob.mWriteIndex;
+        ConvertAudioSamples(&bufferData[i * audioData->mFrames],
+                            outData, audioData->mFrames);
+
+        if (i == audioData->mChannels - 1) {
+          mDecodeJob.mWriteIndex += audioData->mFrames;
+        }
+      }
+    }
+  }
+
+  if (sampleRate != destSampleRate) {
+    uint32_t inputLatency = speex_resampler_get_input_latency(resampler);
+    const uint32_t maxOutSamples = resampledFrames - mDecodeJob.mWriteIndex;
+    for (uint32_t i = 0; i < channelCount; ++i) {
+      uint32_t inSamples = inputLatency;
+      uint32_t outSamples = maxOutSamples;
+      float* outData =
+        mDecodeJob.mBuffer->GetDataForWrite(i) + mDecodeJob.mWriteIndex;
+
+      WebAudioUtils::SpeexResamplerProcess(
+          resampler, i, (AudioDataValue*)nullptr, &inSamples,
+          outData, &outSamples);
+
+      if (i == channelCount - 1) {
+        mDecodeJob.mWriteIndex += outSamples;
+        MOZ_ASSERT(mDecodeJob.mWriteIndex <= resampledFrames);
+        MOZ_ASSERT(inSamples == inputLatency);
+      }
+    }
+  }
+
+  mPhase = PhaseEnum::AllocateBuffer;
+  NS_DispatchToMainThread(this);
+}
+
+void
+MediaDecodeTask::AllocateBuffer()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (!mDecodeJob.AllocateBuffer()) {
+    ReportFailureOnMainThread(WebAudioDecodeJob::UnknownError);
+    return;
+  }
+
+  mPhase = PhaseEnum::Done;
+  CallbackTheResult();
+}
+
+void
+MediaDecodeTask::CallbackTheResult()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  Cleanup();
+
+  // Now, we're ready to call the script back with the resulting buffer
+  mDecodeJob.OnSuccess(WebAudioDecodeJob::NoError);
+}
+
+bool
+WebAudioDecodeJob::AllocateBuffer()
+{
+  MOZ_ASSERT(!mOutput);
+  MOZ_ASSERT(NS_IsMainThread());
+
+  // Now create the AudioBuffer
+  ErrorResult rv;
+  uint32_t channelCount = mBuffer->GetChannels();
+  mOutput = AudioBuffer::Create(mContext, channelCount,
+                                mWriteIndex, mContext->SampleRate(),
+                                mBuffer.forget(), rv);
+  return !rv.Failed();
+}
+
+void
+AsyncDecodeWebAudio(const char* aContentType, uint8_t* aBuffer,
+                    uint32_t aLength, WebAudioDecodeJob& aDecodeJob)
+{
+  // Do not attempt to decode the media if we were not successful at sniffing
+  // the content type.
+  if (!*aContentType ||
+      strcmp(aContentType, APPLICATION_OCTET_STREAM) == 0) {
+    nsCOMPtr<nsIRunnable> event =
+      new ReportResultTask(aDecodeJob,
+                           &WebAudioDecodeJob::OnFailure,
+                           WebAudioDecodeJob::UnknownContent);
+    JS_free(nullptr, aBuffer);
+    NS_DispatchToMainThread(event);
+    return;
+  }
+
+  RefPtr<MediaDecodeTask> task =
+    new MediaDecodeTask(aContentType, aBuffer, aLength, aDecodeJob);
+  if (!task->CreateReader()) {
+    nsCOMPtr<nsIRunnable> event =
+      new ReportResultTask(aDecodeJob,
+                           &WebAudioDecodeJob::OnFailure,
+                           WebAudioDecodeJob::UnknownError);
+    NS_DispatchToMainThread(event);
+  } else {
+    // If we did this without a temporary:
+    //   task->Reader()->OwnerThread()->Dispatch(task.forget())
+    // we might evaluate the task.forget() before calling Reader(). Enforce
+    // a non-crashy order-of-operations.
+    TaskQueue* taskQueue = task->Reader()->OwnerThread();
+    taskQueue->Dispatch(task.forget());
+  }
+}
+
+WebAudioDecodeJob::WebAudioDecodeJob(const nsACString& aContentType,
+                                     AudioContext* aContext,
+                                     Promise* aPromise,
+                                     DecodeSuccessCallback* aSuccessCallback,
+                                     DecodeErrorCallback* aFailureCallback)
+  : mContentType(aContentType)
+  , mWriteIndex(0)
+  , mContext(aContext)
+  , mPromise(aPromise)
+  , mSuccessCallback(aSuccessCallback)
+  , mFailureCallback(aFailureCallback)
+{
+  MOZ_ASSERT(aContext);
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_COUNT_CTOR(WebAudioDecodeJob);
+}
+
+WebAudioDecodeJob::~WebAudioDecodeJob()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_COUNT_DTOR(WebAudioDecodeJob);
+}
+
+void
+WebAudioDecodeJob::OnSuccess(ErrorCode aErrorCode)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(aErrorCode == NoError);
+
+  if (mSuccessCallback) {
+    ErrorResult rv;
+    mSuccessCallback->Call(*mOutput, rv);
+    // Ignore errors in calling the callback, since there is not much that we can
+    // do about it here.
+    rv.SuppressException();
+  }
+  mPromise->MaybeResolve(mOutput);
+
+  mContext->RemoveFromDecodeQueue(this);
+
+}
+
+void
+WebAudioDecodeJob::OnFailure(ErrorCode aErrorCode)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  const char* errorMessage;
+  switch (aErrorCode) {
+  case NoError:
+    MOZ_FALLTHROUGH_ASSERT("Who passed NoError to OnFailure?");
+    // Fall through to get some sort of a sane error message if this actually
+    // happens at runtime.
+  case UnknownError:
+    errorMessage = "MediaDecodeAudioDataUnknownError";
+    break;
+  case UnknownContent:
+    errorMessage = "MediaDecodeAudioDataUnknownContentType";
+    break;
+  case InvalidContent:
+    errorMessage = "MediaDecodeAudioDataInvalidContent";
+    break;
+  case NoAudio:
+    errorMessage = "MediaDecodeAudioDataNoAudio";
+    break;
+  }
+
+  nsIDocument* doc = nullptr;
+  if (nsPIDOMWindowInner* pWindow = mContext->GetParentObject()) {
+    doc = pWindow->GetExtantDoc();
+  }
+  nsContentUtils::ReportToConsole(nsIScriptError::errorFlag,
+                                  NS_LITERAL_CSTRING("Media"),
+                                  doc,
+                                  nsContentUtils::eDOM_PROPERTIES,
+                                  errorMessage);
+
+  // Ignore errors in calling the callback, since there is not much that we can
+  // do about it here.
+  if (mFailureCallback) {
+    mFailureCallback->Call();
+  }
+
+  mPromise->MaybeReject(NS_ERROR_DOM_ENCODING_NOT_SUPPORTED_ERR);
+
+  mContext->RemoveFromDecodeQueue(this);
+}
+
+size_t
+WebAudioDecodeJob::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
+{
+  size_t amount = 0;
+  amount += mContentType.SizeOfExcludingThisIfUnshared(aMallocSizeOf);
+  if (mSuccessCallback) {
+    amount += mSuccessCallback->SizeOfIncludingThis(aMallocSizeOf);
+  }
+  if (mFailureCallback) {
+    amount += mFailureCallback->SizeOfIncludingThis(aMallocSizeOf);
+  }
+  if (mOutput) {
+    amount += mOutput->SizeOfIncludingThis(aMallocSizeOf);
+  }
+  if (mBuffer) {
+    amount += mBuffer->SizeOfIncludingThis(aMallocSizeOf);
+  }
+  return amount;
+}
+
+size_t
+WebAudioDecodeJob::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
+{
+  return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
+}
+
+} // namespace mozilla
+