Bug 987498 - Part 2 - HTMLMediaElement supports playback OverlayImage. r=roc

dom/html/HTMLMediaElement.cpp

@@ -3110,7 +3110,17 @@ void HTMLMediaElement::SetupSrcMediaStreamPlayback(DOMMediaStream* aStream)
   ChangeDelayLoadStatus(false);
   GetSrcMediaStream()->AddAudioOutput(this);
   SetVolumeInternal();
-  VideoFrameContainer* container = GetVideoFrameContainer();
+
+  bool bUseOverlayImage = mSrcStream->AsDOMHwMediaStream() != nullptr;
+  VideoFrameContainer* container;
+
+  if (bUseOverlayImage) {
+    container = GetOverlayImageVideoFrameContainer();
+  }
+  else {
+    container = GetVideoFrameContainer();
+  }
+
   if (container) {
     GetSrcMediaStream()->AddVideoOutput(container);
   }
@@ -3778,7 +3788,23 @@ VideoFrameContainer* HTMLMediaElement::GetVideoFrameContainer()
   }
 
   mVideoFrameContainer =
-    new VideoFrameContainer(this, LayerManager::CreateAsynchronousImageContainer());
+    new VideoFrameContainer(this, LayerManager::CreateImageContainer(ImageContainer::ASYNCHRONOUS));
+
+  return mVideoFrameContainer;
+}
+
+VideoFrameContainer* HTMLMediaElement::GetOverlayImageVideoFrameContainer()
+{
+  if (mVideoFrameContainer)
+    return mVideoFrameContainer;
+
+  // Only video frames need an image container.
+  if (!IsVideo()) {
+    return nullptr;
+  }
+
+  mVideoFrameContainer =
+    new VideoFrameContainer(this, LayerManager::CreateImageContainer(ImageContainer::ASYNCHRONOUS_OVERLAY));
 
   return mVideoFrameContainer;
 }

dom/html/HTMLMediaElement.h

@@ -212,6 +212,9 @@ public:
 
   virtual bool IsHidden() final override;
 
+  // In order to create overlayImageContainer to support DOMHwMediaStream.
+  VideoFrameContainer* GetOverlayImageVideoFrameContainer();
+
   // Called by the media decoder and the video frame to get the
   // ImageContainer containing the video data.
   virtual VideoFrameContainer* GetVideoFrameContainer() final override;