dc6e889fb4
On Android we use SurfaceTextures to render content from sources such as the video decoder. These may have a transform set which is supposed to be applied to the texture coordinates used to sample the texture. Webrender (and software webrender), however, do not handle this correctly, meaning videos may be rendered at the incorrect size on some devices. SurfaceTextures should always be rendered with their bottom-left being their origin, eg vertically flipped. Additionally, the texture transform returned on most devices seems to be a simple y-flip transform with no scaling. Webrender currently just ignores the y-flip due to the texture origin, which cancels out us not handling the y-flip from the transform, meaning video looks correct on most devices. Some devices, however, do return a scaling transform which we must handle. This patch removes the override of WebRenderTextureHost::NeedsYFlip() that was causing us to ignore the y-flip due to the texture origin - since we will now apply the transform we must handle this correctly too. It adds a virtual method RenderTextureHost::GetUvCoords(), that returns the texture coordinates that should be used by webrender to sample from external textures. In most cases these are simply (0, 0) and (size.x, size.y), but in RenderAndroidSurfaceTextureHost we override this function to apply the transformation. This ensures we use the correct coordinates whenever the texture is rendered by webrender, eg in both software and hardware webrender when rendering in the non-compositing-path, and by hardware webrender's draw compositor. Additionally, the composite.glsl shader requires a fix to calculate the UV bounds correctly, as the coordinates may now be inverted. Lastly, we fix software webrender with the OpenGL compositor. CompositorOGL already has the required functionality to apply the texture transformation as it was used back in the layers days. We must simply ensure that we pass the value of the mIgnoreTransform flag from the original SurfaceTextureHost, through to the RenderAndroidSurfaceTextureHost, and finally to the SurfaceTextureSource which we hand to CompositorOGL. Differential Revision: https://phabricator.services.mozilla.com/D144306
94 lines
2.8 KiB
C++
94 lines
2.8 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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/. */
|
|
|
|
#ifndef MOZILLA_GFX_RENDERANDROIDSURFACETEXTUREHOST_H
|
|
#define MOZILLA_GFX_RENDERANDROIDSURFACETEXTUREHOST_H
|
|
|
|
#include "mozilla/java/GeckoSurfaceTextureWrappers.h"
|
|
#include "mozilla/layers/TextureHostOGL.h"
|
|
#include "RenderTextureHostSWGL.h"
|
|
|
|
namespace mozilla {
|
|
|
|
namespace gfx {
|
|
class DataSourceSurface;
|
|
}
|
|
|
|
namespace wr {
|
|
|
|
class RenderAndroidSurfaceTextureHost final : public RenderTextureHostSWGL {
|
|
public:
|
|
explicit RenderAndroidSurfaceTextureHost(
|
|
const java::GeckoSurfaceTexture::GlobalRef& aSurfTex, gfx::IntSize aSize,
|
|
gfx::SurfaceFormat aFormat, bool aContinuousUpdate,
|
|
bool aIgnoreTransform);
|
|
|
|
wr::WrExternalImage Lock(uint8_t aChannelIndex, gl::GLContext* aGL,
|
|
wr::ImageRendering aRendering) override;
|
|
void Unlock() override;
|
|
|
|
size_t Bytes() override {
|
|
return mSize.width * mSize.height * BytesPerPixel(mFormat);
|
|
}
|
|
|
|
void PrepareForUse() override;
|
|
void NotifyForUse() override;
|
|
void NotifyNotUsed() override;
|
|
|
|
// RenderTextureHostSWGL
|
|
gfx::SurfaceFormat GetFormat() const override;
|
|
gfx::ColorDepth GetColorDepth() const override {
|
|
return gfx::ColorDepth::COLOR_8;
|
|
}
|
|
size_t GetPlaneCount() const override { return 1; }
|
|
bool MapPlane(RenderCompositor* aCompositor, uint8_t aChannelIndex,
|
|
PlaneInfo& aPlaneInfo) override;
|
|
void UnmapPlanes() override;
|
|
|
|
RenderAndroidSurfaceTextureHost* AsRenderAndroidSurfaceTextureHost()
|
|
override {
|
|
return this;
|
|
}
|
|
|
|
mozilla::java::GeckoSurfaceTexture::GlobalRef mSurfTex;
|
|
const gfx::IntSize mSize;
|
|
const gfx::SurfaceFormat mFormat;
|
|
// mContinuousUpdate was used for rendering video in the past.
|
|
// It is not used on current gecko.
|
|
const bool mContinuousUpdate;
|
|
const bool mIgnoreTransform;
|
|
|
|
private:
|
|
virtual ~RenderAndroidSurfaceTextureHost();
|
|
bool EnsureAttachedToGLContext();
|
|
|
|
already_AddRefed<gfx::DataSourceSurface> ReadTexImage();
|
|
|
|
// Returns the UV coordinates to be used when sampling the texture, taking in
|
|
// to account the SurfaceTexture's transform if applicable.
|
|
std::pair<gfx::Point, gfx::Point> GetUvCoords(
|
|
gfx::IntSize aTextureSize) const override;
|
|
|
|
enum PrepareStatus {
|
|
STATUS_NONE,
|
|
STATUS_MIGHT_BE_USED_BY_WR,
|
|
STATUS_UPDATE_TEX_IMAGE_NEEDED,
|
|
STATUS_PREPARED
|
|
};
|
|
|
|
PrepareStatus mPrepareStatus;
|
|
bool mAttachedToGLContext;
|
|
|
|
RefPtr<gl::GLContext> mGL;
|
|
|
|
RefPtr<gfx::DataSourceSurface> mReadback;
|
|
};
|
|
|
|
} // namespace wr
|
|
} // namespace mozilla
|
|
|
|
#endif // MOZILLA_GFX_RENDERANDROIDSURFACETEXTUREHOST_H
|