From 757acc5d4871e2aac7d9fe9d1206c39216326932 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Thu, 30 Jan 2014 17:58:51 -0500 Subject: [PATCH] Bug 964442 - Make CreateImage just take a plain format parameter - r=jrmuizel --- content/media/MediaDecoderReader.cpp | 15 +++-- content/media/MediaStreamGraph.cpp | 3 +- content/media/gstreamer/GStreamerReader.cpp | 5 +- content/media/plugins/MediaPluginReader.cpp | 4 +- content/media/webrtc/MediaEngineDefault.cpp | 3 +- .../media/webrtc/MediaEngineWebRTCVideo.cpp | 4 +- content/media/wmf/DXVA2Manager.cpp | 3 +- dom/camera/DOMCameraPreview.cpp | 3 +- dom/plugins/base/nsPluginInstanceOwner.cpp | 6 +- dom/plugins/ipc/PluginInstanceParent.cpp | 6 +- gfx/layers/ImageContainer.cpp | 25 ++++---- gfx/layers/ImageContainer.h | 21 +------ gfx/layers/basic/BasicImages.cpp | 11 +--- gfx/layers/client/ImageClient.cpp | 60 ++++++++----------- gfx/layers/client/ImageClient.h | 12 ++-- gfx/layers/ipc/SharedRGBImage.cpp | 3 +- image/src/RasterImage.cpp | 4 +- layout/base/FrameLayerBuilder.cpp | 5 +- .../src/mediapipeline/MediaPipeline.cpp | 2 +- .../src/peerconnection/PeerConnectionMedia.h | 4 +- 20 files changed, 74 insertions(+), 125 deletions(-) diff --git a/content/media/MediaDecoderReader.cpp b/content/media/MediaDecoderReader.cpp index c0a4a2e0456c..be33b9eaad73 100644 --- a/content/media/MediaDecoderReader.cpp +++ b/content/media/MediaDecoderReader.cpp @@ -72,6 +72,7 @@ ValidatePlane(const VideoData::YCbCrBuffer::Plane& aPlane) aPlane.mStride > 0; } +#if 0 static bool IsYV12Format(const VideoData::YCbCrBuffer::Plane& aYPlane, const VideoData::YCbCrBuffer::Plane& aCbPlane, @@ -85,6 +86,7 @@ IsYV12Format(const VideoData::YCbCrBuffer::Plane& aYPlane, aCbPlane.mWidth == aCrPlane.mWidth && aCbPlane.mHeight == aCrPlane.mHeight; } +#endif bool VideoInfo::ValidateVideoRegion(const nsIntSize& aFrame, @@ -223,11 +225,13 @@ VideoData* VideoData::Create(VideoInfo& aInfo, if (!aImage) { // Currently our decoder only knows how to output to ImageFormat::PLANAR_YCBCR // format. - ImageFormat format[2] = {ImageFormat::PLANAR_YCBCR, ImageFormat::GRALLOC_PLANAR_YCBCR}; +#if 0 if (IsYV12Format(Y, Cb, Cr)) { - v->mImage = aContainer->CreateImage(format, 2); - } else { - v->mImage = aContainer->CreateImage(format, 1); + v->mImage = aContainer->CreateImage(ImageFormat::GRALLOC_PLANAR_YCBCR); + } +#endif + if (!v->mImage) { + v->mImage = aContainer->CreateImage(ImageFormat::PLANAR_YCBCR); } } else { v->mImage = aImage; @@ -363,8 +367,7 @@ VideoData* VideoData::Create(VideoInfo& aInfo, aTimecode, aInfo.mDisplay)); - ImageFormat format = ImageFormat::GRALLOC_PLANAR_YCBCR; - v->mImage = aContainer->CreateImage(&format, 1); + v->mImage = aContainer->CreateImage(ImageFormat::GRALLOC_PLANAR_YCBCR); if (!v->mImage) { return nullptr; } diff --git a/content/media/MediaStreamGraph.cpp b/content/media/MediaStreamGraph.cpp index b53b6759bc4b..e4900fe9edff 100644 --- a/content/media/MediaStreamGraph.cpp +++ b/content/media/MediaStreamGraph.cpp @@ -955,9 +955,8 @@ MediaStreamGraphImpl::PlayVideo(MediaStream* aStream) VideoFrameContainer* output = aStream->mVideoOutputs[i]; if (frame->GetForceBlack()) { - static const ImageFormat formats[1] = { ImageFormat::PLANAR_YCBCR }; nsRefPtr image = - output->GetImageContainer()->CreateImage(formats, 1); + output->GetImageContainer()->CreateImage(ImageFormat::PLANAR_YCBCR); if (image) { // Sets the image to a single black pixel, which will be scaled to fill // the rendered size. diff --git a/content/media/gstreamer/GStreamerReader.cpp b/content/media/gstreamer/GStreamerReader.cpp index 0858146dd3af..32d8425f556e 100644 --- a/content/media/gstreamer/GStreamerReader.cpp +++ b/content/media/gstreamer/GStreamerReader.cpp @@ -921,8 +921,9 @@ GstFlowReturn GStreamerReader::AllocateVideoBufferFull(GstPad* aPad, { /* allocate an image using the container */ ImageContainer* container = mDecoder->GetImageContainer(); - ImageFormat format = ImageFormat::PLANAR_YCBCR; - PlanarYCbCrImage* img = reinterpret_cast(container->CreateImage(&format, 1).get()); + PlanarYCbCrImage* img = + reinterpret_cast( + container->CreateImage(ImageFormat::PLANAR_YCBCR).get()); nsRefPtr image = dont_AddRef(img); /* prepare a GstBuffer pointing to the underlying PlanarYCbCrImage buffer */ diff --git a/content/media/plugins/MediaPluginReader.cpp b/content/media/plugins/MediaPluginReader.cpp index 1d64b3b4f9a4..2305e34b7823 100644 --- a/content/media/plugins/MediaPluginReader.cpp +++ b/content/media/plugins/MediaPluginReader.cpp @@ -373,9 +373,7 @@ uint8_t * MediaPluginReader::ImageBufferCallback::CreateI420Image(size_t aWidth, size_t aHeight) { - ImageFormat format = ImageFormat::PLANAR_YCBCR; - - mImage = mImageContainer->CreateImage(&format, 1 /* numFormats */); + mImage = mImageContainer->CreateImage(ImageFormat::PLANAR_YCBCR); PlanarYCbCrImage *yuvImage = static_cast(mImage.get()); if (!yuvImage) { diff --git a/content/media/webrtc/MediaEngineDefault.cpp b/content/media/webrtc/MediaEngineDefault.cpp index 94b4fd3ef85b..8ff4241fa76a 100644 --- a/content/media/webrtc/MediaEngineDefault.cpp +++ b/content/media/webrtc/MediaEngineDefault.cpp @@ -207,8 +207,7 @@ MediaEngineDefaultVideoSource::Notify(nsITimer* aTimer) } // Allocate a single solid color image - ImageFormat format = ImageFormat::PLANAR_YCBCR; - nsRefPtr image = mImageContainer->CreateImage(&format, 1); + nsRefPtr image = mImageContainer->CreateImage(ImageFormat::PLANAR_YCBCR); nsRefPtr ycbcr_image = static_cast(image.get()); layers::PlanarYCbCrData data; diff --git a/content/media/webrtc/MediaEngineWebRTCVideo.cpp b/content/media/webrtc/MediaEngineWebRTCVideo.cpp index 77956b42f47c..1564b6bea7bf 100644 --- a/content/media/webrtc/MediaEngineWebRTCVideo.cpp +++ b/content/media/webrtc/MediaEngineWebRTCVideo.cpp @@ -67,9 +67,7 @@ MediaEngineWebRTCVideoSource::DeliverFrame( } // Create a video frame and append it to the track. - ImageFormat format = ImageFormat::PLANAR_YCBCR; - - nsRefPtr image = mImageContainer->CreateImage(&format, 1); + nsRefPtr image = mImageContainer->CreateImage(ImageFormat::PLANAR_YCBCR); layers::PlanarYCbCrImage* videoImage = static_cast(image.get()); diff --git a/content/media/wmf/DXVA2Manager.cpp b/content/media/wmf/DXVA2Manager.cpp index bf6f29e1a8d6..3f0b60b00bb1 100644 --- a/content/media/wmf/DXVA2Manager.cpp +++ b/content/media/wmf/DXVA2Manager.cpp @@ -154,8 +154,7 @@ D3D9DXVA2Manager::CopyToImage(IMFSample* aSample, getter_AddRefs(surface)); NS_ENSURE_TRUE(SUCCEEDED(hr), hr); - ImageFormat format = ImageFormat::D3D9_RGB32_TEXTURE; - nsRefPtr image = aImageContainer->CreateImage(&format, 1); + nsRefPtr image = aImageContainer->CreateImage(ImageFormat::D3D9_RGB32_TEXTURE); NS_ENSURE_TRUE(image, E_FAIL); NS_ASSERTION(image->GetFormat() == ImageFormat::D3D9_RGB32_TEXTURE, "Wrong format?"); diff --git a/dom/camera/DOMCameraPreview.cpp b/dom/camera/DOMCameraPreview.cpp index 189130c2988e..903ceb3e653f 100644 --- a/dom/camera/DOMCameraPreview.cpp +++ b/dom/camera/DOMCameraPreview.cpp @@ -191,8 +191,7 @@ DOMCameraPreview::ReceiveFrame(void* aBuffer, ImageFormat aFormat, FrameBuilder return false; } - ImageFormat format = aFormat; - nsRefPtr image = mImageContainer->CreateImage(&format, 1); + nsRefPtr image = mImageContainer->CreateImage(aFormat); aBuilder(image, aBuffer, mWidth, mHeight); mInput->SetCurrentFrame(gfxIntSize(mWidth, mHeight), image); diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp index c2321733b80d..82946822d439 100644 --- a/dom/plugins/base/nsPluginInstanceOwner.cpp +++ b/dom/plugins/base/nsPluginInstanceOwner.cpp @@ -179,8 +179,7 @@ nsPluginInstanceOwner::GetImageContainer() container = LayerManager::CreateImageContainer(); - ImageFormat format = ImageFormat::SHARED_TEXTURE; - nsRefPtr img = container->CreateImage(&format, 1); + nsRefPtr img = container->CreateImage(ImageFormat::SHARED_TEXTURE); SharedTextureImage::Data data; data.mSize = gfx::IntSize(r.width, r.height); @@ -1499,8 +1498,7 @@ already_AddRefed nsPluginInstanceOwner::GetImageContainerForVide { nsRefPtr container = LayerManager::CreateImageContainer(); - ImageFormat format = ImageFormat::SHARED_TEXTURE; - nsRefPtr img = container->CreateImage(&format, 1); + nsRefPtr img = container->CreateImage(ImageFormat::SHARED_TEXTURE); SharedTextureImage::Data data; diff --git a/dom/plugins/ipc/PluginInstanceParent.cpp b/dom/plugins/ipc/PluginInstanceParent.cpp index 47d9a53f6001..d1b05eda1ec2 100644 --- a/dom/plugins/ipc/PluginInstanceParent.cpp +++ b/dom/plugins/ipc/PluginInstanceParent.cpp @@ -638,8 +638,7 @@ PluginInstanceParent::RecvShow(const NPRect& updatedRect, surface->MarkDirty(ur); ImageContainer *container = GetImageContainer(); - ImageFormat format = ImageFormat::CAIRO_SURFACE; - nsRefPtr image = container->CreateImage(&format, 1); + nsRefPtr image = container->CreateImage(ImageFormat::CAIRO_SURFACE); NS_ASSERTION(image->GetFormat() == ImageFormat::CAIRO_SURFACE, "Wrong format?"); CairoImage* cairoImage = static_cast(image.get()); CairoImage::Data cairoData; @@ -719,8 +718,7 @@ PluginInstanceParent::GetImageContainer(ImageContainer** aContainer) #ifdef XP_MACOSX if (ioSurface) { - ImageFormat format = ImageFormat::MAC_IOSURFACE; - nsRefPtr image = container->CreateImage(&format, 1); + nsRefPtr image = container->CreateImage(ImageFormat::MAC_IOSURFACE); if (!image) { return NS_ERROR_FAILURE; } diff --git a/gfx/layers/ImageContainer.cpp b/gfx/layers/ImageContainer.cpp index c7f118bf1f00..543e9b74dd4c 100644 --- a/gfx/layers/ImageContainer.cpp +++ b/gfx/layers/ImageContainer.cpp @@ -58,41 +58,37 @@ Image::GetAsSourceSurface() } already_AddRefed -ImageFactory::CreateImage(const ImageFormat *aFormats, - uint32_t aNumFormats, +ImageFactory::CreateImage(ImageFormat aFormat, const gfx::IntSize &, BufferRecycleBin *aRecycleBin) { - if (!aNumFormats) { - return nullptr; - } nsRefPtr img; #ifdef MOZ_WIDGET_GONK - if (FormatInList(aFormats, aNumFormats, ImageFormat::GRALLOC_PLANAR_YCBCR)) { + if (aFormat == ImageFormat::GRALLOC_PLANAR_YCBCR) { img = new GrallocImage(); return img.forget(); } #endif - if (FormatInList(aFormats, aNumFormats, ImageFormat::PLANAR_YCBCR)) { + if (aFormat == ImageFormat::PLANAR_YCBCR) { img = new PlanarYCbCrImage(aRecycleBin); return img.forget(); } - if (FormatInList(aFormats, aNumFormats, ImageFormat::CAIRO_SURFACE)) { + if (aFormat == ImageFormat::CAIRO_SURFACE) { img = new CairoImage(); return img.forget(); } - if (FormatInList(aFormats, aNumFormats, ImageFormat::SHARED_TEXTURE)) { + if (aFormat == ImageFormat::SHARED_TEXTURE) { img = new SharedTextureImage(); return img.forget(); } #ifdef XP_MACOSX - if (FormatInList(aFormats, aNumFormats, ImageFormat::MAC_IOSURFACE)) { + if (aFormat == ImageFormat::MAC_IOSURFACE) { img = new MacIOSurfaceImage(); return img.forget(); } #endif #ifdef XP_WIN - if (FormatInList(aFormats, aNumFormats, ImageFormat::D3D9_RGB32_TEXTURE)) { + if (aFormat == ImageFormat::D3D9_RGB32_TEXTURE) { img = new D3D9SurfaceImage(); return img.forget(); } @@ -162,18 +158,17 @@ ImageContainer::~ImageContainer() } already_AddRefed -ImageContainer::CreateImage(const ImageFormat *aFormats, - uint32_t aNumFormats) +ImageContainer::CreateImage(ImageFormat aFormat) { ReentrantMonitorAutoEnter mon(mReentrantMonitor); if (mImageClient) { - nsRefPtr img = mImageClient->CreateImage(aFormats, aNumFormats); + nsRefPtr img = mImageClient->CreateImage(aFormat); if (img) { return img.forget(); } } - return mImageFactory->CreateImage(aFormats, aNumFormats, mScaleHint, mRecycleBin); + return mImageFactory->CreateImage(aFormat, mScaleHint, mRecycleBin); } void diff --git a/gfx/layers/ImageContainer.h b/gfx/layers/ImageContainer.h index 640f9e01761c..e5dc7d4399ea 100644 --- a/gfx/layers/ImageContainer.h +++ b/gfx/layers/ImageContainer.h @@ -262,21 +262,6 @@ private: uint32_t mRecycledBufferSize; }; -/** - * Returns true if aFormat is in the given format array. - */ -static inline bool -FormatInList(const ImageFormat* aFormats, uint32_t aNumFormats, - ImageFormat aFormat) -{ - for (uint32_t i = 0; i < aNumFormats; ++i) { - if (aFormats[i] == aFormat) { - return true; - } - } - return false; -} - class CompositionNotifySink { public: @@ -309,8 +294,7 @@ protected: ImageFactory() {} virtual ~ImageFactory() {} - virtual already_AddRefed CreateImage(const ImageFormat* aFormats, - uint32_t aNumFormats, + virtual already_AddRefed CreateImage(ImageFormat aFormat, const gfx::IntSize &aScaleHint, BufferRecycleBin *aRecycleBin); @@ -411,8 +395,7 @@ public: * Can be called on any thread. This method takes mReentrantMonitor * when accessing thread-shared state. */ - already_AddRefed CreateImage(const ImageFormat* aFormats, - uint32_t aNumFormats); + already_AddRefed CreateImage(ImageFormat aFormat); /** * Set an Image as the current image to display. The Image must have diff --git a/gfx/layers/basic/BasicImages.cpp b/gfx/layers/basic/BasicImages.cpp index ab07d22f1d50..d606c5c06adb 100644 --- a/gfx/layers/basic/BasicImages.cpp +++ b/gfx/layers/basic/BasicImages.cpp @@ -67,22 +67,17 @@ class BasicImageFactory : public ImageFactory public: BasicImageFactory() {} - virtual already_AddRefed CreateImage(const ImageFormat* aFormats, - uint32_t aNumFormats, + virtual already_AddRefed CreateImage(ImageFormat aFormat, const gfx::IntSize &aScaleHint, BufferRecycleBin *aRecycleBin) { - if (!aNumFormats) { - return nullptr; - } - nsRefPtr image; - if (aFormats[0] == ImageFormat::PLANAR_YCBCR) { + if (aFormat == ImageFormat::PLANAR_YCBCR) { image = new BasicPlanarYCbCrImage(aScaleHint, gfxPlatform::GetPlatform()->GetOffscreenFormat(), aRecycleBin); return image.forget(); } - return ImageFactory::CreateImage(aFormats, aNumFormats, aScaleHint, aRecycleBin); + return ImageFactory::CreateImage(aFormat, aScaleHint, aRecycleBin); } }; diff --git a/gfx/layers/client/ImageClient.cpp b/gfx/layers/client/ImageClient.cpp index 2d981abcd518..b2695640f533 100644 --- a/gfx/layers/client/ImageClient.cpp +++ b/gfx/layers/client/ImageClient.cpp @@ -492,53 +492,45 @@ ImageClientBridge::UpdateImage(ImageContainer* aContainer, uint32_t aContentFlag } already_AddRefed -ImageClientSingle::CreateImage(const ImageFormat *aFormats, - uint32_t aNumFormats) +ImageClientSingle::CreateImage(ImageFormat aFormat) { nsRefPtr img; - for (uint32_t i = 0; i < aNumFormats; i++) { - switch (aFormats[i]) { - case ImageFormat::PLANAR_YCBCR: - img = new SharedPlanarYCbCrImage(this); - return img.forget(); - case ImageFormat::SHARED_RGB: - img = new SharedRGBImage(this); - return img.forget(); + switch (aFormat) { + case ImageFormat::PLANAR_YCBCR: + img = new SharedPlanarYCbCrImage(this); + return img.forget(); + case ImageFormat::SHARED_RGB: + img = new SharedRGBImage(this); + return img.forget(); #ifdef MOZ_WIDGET_GONK - case ImageFormat::GRALLOC_PLANAR_YCBCR: - img = new GrallocImage(); - return img.forget(); + case ImageFormat::GRALLOC_PLANAR_YCBCR: + img = new GrallocImage(); + return img.forget(); #endif - default: - continue; // keep iterating over aFormats - } + default: + return nullptr; } - return nullptr; } already_AddRefed -DeprecatedImageClientSingle::CreateImage(const ImageFormat *aFormats, - uint32_t aNumFormats) +DeprecatedImageClientSingle::CreateImage(ImageFormat aFormat) { nsRefPtr img; - for (uint32_t i = 0; i < aNumFormats; i++) { - switch (aFormats[i]) { - case ImageFormat::PLANAR_YCBCR: - img = new DeprecatedSharedPlanarYCbCrImage(GetForwarder()); - return img.forget(); - case ImageFormat::SHARED_RGB: - img = new DeprecatedSharedRGBImage(GetForwarder()); - return img.forget(); + switch (aFormat) { + case ImageFormat::PLANAR_YCBCR: + img = new DeprecatedSharedPlanarYCbCrImage(GetForwarder()); + return img.forget(); + case ImageFormat::SHARED_RGB: + img = new DeprecatedSharedRGBImage(GetForwarder()); + return img.forget(); #ifdef MOZ_WIDGET_GONK - case ImageFormat::GRALLOC_PLANAR_YCBCR: - img = new GrallocImage(); - return img.forget(); + case ImageFormat::GRALLOC_PLANAR_YCBCR: + img = new GrallocImage(); + return img.forget(); #endif - default: - continue; // keep iterating over aFormats - } + default: + return nullptr; } - return nullptr; } diff --git a/gfx/layers/client/ImageClient.h b/gfx/layers/client/ImageClient.h index eb7d8c0942a3..c511d48ffb32 100644 --- a/gfx/layers/client/ImageClient.h +++ b/gfx/layers/client/ImageClient.h @@ -59,8 +59,7 @@ public: */ virtual void UpdatePictureRect(nsIntRect aPictureRect); - virtual already_AddRefed CreateImage(const ImageFormat *aFormats, - uint32_t aNumFormats) = 0; + virtual already_AddRefed CreateImage(ImageFormat aFormat) = 0; /** * Synchronously remove all the textures used by the image client. @@ -97,8 +96,7 @@ public: virtual TextureInfo GetTextureInfo() const MOZ_OVERRIDE; - virtual already_AddRefed CreateImage(const ImageFormat *aFormats, - uint32_t aNumFormats) MOZ_OVERRIDE; + virtual already_AddRefed CreateImage(ImageFormat aFormat) MOZ_OVERRIDE; virtual void FlushAllImages(bool aExceptFront) MOZ_OVERRIDE; @@ -166,8 +164,7 @@ public: return mTextureInfo; } - virtual already_AddRefed CreateImage(const ImageFormat *aFormats, - uint32_t aNumFormats) MOZ_OVERRIDE; + virtual already_AddRefed CreateImage(ImageFormat aFormat) MOZ_OVERRIDE; private: RefPtr mDeprecatedTextureClient; @@ -203,8 +200,7 @@ public: MOZ_ASSERT(!aChild, "ImageClientBridge should not have IPDL actor"); } - virtual already_AddRefed CreateImage(const ImageFormat *aFormats, - uint32_t aNumFormats) MOZ_OVERRIDE + virtual already_AddRefed CreateImage(ImageFormat aFormat) MOZ_OVERRIDE { NS_WARNING("Should not create an image through an ImageClientBridge"); return nullptr; diff --git a/gfx/layers/ipc/SharedRGBImage.cpp b/gfx/layers/ipc/SharedRGBImage.cpp index 52b06c89cd3d..77912fbe386d 100644 --- a/gfx/layers/ipc/SharedRGBImage.cpp +++ b/gfx/layers/ipc/SharedRGBImage.cpp @@ -64,8 +64,7 @@ CreateSharedRGBImage(ImageContainer *aImageContainer, return nullptr; } - ImageFormat format = ImageFormat::SHARED_RGB; - nsRefPtr image = aImageContainer->CreateImage(&format, 1); + nsRefPtr image = aImageContainer->CreateImage(ImageFormat::SHARED_RGB); if (!image) { NS_WARNING("Failed to create DeprecatedSharedRGBImage"); diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp index c8540ac2d171..90c70b1062cd 100644 --- a/image/src/RasterImage.cpp +++ b/image/src/RasterImage.cpp @@ -958,11 +958,9 @@ RasterImage::GetCurrentImage() GetHeight(&cairoData.mSize.height); cairoData.mSourceSurface = gfxPlatform::GetPlatform()->GetSourceSurfaceForSurface(nullptr, imageSurface); - ImageFormat cairoFormat = ImageFormat::CAIRO_SURFACE; - nsRefPtr image = mImageContainer->CreateImage(&cairoFormat, 1); + nsRefPtr image = mImageContainer->CreateImage(ImageFormat::CAIRO_SURFACE); NS_ASSERTION(image, "Failed to create Image"); - NS_ASSERTION(image->GetFormat() == cairoFormat, "Wrong format"); static_cast(image.get())->SetData(cairoData); return image.forget(); diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp index 42ec685e4de5..27ce7cd5d3b9 100644 --- a/layout/base/FrameLayerBuilder.cpp +++ b/layout/base/FrameLayerBuilder.cpp @@ -2990,7 +2990,7 @@ ChooseScaleAndSetTransform(FrameLayerBuilder* aLayerBuilder, gfxSize scale; // XXX Should we do something for 3D transforms? if (canDraw2D) { - // If the container's transform is animated off main thread, then use the +// // If the container's transform is animated off main thread, then use the // maximum scale. if (aContainerFrame->GetContent() && nsLayoutUtils::HasAnimationsForCompositor( @@ -3868,8 +3868,7 @@ ContainerState::SetupMaskLayer(Layer *aLayer, const DisplayItemClip& aClip, // build the image and container container = aLayer->Manager()->CreateImageContainer(); NS_ASSERTION(container, "Could not create image container for mask layer."); - static const ImageFormat format = ImageFormat::CAIRO_SURFACE; - nsRefPtr image = container->CreateImage(&format, 1); + nsRefPtr image = container->CreateImage(ImageFormat::CAIRO_SURFACE); NS_ASSERTION(image, "Could not create image container for mask layer."); CairoImage::Data data; data.mDeprecatedSurface = surface; diff --git a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp index a0ed8eb7136f..777a94da45d8 100644 --- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp +++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp @@ -1203,7 +1203,7 @@ void MediaPipelineReceiveVideo::PipelineListener::RenderVideoFrame( #else ImageFormat format = ImageFormat::PLANAR_YCBCR; #endif - nsRefPtr image = image_container_->CreateImage(&format, 1); + nsRefPtr image = image_container_->CreateImage(format); layers::PlanarYCbCrImage* videoImage = static_cast(image.get()); uint8_t* frame = const_cast(static_cast (buffer)); diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h index 1bf98c27071b..f58d9ceef019 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h @@ -118,11 +118,11 @@ class Fake_VideoGenerator { const uint32_t HEIGHT = 480; // Allocate a single blank Image - mozilla::ImageFormat format = mozilla::ImageFormat::PLANAR_YCBCR; nsRefPtr container = mozilla::layers::LayerManager::CreateImageContainer(); - nsRefPtr image = container->CreateImage(&format, 1); + nsRefPtr image = + container->CreateImage(mozilla::ImageFormat::PLANAR_YCBCR); int len = ((WIDTH * HEIGHT) * 3 / 2); mozilla::layers::PlanarYCbCrImage* planar =