diff -r 000000000000 -r 6474c204b198 content/media/fmp4/BlankDecoderModule.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/content/media/fmp4/BlankDecoderModule.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,249 @@
+/* -*- 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 "MediaDecoderReader.h"
+#include "PlatformDecoderModule.h"
+#include "nsRect.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/CheckedInt.h"
+#include "VideoUtils.h"
+#include "ImageContainer.h"
+#include "mp4_demuxer/mp4_demuxer.h"
+#include "MediaTaskQueue.h"
+
+namespace mozilla {
+
+// Decoder that uses a passed in object's Create function to create blank
+// MediaData objects.
+template<class BlankMediaDataCreator>
+class BlankMediaDataDecoder : public MediaDataDecoder {
+public:
+
+  BlankMediaDataDecoder(BlankMediaDataCreator* aCreator,
+                        MediaTaskQueue* aTaskQueue,
+                        MediaDataDecoderCallback* aCallback)
+    : mCreator(aCreator)
+    , mTaskQueue(aTaskQueue)
+    , mCallback(aCallback)
+  {
+  }
+
+  virtual nsresult Init() MOZ_OVERRIDE {
+    return NS_OK;
+  }
+
+  virtual nsresult Shutdown() MOZ_OVERRIDE {
+    return NS_OK;
+  }
+
+  class OutputEvent : public nsRunnable {
+  public:
+    OutputEvent(mp4_demuxer::MP4Sample* aSample,
+                MediaDataDecoderCallback* aCallback,
+                BlankMediaDataCreator* aCreator)
+      : mSample(aSample)
+      , mCreator(aCreator)
+      , mCallback(aCallback)
+    {
+    }
+    NS_IMETHOD Run() MOZ_OVERRIDE
+    {
+      mCallback->Output(mCreator->Create(mSample->composition_timestamp,
+                                         mSample->duration,
+                                         mSample->byte_offset));
+      return NS_OK;
+    }
+  private:
+    nsAutoPtr<mp4_demuxer::MP4Sample> mSample;
+    BlankMediaDataCreator* mCreator;
+    MediaDataDecoderCallback* mCallback;
+  };
+
+  virtual nsresult Input(mp4_demuxer::MP4Sample* aSample) MOZ_OVERRIDE
+  {
+    // The MediaDataDecoder must delete the sample when we're finished
+    // with it, so the OutputEvent stores it in an nsAutoPtr and deletes
+    // it once it's run.
+    RefPtr<nsIRunnable> r(new OutputEvent(aSample, mCallback, mCreator));
+    mTaskQueue->Dispatch(r);
+    return NS_OK;
+  }
+
+  virtual nsresult Flush() MOZ_OVERRIDE {
+    return NS_OK;
+  }
+
+  virtual nsresult Drain() MOZ_OVERRIDE {
+    return NS_OK;
+  }
+
+private:
+  nsAutoPtr<BlankMediaDataCreator> mCreator;
+  nsAutoPtr<MediaData> mOutput;
+  RefPtr<MediaTaskQueue> mTaskQueue;
+  MediaDataDecoderCallback* mCallback;
+};
+
+class BlankVideoDataCreator {
+public:
+  BlankVideoDataCreator(uint32_t aFrameWidth,
+                        uint32_t aFrameHeight,
+                        layers::ImageContainer* aImageContainer)
+    : mFrameWidth(aFrameWidth)
+    , mFrameHeight(aFrameHeight)
+    , mImageContainer(aImageContainer)
+  {
+    mInfo.mDisplay = nsIntSize(mFrameWidth, mFrameHeight);
+    mPicture = gfx::IntRect(0, 0, mFrameWidth, mFrameHeight);
+  }
+
+  MediaData* Create(Microseconds aDTS,
+                    Microseconds aDuration,
+                    int64_t aOffsetInStream)
+  {
+    // Create a fake YUV buffer in a 420 format. That is, an 8bpp Y plane,
+    // with a U and V plane that are half the size of the Y plane, i.e 8 bit,
+    // 2x2 subsampled. Have the data pointers of each frame point to the
+    // first plane, they'll always be zero'd memory anyway.
+    uint8_t* frame = new uint8_t[mFrameWidth * mFrameHeight];
+    memset(frame, 0, mFrameWidth * mFrameHeight);
+    VideoData::YCbCrBuffer buffer;
+
+    // Y plane.
+    buffer.mPlanes[0].mData = frame;
+    buffer.mPlanes[0].mStride = mFrameWidth;
+    buffer.mPlanes[0].mHeight = mFrameHeight;
+    buffer.mPlanes[0].mWidth = mFrameWidth;
+    buffer.mPlanes[0].mOffset = 0;
+    buffer.mPlanes[0].mSkip = 0;
+
+    // Cb plane.
+    buffer.mPlanes[1].mData = frame;
+    buffer.mPlanes[1].mStride = mFrameWidth / 2;
+    buffer.mPlanes[1].mHeight = mFrameHeight / 2;
+    buffer.mPlanes[1].mWidth = mFrameWidth / 2;
+    buffer.mPlanes[1].mOffset = 0;
+    buffer.mPlanes[1].mSkip = 0;
+
+    // Cr plane.
+    buffer.mPlanes[2].mData = frame;
+    buffer.mPlanes[2].mStride = mFrameWidth / 2;
+    buffer.mPlanes[2].mHeight = mFrameHeight / 2;
+    buffer.mPlanes[2].mWidth = mFrameWidth / 2;
+    buffer.mPlanes[2].mOffset = 0;
+    buffer.mPlanes[2].mSkip = 0;
+
+    return VideoData::Create(mInfo,
+                             mImageContainer,
+                             nullptr,
+                             aOffsetInStream,
+                             aDTS,
+                             aDuration,
+                             buffer,
+                             true,
+                             aDTS,
+                             mPicture);
+  }
+private:
+  VideoInfo mInfo;
+  gfx::IntRect mPicture;
+  uint32_t mFrameWidth;
+  uint32_t mFrameHeight;
+  RefPtr<layers::ImageContainer> mImageContainer;
+};
+
+
+class BlankAudioDataCreator {
+public:
+  BlankAudioDataCreator(uint32_t aChannelCount,
+                        uint32_t aSampleRate,
+                        uint16_t aBitsPerSample)
+    : mFrameSum(0)
+    , mChannelCount(aChannelCount)
+    , mSampleRate(aSampleRate)
+  {
+  }
+
+  MediaData* Create(Microseconds aDTS,
+                    Microseconds aDuration,
+                    int64_t aOffsetInStream)
+  {
+    // Convert duration to frames. We add 1 to duration to account for
+    // rounding errors, so we get a consistent tone.
+    CheckedInt64 frames = UsecsToFrames(aDuration+1, mSampleRate);
+    if (!frames.isValid() ||
+        !mChannelCount ||
+        !mSampleRate ||
+        frames.value() > (UINT32_MAX / mChannelCount)) {
+      return nullptr;
+    }
+    AudioDataValue* samples = new AudioDataValue[frames.value() * mChannelCount];
+    // Fill the sound buffer with an A4 tone.
+    static const float pi = 3.14159265f;
+    static const float noteHz = 440.0f;
+    for (int i = 0; i < frames.value(); i++) {
+      float f = sin(2 * pi * noteHz * mFrameSum / mSampleRate);
+      for (unsigned c = 0; c < mChannelCount; c++) {
+        samples[i * mChannelCount + c] = AudioDataValue(f);
+      }
+      mFrameSum++;
+    }
+    return new AudioData(aOffsetInStream,
+                         aDTS,
+                         aDuration,
+                         uint32_t(frames.value()),
+                         samples,
+                         mChannelCount);
+  }
+
+private:
+  int64_t mFrameSum;
+  uint32_t mChannelCount;
+  uint32_t mSampleRate;
+};
+
+class BlankDecoderModule : public PlatformDecoderModule {
+public:
+
+  // Called when the decoders have shutdown. Main thread only.
+  virtual nsresult Shutdown() MOZ_OVERRIDE {
+    return NS_OK;
+  }
+
+  // Decode thread.
+  virtual MediaDataDecoder* CreateH264Decoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
+                                              layers::LayersBackend aLayersBackend,
+                                              layers::ImageContainer* aImageContainer,
+                                              MediaTaskQueue* aVideoTaskQueue,
+                                              MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE {
+    BlankVideoDataCreator* decoder = new BlankVideoDataCreator(aConfig.visible_rect().width(),
+                                                               aConfig.visible_rect().height(),
+                                                               aImageContainer);
+    return new BlankMediaDataDecoder<BlankVideoDataCreator>(decoder,
+                                                            aVideoTaskQueue,
+                                                            aCallback);
+  }
+
+  // Decode thread.
+  virtual MediaDataDecoder* CreateAACDecoder(const mp4_demuxer::AudioDecoderConfig& aConfig,
+                                             MediaTaskQueue* aAudioTaskQueue,
+                                             MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE {
+    BlankAudioDataCreator* decoder =
+      new BlankAudioDataCreator(ChannelLayoutToChannelCount(aConfig.channel_layout()),
+                                aConfig.samples_per_second(),
+                                aConfig.bits_per_channel());
+    return new BlankMediaDataDecoder<BlankAudioDataCreator>(decoder,
+                                                            aAudioTaskQueue,
+                                                            aCallback);
+  }
+};
+
+PlatformDecoderModule* CreateBlankDecoderModule()
+{
+  return new BlankDecoderModule();
+}
+
+} // namespace mozilla