mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
8cdf8ee29c
- Bug 1170958 - Feed a SourceMediaStream-backed dom stream instead of a raw SourceMediaStream in MediaManager. r=jesup (8670ff2711) - Bug 1103188 - Remove identical override nsDOMUserMediaStream::Stop(). r=jib (54831f9b18) - Bug 1103188 - Deprecate DOMMediaStream::Stop(). r=jib (36112afe82) - Bug 1186813 - Replace nsBaseHashtable::EnumerateRead() calls in dom/media/ with iterators r=cpearce (cd0c4a34e8) - Bug 1190337 - Log GPS status and SVs status if the 'gDebug_isLoggingEnabled' is true. r=garvank (c269f6f31d) - Bug 1154435 - [Stumbler] FxOS Geo Stumbling for Mozilla Location Service. r=jdm (1a86f4dda5) - Bug 1199395 - FxOS Stumbling gzip the stumbles to store more data. r=jdm (4d108665d9) - Bug 1175860 - Add some documentation to UploadLastDir to make its workings clearer. r=baku (cdac9a7849) - Bug 1210517 - Create nsVariant directly rather than via do_CreateInstance(). r=froydnj (df420cba8e) - Bug 953265: make getUserMedia fake audio tones configurable in frequency via pref r=jib (67793ee005) - Bug 1166293 - Use AsyncShutdown API to shut down media thread in non-e10s. r= jesup (1245d20b7e) - Bug 1103188 - MediaStream WebIDL update with addTrack/removeTrack. r=smaug,jib (697791fd6f) - Bug 1103188 - MediaStream::AddTrack/RemoveTrack implementation. r=roc (c8b02beb45) - Bug 1170958 - Improve logging of MediaStreams and playback. r=roc (5fcb40437e) - Bug 1170958 - Add DOMMediaStream::OwnedStreamListener. r=roc (afff077f93) - Bug 1103188 - Break out MediaTrackListListener to an interface. r=roc (298b665f27) - Bug 1198435 - Call RemoveMediaElementFromURITable before modifying mLoadingSrc, so that a future LookupMediaElementURITable won't access this element anymore. r=rillian (f2805c8dba) - Bug 1141875 - Add flag to init gl_Position. - r=kamidphish (eeb333c02b) - Bug 1128044 - Enforce packing restrictions for varyings. - r=kamidphish (17b9596a3d) - Bug 1128044 - Only pack varyings that have static use in both shaders. - r=warnings-as-errors (f41708642a) - Bug 1128044 - Use nsTArray since android doesn't support std::vector::data(). - r=bustage (be88a80844) - Bug 1128044 - nsTArray::AppendElement doesn't accept init lists. - r=bustage (cdeafa867b) - bit of Bug 1019209 - Allow GL initialization without Android bridge (3dba5dffa2) - some reporter (3049ad6f6d) - Bug 1206030 - Remove nsIDOMHTMLCanvasElement::MozFetchAsStream() f=Ms2ger r=jst (95e773b79f) - Bug 1187174 - Use 'webgl2' not 'experimental-webgl2'. - r=kamidphish (a6c21752fc) - Bug 1190777 - Add null checks to prevent bad dereferences. r=kamidphish (f67f0125ce) - Bug 709490 - Part 1: Let ImageBridge transfer CanvasClient async. r=nical (a46ac7e71c) - Bug 1150762 - Add pref for activating all ANGLE options. - r=kamidphish (6ab4d39827) - Bug 1195401 - Use gfxPrefs (threadsafe) rather than crashing on debug builds for off-main-thread pref access. r=snorp (0d29cea59c) - Bug 709490 - Part 2: Introduce OffscreenCanvas and let WebGL context work on workers. r=nical, r=jgilbert, r=jrmuizel, sr=ehsan (842aaa8328) - Bug 709490 - Part 3: Transfer OffscreenCanvas from mainthread to workers. r=baku, r=sfink (91c24b0e08) - Bug 709490 - Part 4: Mochitests for offscreencanvas. r=baku, r=jgilbert (4c439fd376) - Bug 1173544 - Add tests for Canvas CSS/SVG Filters. r=mstange (04c01f1c11) - fix (9c7ab9d870) - Bug 709490 - Part 5: Add interfaces test. r=ehsan (2993581c89) - Bug 709490 - Part 6: Add frame ID to CanvasClient so compositor could update frame correctly. r=roc (3e6554af1e) - Bug 709490 - Part 7: If layer is not available, fallback to BasicCanvasLayer. r=roc (c0c0d04468) - Bug 709490 - Part 8: Copy to a temp texture when readback from IOSurface. r=jgilbert (d1a4879a39) - Bug 709490 - Part 9: Readback without blocking main thread. r=jgilbert (2430c6e2a5) - Bug 709490 - Part 10: Using mechanism in RuntimeService to get pref in worker thread instead of gfxPref. r=baku (85d6dc2744) - Bug 709490 - Part 11: Diabled test_offscreencanvas_many.html on gonk, android, windows and linux. r=jgilbert (5cd8f28063) - Bug 1212663 - Use doxygen style comments in jsapi, r=Waldo (0e67283edf) - Bug 1000922 - Use nsMainThreadPtrHandle instead of already_AddRefed and forget for callbacks in NativeOSFileInternals.cpp r=jdm (4a128db7a6) - Bug 1169740 - Implement a TDZ-like behavior for |this| in derived class constructors. (r=jandem, r=jorendorff, inputs on nit resoulution from Waldo) (6d7df317e3) - Bug 1211949 - check for allocation failure. r=nbp (94b8aac5e3) - Bug 1209497 - OOM-crash if a consistent object table is impossible. r=jandem (e8ded0c3cb) - Bug 1141863 - Part 1: Make |this| object creation account for new.target. (r=jandem, r=jorendorff) (9b4ec25d47) - Bug 1141863 - Part 2: Implement ES6 SuperCall. (r=jandem, r=jorendorff) (1bbd2ba712) - Bug 1141863 - Followup: Clean up proxy get traps to handle new |this| creation semantics. (rs=Waldo) CLOSED TREE (e7cd48b43c) - Bug 1141863 - Last followup fix for a couple jstest failures. r=orange in a CLOSED TREE (8a9cff881a) - Bug 1141863 - Followfollowfollowup: Remove redundant assert causing rooting hazards. (r=Waldo over IRC) CLOSED TREE (338b64ca87) - Bug 1141863 - Tests. (r=jorendorff) (3957511169) - Bug 1105463 - Implement default constructors for ES6 class definitions. (r=jorendorff) (8ead7f33a5) - Bug 1105463 - Follow up: Fix erroneous syntax test. (r=theSheriffMadeMeDoIt) (425e678cf2) - Bug 1212794 - Remove decompile-body functionality. r=till (9b87e5c0e4) - Bug 1214970 - Don't emit nullptr atoms for class expressions with default constructors. (r=Waldo) (80ae19d6dc) - Bug 1215744 - Unnamed class expressions shouldn't get a name property. (r=arai) (0ce0a96be4) - Bug 1208747 - Move most of Stopwatch-related code to XPCOM-land (JSAPI-level);r=jandem (e28fa2f859) - Bug 1184486 - Let PerformanceStats.jsm play nicer with process-per-tab. r=mconley (f0cf0d0eae) - Bug 1198167 - nsPerformanceStatsService should wait for profile-before-change, not profile-before-shutdown. r=yoric (5ba3c98109) - Bug 1199603 - Don't wait for shutdown to update nsPerformanceStats Telemetry. r=Mossop (110813977b) - Bug 1205154 - Use channel->Open2() in js/xpconnect/src/XPCJSRuntime.cpp (r=sicking) (8efd629889) - Bug 1208747 - Move most of Stopwatch-related code to XPCOM-land (XPCOM-level + XPConnect-level);r=froydnj (a1b1e83549) - with some fixes
341 lines
11 KiB
C++
341 lines
11 KiB
C++
/* -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40; -*- */
|
|
/* 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 "mozilla/Preferences.h"
|
|
#include "mozilla/UniquePtr.h"
|
|
|
|
#include "SharedSurfaceGralloc.h"
|
|
|
|
#include "GLContext.h"
|
|
#include "SharedSurface.h"
|
|
#include "GLLibraryEGL.h"
|
|
#include "mozilla/layers/GrallocTextureClient.h"
|
|
#include "mozilla/layers/ShadowLayers.h"
|
|
|
|
#include "ui/GraphicBuffer.h"
|
|
#include "../layers/ipc/ShadowLayers.h"
|
|
#include "ScopedGLHelpers.h"
|
|
|
|
#include "gfxPlatform.h"
|
|
#include "gfxPrefs.h"
|
|
|
|
#define DEBUG_GRALLOC
|
|
#ifdef DEBUG_GRALLOC
|
|
#define DEBUG_PRINT(...) do { printf_stderr(__VA_ARGS__); } while (0)
|
|
#else
|
|
#define DEBUG_PRINT(...) do { } while (0)
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
namespace gl {
|
|
|
|
using namespace mozilla::layers;
|
|
using namespace android;
|
|
|
|
SurfaceFactory_Gralloc::SurfaceFactory_Gralloc(GLContext* prodGL, const SurfaceCaps& caps,
|
|
const RefPtr<layers::ISurfaceAllocator>& allocator,
|
|
const layers::TextureFlags& flags)
|
|
: SurfaceFactory(SharedSurfaceType::Gralloc, prodGL, caps, allocator, flags)
|
|
{
|
|
MOZ_ASSERT(mAllocator);
|
|
}
|
|
|
|
/*static*/ UniquePtr<SharedSurface_Gralloc>
|
|
SharedSurface_Gralloc::Create(GLContext* prodGL,
|
|
const GLFormats& formats,
|
|
const gfx::IntSize& size,
|
|
bool hasAlpha,
|
|
layers::TextureFlags flags,
|
|
ISurfaceAllocator* allocator)
|
|
{
|
|
GLLibraryEGL* egl = &sEGLLibrary;
|
|
MOZ_ASSERT(egl);
|
|
|
|
UniquePtr<SharedSurface_Gralloc> ret;
|
|
|
|
DEBUG_PRINT("SharedSurface_Gralloc::Create -------\n");
|
|
|
|
if (!HasExtensions(egl, prodGL))
|
|
return Move(ret);
|
|
|
|
gfxContentType type = hasAlpha ? gfxContentType::COLOR_ALPHA
|
|
: gfxContentType::COLOR;
|
|
|
|
typedef GrallocTextureClientOGL ptrT;
|
|
RefPtr<ptrT> grallocTC = new ptrT(allocator,
|
|
gfxPlatform::GetPlatform()->Optimal2DFormatForContent(type),
|
|
gfx::BackendType::NONE, // we don't need to use it with a DrawTarget
|
|
flags);
|
|
|
|
if (!grallocTC->AllocateForGLRendering(size)) {
|
|
return Move(ret);
|
|
}
|
|
|
|
sp<GraphicBuffer> buffer = grallocTC->GetGraphicBuffer();
|
|
|
|
EGLDisplay display = egl->Display();
|
|
EGLClientBuffer clientBuffer = buffer->getNativeBuffer();
|
|
EGLint attrs[] = {
|
|
LOCAL_EGL_NONE, LOCAL_EGL_NONE
|
|
};
|
|
EGLImage image = egl->fCreateImage(display,
|
|
EGL_NO_CONTEXT,
|
|
LOCAL_EGL_NATIVE_BUFFER_ANDROID,
|
|
clientBuffer, attrs);
|
|
if (!image) {
|
|
return Move(ret);
|
|
}
|
|
|
|
prodGL->MakeCurrent();
|
|
GLuint prodTex = 0;
|
|
prodGL->fGenTextures(1, &prodTex);
|
|
ScopedBindTexture autoTex(prodGL, prodTex);
|
|
|
|
prodGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MIN_FILTER, LOCAL_GL_LINEAR);
|
|
prodGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MAG_FILTER, LOCAL_GL_LINEAR);
|
|
prodGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_S, LOCAL_GL_CLAMP_TO_EDGE);
|
|
prodGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_T, LOCAL_GL_CLAMP_TO_EDGE);
|
|
|
|
prodGL->fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, image);
|
|
|
|
egl->fDestroyImage(display, image);
|
|
|
|
ret.reset( new SharedSurface_Gralloc(prodGL, size, hasAlpha, egl,
|
|
allocator, grallocTC,
|
|
prodTex) );
|
|
|
|
DEBUG_PRINT("SharedSurface_Gralloc::Create: success -- surface %p,"
|
|
" GraphicBuffer %p.\n",
|
|
ret.get(), buffer.get());
|
|
|
|
return Move(ret);
|
|
}
|
|
|
|
|
|
SharedSurface_Gralloc::SharedSurface_Gralloc(GLContext* prodGL,
|
|
const gfx::IntSize& size,
|
|
bool hasAlpha,
|
|
GLLibraryEGL* egl,
|
|
layers::ISurfaceAllocator* allocator,
|
|
layers::GrallocTextureClientOGL* textureClient,
|
|
GLuint prodTex)
|
|
: SharedSurface(SharedSurfaceType::Gralloc,
|
|
AttachmentType::GLTexture,
|
|
prodGL,
|
|
size,
|
|
hasAlpha,
|
|
true)
|
|
, mEGL(egl)
|
|
, mSync(0)
|
|
, mAllocator(allocator)
|
|
, mTextureClient(textureClient)
|
|
, mProdTex(prodTex)
|
|
{
|
|
}
|
|
|
|
|
|
bool
|
|
SharedSurface_Gralloc::HasExtensions(GLLibraryEGL* egl, GLContext* gl)
|
|
{
|
|
return egl->HasKHRImageBase() &&
|
|
gl->IsExtensionSupported(GLContext::OES_EGL_image);
|
|
}
|
|
|
|
SharedSurface_Gralloc::~SharedSurface_Gralloc()
|
|
{
|
|
|
|
DEBUG_PRINT("[SharedSurface_Gralloc %p] destroyed\n", this);
|
|
|
|
mGL->MakeCurrent();
|
|
mGL->fDeleteTextures(1, &mProdTex);
|
|
|
|
if (mSync) {
|
|
MOZ_ALWAYS_TRUE( mEGL->fDestroySync(mEGL->Display(), mSync) );
|
|
mSync = 0;
|
|
}
|
|
}
|
|
|
|
void
|
|
SharedSurface_Gralloc::Fence()
|
|
{
|
|
if (mSync) {
|
|
MOZ_ALWAYS_TRUE( mEGL->fDestroySync(mEGL->Display(), mSync) );
|
|
mSync = 0;
|
|
}
|
|
|
|
bool disableSyncFence = false;
|
|
// Disable sync fence on AdrenoTM200.
|
|
// AdrenoTM200's sync fence does not work correctly. See Bug 1022205.
|
|
if (mGL->Renderer() == GLRenderer::AdrenoTM200) {
|
|
disableSyncFence = true;
|
|
}
|
|
|
|
// When Android native fences are available, try
|
|
// them first since they're more likely to work.
|
|
// Android native fences are also likely to perform better.
|
|
if (!disableSyncFence &&
|
|
mEGL->IsExtensionSupported(GLLibraryEGL::ANDROID_native_fence_sync))
|
|
{
|
|
mGL->MakeCurrent();
|
|
EGLSync sync = mEGL->fCreateSync(mEGL->Display(),
|
|
LOCAL_EGL_SYNC_NATIVE_FENCE_ANDROID,
|
|
nullptr);
|
|
if (sync) {
|
|
mGL->fFlush();
|
|
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
|
|
int fenceFd = mEGL->fDupNativeFenceFDANDROID(mEGL->Display(), sync);
|
|
if (fenceFd != -1) {
|
|
mEGL->fDestroySync(mEGL->Display(), sync);
|
|
mTextureClient->SetAcquireFenceHandle(FenceHandle(new FenceHandle::FdObj(fenceFd)));
|
|
} else {
|
|
mSync = sync;
|
|
}
|
|
#else
|
|
mSync = sync;
|
|
#endif
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (!disableSyncFence &&
|
|
mEGL->IsExtensionSupported(GLLibraryEGL::KHR_fence_sync))
|
|
{
|
|
mGL->MakeCurrent();
|
|
mSync = mEGL->fCreateSync(mEGL->Display(),
|
|
LOCAL_EGL_SYNC_FENCE,
|
|
nullptr);
|
|
if (mSync) {
|
|
mGL->fFlush();
|
|
return;
|
|
}
|
|
}
|
|
|
|
// We should be able to rely on genlock write locks/read locks.
|
|
// But they're broken on some configs, and even a glFinish doesn't
|
|
// work. glReadPixels seems to, though.
|
|
if (gfxPrefs::GrallocFenceWithReadPixels()) {
|
|
mGL->MakeCurrent();
|
|
UniquePtr<char[]> buf = MakeUnique<char[]>(4);
|
|
mGL->fReadPixels(0, 0, 1, 1, LOCAL_GL_RGBA, LOCAL_GL_UNSIGNED_BYTE, buf.get());
|
|
}
|
|
}
|
|
|
|
bool
|
|
SharedSurface_Gralloc::WaitSync()
|
|
{
|
|
if (!mSync) {
|
|
// We must not be needed.
|
|
return true;
|
|
}
|
|
MOZ_ASSERT(mEGL->IsExtensionSupported(GLLibraryEGL::KHR_fence_sync));
|
|
|
|
EGLint status = mEGL->fClientWaitSync(mEGL->Display(),
|
|
mSync,
|
|
0,
|
|
LOCAL_EGL_FOREVER);
|
|
|
|
if (status != LOCAL_EGL_CONDITION_SATISFIED) {
|
|
return false;
|
|
}
|
|
|
|
MOZ_ALWAYS_TRUE( mEGL->fDestroySync(mEGL->Display(), mSync) );
|
|
mSync = 0;
|
|
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
SharedSurface_Gralloc::PollSync()
|
|
{
|
|
if (!mSync) {
|
|
// We must not be needed.
|
|
return true;
|
|
}
|
|
MOZ_ASSERT(mEGL->IsExtensionSupported(GLLibraryEGL::KHR_fence_sync));
|
|
|
|
EGLint status = 0;
|
|
MOZ_ALWAYS_TRUE( mEGL->fGetSyncAttrib(mEGL->Display(),
|
|
mSync,
|
|
LOCAL_EGL_SYNC_STATUS_KHR,
|
|
&status) );
|
|
if (status != LOCAL_EGL_SIGNALED_KHR) {
|
|
return false;
|
|
}
|
|
|
|
MOZ_ALWAYS_TRUE( mEGL->fDestroySync(mEGL->Display(), mSync) );
|
|
mSync = 0;
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
SharedSurface_Gralloc::WaitForBufferOwnership()
|
|
{
|
|
mTextureClient->WaitForBufferOwnership();
|
|
}
|
|
|
|
bool
|
|
SharedSurface_Gralloc::ToSurfaceDescriptor(layers::SurfaceDescriptor* const out_descriptor)
|
|
{
|
|
mTextureClient->MarkShared();
|
|
return mTextureClient->ToSurfaceDescriptor(*out_descriptor);
|
|
}
|
|
|
|
bool
|
|
SharedSurface_Gralloc::ReadbackBySharedHandle(gfx::DataSourceSurface* out_surface)
|
|
{
|
|
MOZ_ASSERT(out_surface);
|
|
sp<GraphicBuffer> buffer = mTextureClient->GetGraphicBuffer();
|
|
|
|
const uint8_t* grallocData = nullptr;
|
|
auto result = buffer->lock(
|
|
GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_NEVER,
|
|
const_cast<void**>(reinterpret_cast<const void**>(&grallocData))
|
|
);
|
|
|
|
if (result == BAD_VALUE) {
|
|
return false;
|
|
}
|
|
|
|
gfx::DataSourceSurface::ScopedMap map(out_surface, gfx::DataSourceSurface::WRITE);
|
|
if (!map.IsMapped()) {
|
|
buffer->unlock();
|
|
return false;
|
|
}
|
|
|
|
uint32_t stride = buffer->getStride() * android::bytesPerPixel(buffer->getPixelFormat());
|
|
uint32_t height = buffer->getHeight();
|
|
uint32_t width = buffer->getWidth();
|
|
for (uint32_t i = 0; i < height; i++) {
|
|
memcpy(map.GetData() + i * map.GetStride(),
|
|
grallocData + i * stride, width * 4);
|
|
}
|
|
|
|
buffer->unlock();
|
|
|
|
android::PixelFormat srcFormat = buffer->getPixelFormat();
|
|
MOZ_ASSERT(srcFormat == PIXEL_FORMAT_RGBA_8888 ||
|
|
srcFormat == PIXEL_FORMAT_BGRA_8888 ||
|
|
srcFormat == PIXEL_FORMAT_RGBX_8888);
|
|
bool isSrcRGB = srcFormat == PIXEL_FORMAT_RGBA_8888 ||
|
|
srcFormat == PIXEL_FORMAT_RGBX_8888;
|
|
|
|
gfx::SurfaceFormat destFormat = out_surface->GetFormat();
|
|
MOZ_ASSERT(destFormat == gfx::SurfaceFormat::R8G8B8X8 ||
|
|
destFormat == gfx::SurfaceFormat::R8G8B8A8 ||
|
|
destFormat == gfx::SurfaceFormat::B8G8R8X8 ||
|
|
destFormat == gfx::SurfaceFormat::B8G8R8A8);
|
|
bool isDestRGB = destFormat == gfx::SurfaceFormat::R8G8B8X8 ||
|
|
destFormat == gfx::SurfaceFormat::R8G8B8A8;
|
|
|
|
if (isSrcRGB != isDestRGB) {
|
|
SwapRAndBComponents(out_surface);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
} // namespace gl
|
|
} // namespace mozilla
|