mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
8a0a002cf2
- Bug 1148708: Add missing 'override' annotations in DocAccessibleChild.h. rs=ehsan (d606358545)
- Bug 1210408 - make nsMaiInterfaceAction work with proxies, r=tbsaunde (f7c819c6ae)
- Bug 1210407 - teach nsMaiInterfaceTable to use proxies, r=tbsaunde (4ca4f10b5f)
- bug 1185157 make sure we don't send an event to a destroyed ipc document r=billm (23acf53f75)
- bug 1214864 - make SetCarretOffset() async r=davidb (e3079e9b2d)
- missing of Bug 1139972 - IPC Proxy for charAt, r=tbsaunde (e9593ed752)
- bug 1191598 - Pass MOZ_CURRENT_PROJECT in environment when running post-build automation steps for universal mac builds. r=gps (fc342c6ced)
- Bug 1164596 - Add mach android-emulator command; r=ahal (afeb9b27d1)
- Bug 1223149 - Add basic usage documentation for mach build; r=glandium (bfb802d175)
- Bug 1182301 - Improve 'mach build' notifications. r=gps (2c65a122d1)
- Bug 1184696 - Add clobber targets to |mach clobber|; Ability to clobber compiled python files, r=gps (35d8be292e)
- Bug 1117958 - Allow any debugging options to the run or gtest mach subcommands to automatically enable debugging. r=gps (32f986af4b)
- Bug 1180081 - Properly rebuild gtest/libxul before running gtests. r=gps (80db9a3d49)
- Bug 1171647, part 1 - Define a new function to convert the mode to a string. r=njn (61ad16f5ba)
- Bug 1171647, part 2 - Remove redundant assertion for dark matter mode. r=njn (b5ac9519f3)
- Bug 1058178, part 1 - Implement DMD heap scanning mode. r=njn (60e1079536)
- Bug 1058178, part 2 - Implement address clamping analysis for DMD scan logs. r=njn (45c0326b93)
- Bug 1102388 - Fix DMD static constructor ordering dependency. r=mccr8 (59b87897a1)
- Bug 1128705 - Don't redefine PAGE_SIZE in DMD if it's already defined. r=erahm (49216348ee)
- Bug 1179042 - Add a script for analyzing memory blocks using a heap scan DMD log. r=njn DONTBUILD (1c08d2d66e)
- Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat (1c999d139b)
- Bug 1158772 - fix non-idiomatic memset call in nsDeque.cpp; r=erahm (de6b555245)
- Bug 1199400 - Part 1: Use CheckedInt when growing nsDeque capacity. r=froydnj (dfdf6814a3)
- Bug 1199400 - Part 0: Remove unused nsDequeIterator. r=froydnj (38d69d7f47)
- Bug 1199400 - Part 2: Add tests for possible nsDeque corner cases. r=froydnj (931baff195)
- Bug 1201997 - Part 1 - Converted compiled test to gtest for nsDeque class. Added tests to test untested methods. r=froydn (e893916651)
- Bug 1201997 - Part 2 - Removing unused methods from the nsDeque class. r=froydn (41595a90ac)
- Bug 1201997 - Part 3 - Make internally used methods private. r=froydn (8cd3afd96f)
- Bug 1201997 - Part 4 - Change size and offset variables to size_t.r=froydn (73eabc8d60)
- Bug 1215140 P1 Add an nsIConsoleReportCollector interface to support navigation channel logging. r=bz (8a41535e2b)
- Bug 1215140 P2 Make HttpBaseChannel implement nsIConsoleReportCollector. r=bz (75fca301f2)
- Bug 1197679 - If nsUnknownDecoder is involved in e10s DivertToParent can break. r=jduell (5d94a12504)
- Bug 1178991 - smartptr for http converter r=hurley (8e7fbc8443)
- bug 366559 - patch 2, fix nsHTTPCompressConv indentation r=bagder (ba762da587)
- bug 366559 - patch 3, fix nsHTTPCompressConv bracing style r=bagder (54195ab451)
- bits of bug 366559 - patch 7, content-encoding brotli for http (f0b4051022)
- Bug 1205112 - Make PushEvent.data nullable. r=mt,smaug (775db32856)
- Bug 1193414 - SharedWorkers thread should be kept alive also when the SharedWorker object is CCed, r=khuey (b77ea8125c)
- Bug 1206520: Add about:config prefs to enable throwing on asm.js validation failures; r=bz (c42126665d)
- Bug 1193414 - Telemetry for SharedWorker spawning. r=bkelly (77984b7bcc)
- Bug 1205676 - Enable WPT service-worker/unregister-then-register-new-script.https.html in e10s, r=nsm (ec24939cf6)
- Bug 1193133 - Throw when calling postMessage from a Service Worker dom object with no global. r=bkelly (526dcacfab)
- Bug 1181871 P1 Only enforce Cache Context shared data destruction on target thread after init. r=ehsan (cdbf3ed3a8)
- Bug 1181871 P2 Fix ServiceWorkerManager usage of stack-based ErrorResult. r=ehsan (c449195d90)
- minor cleanup and missing bit of 1198230 (02f459db05)
- Bug 1143717 - Implement the ServiceWorkerMessageEvent interface. r=baku (027b3465f2)
- fix misspatch (708eee4e84)
- Bug 1188545 - Disentangle service workers from shared workers and refactor event dispatching code into a separate class. r=nsm,mrbkap (fb5b5341c9)
- Bug 1205228 - Change PackagedAppVerifier to notify the verification result asynchronously. r=valentin. (9edda0fa00)
- Bug 1178518 - Packaged App Utils. r=valentin (f60f3b7a93)
- Bug 1213150 - Part 1: Add a nsContentUtils::IsNonSubresourceRequest helper; r=jdm (b509cc3cc9)
- Bug 1213150 - Part 2: Rework ShouldPrepareForIntercept() in terms of subresource requests; r=jdm (2e92fe8780)
- Bug 1213150 - Part 3: Remove nsIInterceptedChannel.isNavigation; r=jdm (becf1cc12f)
- Bug 1213150 follow-up: fix build bustage (8d73d6ca73)
- Bug 1198394 - Part 1: Allow interception of HSTS upgraded connections in non-e10s mode; r=mcmanus (f504c5be08)
- Bug 1198394 - Part 2: Add a test for interception of HSTS upgraded connections; r=jdm (054e984eef)
- Bug 1187011 - Don't allow response body with null body status. r=bkelly (b1860741d1)
- missing bit of 1140788 (29d319712e)
- Bug 1213436 - Reject core dumps with node IDs that don't fit in an IEEE 754 double; r=sfink (3c1f6fdda0)
- Bug 1211006 - Add Debugger.Source.prototype.canonicalId; r=ejpbruel (eef7b79fce)
- Bug 1199218 - Implement JS::ubi::Node::size for js::LazyScript referents; r=sfink (098a48d240)
- Bug 1220031 - Add JS::ubi::Node::scriptFilename; r=sfink (6b824ae680)
- Bug 1143575. Remove unused MediaQueue::Empty. r=cpearce (de737f3433)
- Bug 1209933 - Make sure all parent runtime pointers are the topmost parent, r=billm. (fe824d967d)
- Bug 1197012 - Fix ThrowTypeError in Notification. r=mccr8 (0b1a097526)
- Bug 1197893 - Check the number of arguments for ThrowTypeError() and ThrowRangeError() at compile time. r=peterv (d98c7d78a0)
- Bug 1142083 - Add test for IDN Unicode domain redirect. r=mcmanus (0c8961fe17)
- Bug 1187159 - Add mochitest for loading packaged apps (iframe+fetch+mozapp) r=jduell (ce90ea561b)
- Bug 1186290 - Notify TabParent to switch process when loading a signed package. r=honzab, r=kanru. (c58a14554a)
- fix (15e2df75eb)
- Bug 1206124 P1 Fix "same-origin" CORS credentials in FetchDriver. r=ehsan (fae1bb6ab3)
- Bug 1206124 P2 Test fetch() with credentials and redirects. r=ehsan (ffc6254112)
- Bug 1211751: Remove nsIChannelEventSink-forwarding from EventSource and FetchDriver. It's never needed. r=smaug (adafe5737a)
- Bug 1212433 Fail fetch() calls that require preflight and also redirect. r=sicking a=abillings (c0d6742b9e)
- Bug 1193128 - Fix base64 decoding when fetching data URIs. r=baku (80bafa291a)
- Bug 1195167 part 1: Let necko handle all protocols. r=bkelly (bb932b0ada)
- Bug 1195167 part 2: Remove redundant aCORSFlag argument and instead use mCORSFlagEverSet. r=bkelly (beadafcad0)
- Bug 1195167 part 3: Remove more scheme-specific handling from FetchDriver. r=bkelly (d00b38db9e)
- Bug 1195167 part 4: Remove FetchDriver::BasicFetch since it is empty. r=bkelly (c5ed097267)
- Bug 1210413 P2 Test CORS credentials on cross-origin redirects. r=sicking a=dveditz (b4eeb8aac0)
- Bug 1210413 P1 Propagate new channel load flags from child to parent on redirect. r=jduell a=dveditz (8b329af4fa)
- Bug 1195167 part 5: Make FetchDriver use AsyncOpen2. r=bkelly (cc217c4cc1)
- Bug 1195167 part 6: Some code simplification since necko handles fetch recursion. r=bkelly (f3b6da2262)
- Bug 1195167: Followup to fix test which I forgot to change (81e7439a2e)
- Bug 1215746: Remove RequestMode::Cors_with_forced_preflight. r=bkelly (0336e812b6)
- Bug 1211000: Move CORS preflight logic from nsCORSListenerProxy to nsCORSPreflightListener. r=ehsan (bf2f71cf22)
- missing bit of Bug 1211443 - Drop scheduled update if decoder initialization isn't done yet. r=jya (f6bc074e33)
- Bug 1182571: Fix nsILoadInfo->GetContentPolicyType API to be less ambigious. Audit and fix all users of it. r=ckerschb (5af6fa7442)
- fix (e40c8e7625)
- Bug 1173811 - Part 1: Propagate the response URL to intercepted channels when necessary (non-e10s). r=mayhemer,bkelly (26f4f13c28)
- Bug 1173811 - Part 2: Propagate the response URL to intercepted channels when necessary (e10s). r=mayhemer,bkelly (a603fe1df2)
- Bug 1154309 - Add New Resource Timing Fields r=bz,hurley (1d14eb6bef)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (a5d18bb637)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (fb07d2c8aa)
- Bug 1212904 P1 Add a LoadTainting enumeration. r=jduell (a1db8a3e99)
- Bug 1212904 P2 Add LoadTainting information to nsILoadInfo. r=jduell (2482e5e334)
- Bug 1221151 - use [infallible] in nsILoadInfo.idl instead of manual %{C++ blocks; r=jduell (aae73129b6)
- Bug 1045891 - CSP 2 child-src implementation r=ckerschb (792920aeb9)
- Bug 1219931 - CSP: Don't allow removing a policy (r=sicking) (9daaab4186)
- Bug 1208661 - Dump client-side layer textures. r=BenWa (1f2d17d515)
757 lines
18 KiB
C++
757 lines
18 KiB
C++
/*
|
|
* Copyright (C) 2013-2015 Mozilla Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "TestGonkCameraHardware.h"
|
|
#include "CameraPreferences.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "mozilla/dom/EventListenerBinding.h"
|
|
#include "mozilla/dom/BlobEvent.h"
|
|
#include "mozilla/dom/ErrorEvent.h"
|
|
#include "mozilla/dom/CameraFacesDetectedEvent.h"
|
|
#include "mozilla/dom/CameraStateChangeEvent.h"
|
|
#include "nsNetUtil.h"
|
|
#include "DOMCameraDetectedFace.h"
|
|
#include "nsServiceManagerUtils.h"
|
|
#include "nsICameraTestHardware.h"
|
|
|
|
using namespace android;
|
|
using namespace mozilla;
|
|
using namespace mozilla::dom;
|
|
|
|
#ifndef MOZ_WIDGET_GONK
|
|
NS_IMPL_ISUPPORTS_INHERITED0(TestGonkCameraHardware, GonkCameraHardware);
|
|
#endif
|
|
|
|
static void
|
|
CopyFaceFeature(int32_t (&aDst)[2], bool aExists, const DOMPoint* aSrc)
|
|
{
|
|
if (aExists && aSrc) {
|
|
aDst[0] = static_cast<int32_t>(aSrc->X());
|
|
aDst[1] = static_cast<int32_t>(aSrc->Y());
|
|
} else {
|
|
aDst[0] = -2000;
|
|
aDst[1] = -2000;
|
|
}
|
|
}
|
|
|
|
class TestGonkCameraHardwareListener : public nsIDOMEventListener
|
|
{
|
|
public:
|
|
NS_DECL_ISUPPORTS
|
|
NS_DECL_NSIDOMEVENTLISTENER
|
|
|
|
TestGonkCameraHardwareListener(nsGonkCameraControl* aTarget, nsIThread* aCameraThread)
|
|
: mTarget(aTarget)
|
|
, mCameraThread(aCameraThread)
|
|
{
|
|
MOZ_COUNT_CTOR(TestGonkCameraHardwareListener);
|
|
}
|
|
|
|
protected:
|
|
virtual ~TestGonkCameraHardwareListener()
|
|
{
|
|
MOZ_COUNT_DTOR(TestGonkCameraHardwareListener);
|
|
}
|
|
|
|
RefPtr<nsGonkCameraControl> mTarget;
|
|
nsCOMPtr<nsIThread> mCameraThread;
|
|
};
|
|
|
|
NS_IMETHODIMP
|
|
TestGonkCameraHardwareListener::HandleEvent(nsIDOMEvent* aEvent)
|
|
{
|
|
nsString eventType;
|
|
aEvent->GetType(eventType);
|
|
|
|
DOM_CAMERA_LOGI("Inject '%s' event",
|
|
NS_ConvertUTF16toUTF8(eventType).get());
|
|
|
|
if (eventType.EqualsLiteral("focus")) {
|
|
CameraStateChangeEvent* event = aEvent->InternalDOMEvent()->AsCameraStateChangeEvent();
|
|
|
|
if (!NS_WARN_IF(!event)) {
|
|
nsString state;
|
|
|
|
event->GetNewState(state);
|
|
if (state.EqualsLiteral("focused")) {
|
|
OnAutoFocusComplete(mTarget, true);
|
|
} else if (state.EqualsLiteral("unfocused")) {
|
|
OnAutoFocusComplete(mTarget, false);
|
|
} else if (state.EqualsLiteral("focusing")) {
|
|
OnAutoFocusMoving(mTarget, true);
|
|
} else if (state.EqualsLiteral("not_focusing")) {
|
|
OnAutoFocusMoving(mTarget, false);
|
|
} else {
|
|
DOM_CAMERA_LOGE("Unhandled focus state '%s'\n",
|
|
NS_ConvertUTF16toUTF8(state).get());
|
|
}
|
|
}
|
|
} else if (eventType.EqualsLiteral("shutter")) {
|
|
DOM_CAMERA_LOGI("Inject shutter event");
|
|
OnShutter(mTarget);
|
|
} else if (eventType.EqualsLiteral("picture")) {
|
|
BlobEvent* event = aEvent->InternalDOMEvent()->AsBlobEvent();
|
|
|
|
if (!NS_WARN_IF(!event)) {
|
|
Blob* blob = event->GetData();
|
|
|
|
if (blob) {
|
|
static const uint64_t MAX_FILE_SIZE = 2147483647;
|
|
|
|
ErrorResult rv;
|
|
uint64_t dataLength = blob->GetSize(rv);
|
|
|
|
if (NS_WARN_IF(rv.Failed()) || NS_WARN_IF(dataLength > MAX_FILE_SIZE)) {
|
|
rv.SuppressException();
|
|
return NS_OK;
|
|
}
|
|
|
|
nsCOMPtr<nsIInputStream> inputStream;
|
|
blob->GetInternalStream(getter_AddRefs(inputStream), rv);
|
|
if (NS_WARN_IF(rv.Failed())) {
|
|
rv.SuppressException();
|
|
return NS_OK;
|
|
}
|
|
|
|
uint8_t* data = new uint8_t[dataLength];
|
|
rv = NS_ReadInputStreamToBuffer(inputStream,
|
|
reinterpret_cast<void**>(&data),
|
|
static_cast<uint32_t>(dataLength));
|
|
if (NS_WARN_IF(rv.Failed())) {
|
|
rv.SuppressException();
|
|
delete [] data;
|
|
return NS_OK;
|
|
}
|
|
|
|
OnTakePictureComplete(mTarget, data, dataLength);
|
|
delete [] data;
|
|
} else {
|
|
OnTakePictureComplete(mTarget, nullptr, 0);
|
|
}
|
|
}
|
|
} else if(eventType.EqualsLiteral("error")) {
|
|
ErrorEvent* event = aEvent->InternalDOMEvent()->AsErrorEvent();
|
|
|
|
if (!NS_WARN_IF(!event)) {
|
|
nsString errorType;
|
|
|
|
event->GetMessage(errorType);
|
|
if (errorType.EqualsLiteral("picture")) {
|
|
OnTakePictureError(mTarget);
|
|
} else if (errorType.EqualsLiteral("system")) {
|
|
if (!NS_WARN_IF(!mCameraThread)) {
|
|
class DeferredSystemFailure : public nsRunnable
|
|
{
|
|
public:
|
|
DeferredSystemFailure(nsGonkCameraControl* aTarget)
|
|
: mTarget(aTarget)
|
|
{ }
|
|
|
|
NS_IMETHODIMP
|
|
Run()
|
|
{
|
|
OnSystemError(mTarget, CameraControlListener::kSystemService, 100, 0);
|
|
return NS_OK;
|
|
}
|
|
|
|
protected:
|
|
RefPtr<nsGonkCameraControl> mTarget;
|
|
};
|
|
|
|
mCameraThread->Dispatch(new DeferredSystemFailure(mTarget), NS_DISPATCH_NORMAL);
|
|
}
|
|
} else {
|
|
DOM_CAMERA_LOGE("Unhandled error event type '%s'\n",
|
|
NS_ConvertUTF16toUTF8(errorType).get());
|
|
}
|
|
}
|
|
} else if(eventType.EqualsLiteral("facesdetected")) {
|
|
CameraFacesDetectedEvent* event = aEvent->InternalDOMEvent()->AsCameraFacesDetectedEvent();
|
|
|
|
if (!NS_WARN_IF(!event)) {
|
|
Nullable<nsTArray<RefPtr<DOMCameraDetectedFace>>> faces;
|
|
event->GetFaces(faces);
|
|
|
|
camera_frame_metadata_t metadata;
|
|
memset(&metadata, 0, sizeof(metadata));
|
|
|
|
if (faces.IsNull()) {
|
|
OnFacesDetected(mTarget, &metadata);
|
|
} else {
|
|
const nsTArray<RefPtr<DOMCameraDetectedFace>>& facesData = faces.Value();
|
|
uint32_t i = facesData.Length();
|
|
|
|
metadata.number_of_faces = i;
|
|
metadata.faces = new camera_face_t[i];
|
|
memset(metadata.faces, 0, sizeof(camera_face_t) * i);
|
|
|
|
while (i > 0) {
|
|
--i;
|
|
const RefPtr<DOMCameraDetectedFace>& face = facesData[i];
|
|
camera_face_t& f = metadata.faces[i];
|
|
const DOMRect& bounds = *face->Bounds();
|
|
f.rect[0] = static_cast<int32_t>(bounds.Left());
|
|
f.rect[1] = static_cast<int32_t>(bounds.Top());
|
|
f.rect[2] = static_cast<int32_t>(bounds.Right());
|
|
f.rect[3] = static_cast<int32_t>(bounds.Bottom());
|
|
CopyFaceFeature(f.left_eye, face->HasLeftEye(), face->GetLeftEye());
|
|
CopyFaceFeature(f.right_eye, face->HasRightEye(), face->GetRightEye());
|
|
CopyFaceFeature(f.mouth, face->HasMouth(), face->GetMouth());
|
|
f.id = face->Id();
|
|
f.score = face->Score();
|
|
}
|
|
|
|
OnFacesDetected(mTarget, &metadata);
|
|
delete [] metadata.faces;
|
|
}
|
|
}
|
|
} else {
|
|
DOM_CAMERA_LOGE("Unhandled injected event '%s'",
|
|
NS_ConvertUTF16toUTF8(eventType).get());
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(TestGonkCameraHardwareListener, nsIDOMEventListener)
|
|
|
|
class TestGonkCameraHardware::ControlMessage : public nsRunnable
|
|
{
|
|
public:
|
|
ControlMessage(TestGonkCameraHardware* aTestHw)
|
|
: mTestHw(aTestHw)
|
|
{ }
|
|
|
|
NS_IMETHOD
|
|
Run() override
|
|
{
|
|
if (NS_WARN_IF(!mTestHw)) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
|
|
MutexAutoLock lock(mTestHw->mMutex);
|
|
|
|
mTestHw->mStatus = RunInline();
|
|
nsresult rv = mTestHw->mCondVar.Notify();
|
|
NS_WARN_IF(NS_FAILED(rv));
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
RunInline()
|
|
{
|
|
if (NS_WARN_IF(!mTestHw)) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
|
|
nsresult rv;
|
|
mJSTestWrapper = do_GetService("@mozilla.org/cameratesthardware;1", &rv);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
DOM_CAMERA_LOGE("Cannot get camera test service\n");
|
|
return rv;
|
|
}
|
|
|
|
rv = RunImpl();
|
|
mJSTestWrapper = nullptr;
|
|
return rv;
|
|
}
|
|
|
|
protected:
|
|
NS_IMETHOD RunImpl() = 0;
|
|
virtual ~ControlMessage() { }
|
|
|
|
nsCOMPtr<nsICameraTestHardware> mJSTestWrapper;
|
|
|
|
/* Since we block the control thread until we have finished
|
|
processing the request on the main thread, we know that this
|
|
pointer will not go out of scope because the control thread
|
|
and calling class is the owner. */
|
|
TestGonkCameraHardware* mTestHw;
|
|
};
|
|
|
|
TestGonkCameraHardware::TestGonkCameraHardware(nsGonkCameraControl* aTarget,
|
|
uint32_t aCameraId,
|
|
const sp<Camera>& aCamera)
|
|
: GonkCameraHardware(aTarget, aCameraId, aCamera)
|
|
, mMutex("TestGonkCameraHardware::mMutex")
|
|
, mCondVar(mMutex, "TestGonkCameraHardware::mCondVar")
|
|
{
|
|
DOM_CAMERA_LOGA("v===== Created TestGonkCameraHardware =====v\n");
|
|
DOM_CAMERA_LOGT("%s:%d : this=%p (aTarget=%p)\n",
|
|
__func__, __LINE__, this, aTarget);
|
|
MOZ_COUNT_CTOR(TestGonkCameraHardware);
|
|
mCameraThread = NS_GetCurrentThread();
|
|
}
|
|
|
|
TestGonkCameraHardware::~TestGonkCameraHardware()
|
|
{
|
|
MOZ_COUNT_DTOR(TestGonkCameraHardware);
|
|
|
|
class Delegate : public ControlMessage
|
|
{
|
|
public:
|
|
Delegate(TestGonkCameraHardware* aTestHw)
|
|
: ControlMessage(aTestHw)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
if (mTestHw->mDomListener) {
|
|
mTestHw->mDomListener = nullptr;
|
|
nsresult rv = mJSTestWrapper->SetHandler(nullptr);
|
|
NS_WARN_IF(NS_FAILED(rv));
|
|
}
|
|
return NS_OK;
|
|
}
|
|
};
|
|
|
|
nsresult rv = WaitWhileRunningOnMainThread(new Delegate(this));
|
|
NS_WARN_IF(NS_FAILED(rv));
|
|
DOM_CAMERA_LOGA("^===== Destroyed TestGonkCameraHardware =====^\n");
|
|
}
|
|
|
|
nsresult
|
|
TestGonkCameraHardware::WaitWhileRunningOnMainThread(RefPtr<ControlMessage> aRunnable)
|
|
{
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
if (NS_WARN_IF(!aRunnable)) {
|
|
mStatus = NS_ERROR_INVALID_ARG;
|
|
} else if (!NS_IsMainThread()) {
|
|
nsresult rv = NS_DispatchToMainThread(aRunnable);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
rv = mCondVar.Wait();
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
} else {
|
|
/* Cannot dispatch to main thread since we would block on
|
|
the condvar, so we need to run inline. */
|
|
mStatus = aRunnable->RunInline();
|
|
}
|
|
return mStatus;
|
|
}
|
|
|
|
nsresult
|
|
TestGonkCameraHardware::Init()
|
|
{
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
|
|
class Delegate : public ControlMessage
|
|
{
|
|
public:
|
|
Delegate(TestGonkCameraHardware* aTestHw)
|
|
: ControlMessage(aTestHw)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
nsresult rv = mJSTestWrapper->InitCamera();
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
mTestHw->mDomListener = new TestGonkCameraHardwareListener(mTestHw->mTarget, mTestHw->mCameraThread);
|
|
if (NS_WARN_IF(!mTestHw->mDomListener)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
rv = mJSTestWrapper->SetHandler(mTestHw->mDomListener);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
};
|
|
|
|
nsresult rv = WaitWhileRunningOnMainThread(new Delegate(this));
|
|
NS_WARN_IF(NS_FAILED(rv));
|
|
return rv;
|
|
}
|
|
|
|
int
|
|
TestGonkCameraHardware::AutoFocus()
|
|
{
|
|
class Delegate : public ControlMessage
|
|
{
|
|
public:
|
|
Delegate(TestGonkCameraHardware* aTestHw)
|
|
: ControlMessage(aTestHw)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
return mJSTestWrapper->AutoFocus();
|
|
}
|
|
};
|
|
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
nsresult rv = WaitWhileRunningOnMainThread(new Delegate(this));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return UNKNOWN_ERROR;
|
|
}
|
|
return OK;
|
|
}
|
|
|
|
int
|
|
TestGonkCameraHardware::CancelAutoFocus()
|
|
{
|
|
class Delegate : public ControlMessage
|
|
{
|
|
public:
|
|
Delegate(TestGonkCameraHardware* aTestHw)
|
|
: ControlMessage(aTestHw)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
return mJSTestWrapper->CancelAutoFocus();
|
|
}
|
|
};
|
|
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
nsresult rv = WaitWhileRunningOnMainThread(new Delegate(this));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return UNKNOWN_ERROR;
|
|
}
|
|
return OK;
|
|
}
|
|
|
|
int
|
|
TestGonkCameraHardware::StartFaceDetection()
|
|
{
|
|
class Delegate : public ControlMessage
|
|
{
|
|
public:
|
|
Delegate(TestGonkCameraHardware* aTestHw)
|
|
: ControlMessage(aTestHw)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
return mJSTestWrapper->StartFaceDetection();
|
|
}
|
|
};
|
|
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
nsresult rv = WaitWhileRunningOnMainThread(new Delegate(this));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return UNKNOWN_ERROR;
|
|
}
|
|
return OK;
|
|
}
|
|
|
|
int
|
|
TestGonkCameraHardware::StopFaceDetection()
|
|
{
|
|
class Delegate : public ControlMessage
|
|
{
|
|
public:
|
|
Delegate(TestGonkCameraHardware* aTestHw)
|
|
: ControlMessage(aTestHw)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
return mJSTestWrapper->StopFaceDetection();
|
|
}
|
|
};
|
|
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
nsresult rv = WaitWhileRunningOnMainThread(new Delegate(this));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return UNKNOWN_ERROR;
|
|
}
|
|
return OK;
|
|
}
|
|
|
|
int
|
|
TestGonkCameraHardware::TakePicture()
|
|
{
|
|
class Delegate : public ControlMessage
|
|
{
|
|
public:
|
|
Delegate(TestGonkCameraHardware* aTestHw)
|
|
: ControlMessage(aTestHw)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
return mJSTestWrapper->TakePicture();
|
|
}
|
|
};
|
|
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
nsresult rv = WaitWhileRunningOnMainThread(new Delegate(this));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return UNKNOWN_ERROR;
|
|
}
|
|
return OK;
|
|
}
|
|
|
|
void
|
|
TestGonkCameraHardware::CancelTakePicture()
|
|
{
|
|
class Delegate : public ControlMessage
|
|
{
|
|
public:
|
|
Delegate(TestGonkCameraHardware* aTestHw)
|
|
: ControlMessage(aTestHw)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
return mJSTestWrapper->CancelTakePicture();
|
|
}
|
|
};
|
|
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
nsresult rv = WaitWhileRunningOnMainThread(new Delegate(this));
|
|
NS_WARN_IF(NS_FAILED(rv));
|
|
}
|
|
|
|
int
|
|
TestGonkCameraHardware::StartPreview()
|
|
{
|
|
class Delegate : public ControlMessage
|
|
{
|
|
public:
|
|
Delegate(TestGonkCameraHardware* aTestHw)
|
|
: ControlMessage(aTestHw)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
return mJSTestWrapper->StartPreview();
|
|
}
|
|
};
|
|
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
nsresult rv = WaitWhileRunningOnMainThread(new Delegate(this));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return UNKNOWN_ERROR;
|
|
}
|
|
return OK;
|
|
}
|
|
|
|
void
|
|
TestGonkCameraHardware::StopPreview()
|
|
{
|
|
class Delegate : public ControlMessage
|
|
{
|
|
public:
|
|
Delegate(TestGonkCameraHardware* aTestHw)
|
|
: ControlMessage(aTestHw)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
return mJSTestWrapper->StopPreview();
|
|
}
|
|
};
|
|
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
nsresult rv = WaitWhileRunningOnMainThread(new Delegate(this));
|
|
NS_WARN_IF(NS_FAILED(rv));
|
|
}
|
|
|
|
class TestGonkCameraHardware::PushParametersDelegate : public ControlMessage
|
|
{
|
|
public:
|
|
PushParametersDelegate(TestGonkCameraHardware* aTestHw, String8* aParams)
|
|
: ControlMessage(aTestHw)
|
|
, mParams(aParams)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
if (NS_WARN_IF(!mParams)) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
|
|
DOM_CAMERA_LOGI("Push test parameters: %s\n", mParams->string());
|
|
return mJSTestWrapper->PushParameters(NS_ConvertASCIItoUTF16(mParams->string()));
|
|
}
|
|
|
|
String8* mParams;
|
|
};
|
|
|
|
class TestGonkCameraHardware::PullParametersDelegate : public ControlMessage
|
|
{
|
|
public:
|
|
PullParametersDelegate(TestGonkCameraHardware* aTestHw, nsString* aParams)
|
|
: ControlMessage(aTestHw)
|
|
, mParams(aParams)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
if (NS_WARN_IF(!mParams)) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
|
|
nsresult rv = mJSTestWrapper->PullParameters(*mParams);
|
|
DOM_CAMERA_LOGI("Pull test parameters: %s\n",
|
|
NS_LossyConvertUTF16toASCII(*mParams).get());
|
|
return rv;
|
|
}
|
|
|
|
nsString* mParams;
|
|
};
|
|
|
|
int
|
|
TestGonkCameraHardware::PushParameters(const GonkCameraParameters& aParams)
|
|
{
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
String8 s = aParams.Flatten();
|
|
nsresult rv = WaitWhileRunningOnMainThread(new PushParametersDelegate(this, &s));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return UNKNOWN_ERROR;
|
|
}
|
|
return OK;
|
|
}
|
|
|
|
nsresult
|
|
TestGonkCameraHardware::PullParameters(GonkCameraParameters& aParams)
|
|
{
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
nsString as;
|
|
nsresult rv = WaitWhileRunningOnMainThread(new PullParametersDelegate(this, &as));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
String8 s(NS_LossyConvertUTF16toASCII(as).get());
|
|
aParams.Unflatten(s);
|
|
return NS_OK;
|
|
}
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
int
|
|
TestGonkCameraHardware::PushParameters(const CameraParameters& aParams)
|
|
{
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
String8 s = aParams.flatten();
|
|
nsresult rv = WaitWhileRunningOnMainThread(new PushParametersDelegate(this, &s));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return UNKNOWN_ERROR;
|
|
}
|
|
return OK;
|
|
}
|
|
|
|
void
|
|
TestGonkCameraHardware::PullParameters(CameraParameters& aParams)
|
|
{
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
nsString as;
|
|
nsresult rv = WaitWhileRunningOnMainThread(new PullParametersDelegate(this, &as));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
as.Truncate();
|
|
}
|
|
|
|
String8 s(NS_LossyConvertUTF16toASCII(as).get());
|
|
aParams.unflatten(s);
|
|
}
|
|
#endif
|
|
|
|
int
|
|
TestGonkCameraHardware::StartRecording()
|
|
{
|
|
class Delegate : public ControlMessage
|
|
{
|
|
public:
|
|
Delegate(TestGonkCameraHardware* aTestHw)
|
|
: ControlMessage(aTestHw)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
return mJSTestWrapper->StartRecording();
|
|
}
|
|
};
|
|
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
nsresult rv = WaitWhileRunningOnMainThread(new Delegate(this));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return UNKNOWN_ERROR;
|
|
}
|
|
return OK;
|
|
}
|
|
|
|
int
|
|
TestGonkCameraHardware::StopRecording()
|
|
{
|
|
class Delegate : public ControlMessage
|
|
{
|
|
public:
|
|
Delegate(TestGonkCameraHardware* aTestHw)
|
|
: ControlMessage(aTestHw)
|
|
{ }
|
|
|
|
protected:
|
|
NS_IMETHOD
|
|
RunImpl() override
|
|
{
|
|
return mJSTestWrapper->StopRecording();
|
|
}
|
|
};
|
|
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
nsresult rv = WaitWhileRunningOnMainThread(new Delegate(this));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return UNKNOWN_ERROR;
|
|
}
|
|
return OK;
|
|
}
|
|
|
|
int
|
|
TestGonkCameraHardware::StoreMetaDataInBuffers(bool aEnabled)
|
|
{
|
|
DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
|
|
return OK;
|
|
}
|
|
|