mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:37:11 +00:00
4c9d88c9a4
- Bug 1246051 - have MediaQueue<T>::Peek/PeekFront return a RefPtr<> to avoid dangling pointers per comment 0. r=gerald. (00f334efb1) - Bug 1264199: P1. Perform audio conversion in the MSDM taskqueue and ahead of use. r=kinetik (001936e3ea) - Bug 1267983 - include MediaQueue.h; r=jwwang (036107d765) - Bug 1264199: P0. Fix nsDequeue/MediaQueue methods constness. r=jwwang (9aa33dfcb5) - Bug 1264199: P0.1. Export SaferMultDiv method. r=gerald (0b7a35ae4d) - Bug 1264199: P2. Ensure the AudioStream only ever receive the same content format. r=kinetik (a180d09279) - Bug 1264199: P3. Attempt to minimize audio quality loss and unnecessary processing. r=kinetik (29d57b5a33) - Bug 1264199: P4. Add mono to stereo upmix to AudioConverter. r=rillian (49c029bd86) - Bug 1264199: P5. Perform all downmixing operations in DecodedAudioDataSink. r=kinetik (05a479f095) - Bug 1264199: P6. Drain resampler when changing format or reaching the end. r=kinetik (8639102a94) - Bug 1264199: P8. Handle potential resampling errors. r=kinetik (1267e4e73d) - Bug 1264199: P9. Include pending frames in HasUnplayedFrames calculation. r=jwwang (ce7097fc90) - Bug 1263496 - Part 1: fix for @mozilla.org/nullprincipal;1 r=bholley (c4c462a1bc) - Bug 1263496 - Part 2: fix for NS_NULLPRINCIPAL_CONTRACTID. r=bholley (c1504240ec) - Bug 1263496 - Part 3: fix for nsNullPrincipal::Create (0196a5a3ce) - Bug 1261009 - Remove the Data Store API, r=fabrice (b22e580107) - Bug 1261405 - Rename PushPermissionDescriptor.userVisible to `userVisibleOnly`. r=baku (4de70267cc) - Bug 1266821 - Remove PushPermissionDescriptor from the Permissions API. r=baku (196cd83442) - Bug 1268393 - Some compilation issues in ServiceWorker code, r=ehsan (d9c2f2554b) - Merge branch 'dev' of https://github.com/rmottola/Arctic-Fox into dev (6f6c606911) - Bug 1267733 P1 Treat last-update-time as infinitely in the past when checking for service worker update after restart. r=jdm (255da0a9e2) - Bug 1209095 - Accept opaqueredirection fetch results if the request redirection type is manual. r=bkelly (6fe92d1368) - Bug 1267733 P2 Pass ServiceWorkerRegistrationInfo down to CancelChannelRunnable. r=jdm (0ec51f09ef) - Bug 1267733 P3 Trigger service worker update after failed interception. r=jdm (f89a7998d4) - Bug 1267733 P4 Add a wpt test that verifies a service worker update can recover from a broken navigation interception. r=jdm (9dc0ce97bd) - Bug 1267691: Assert on failed attempts to shutdown a thread from itself r=froyd (0cbd1e458c) - Bug 1180533 - Disable BackgroundHangMonitor on gonk (a2d666e741) - Bug 1121216 - disable BackgroundHangMonitor for TSan builds; r=jchen (ef15d1016f) - Bug 1265621 - Use StaticRefPtr in Omnijar.cpp; r=froydnj (81bc32836e) - Bug 1265621 - Expose outer zip readers in Omnijar::GetReader; r=froydnj (ce3f82929e) - Bug 1267021 - Use fallible allocation and move semantics for Push events. r=wchen (3a1ae23d8d) - Bug 1222899 - Handle geolocation-device-events callback. r=kchen (a33bcf4297) - Bug 1237831 - Update GonkGPSGeolocationProvider.cpp to use B2G-style. r=jst (d389eedf47) - Bug 1245033 - Build break in dom/system/gonk/GonkGPSGeolocationProvider.cpp:541:126: error: format '%d' expects argument of type 'int', but argument 5 has type 'nsresult'. r=fabrice (ecde789edf) - Bug 1264287: Convert Wifi to use |UniquePtr|, r=nfroyd (9bad7792bf) - Bug 1267577 - Move nsRunnable to mozilla::Runnable. r=gsvelto (f58e2161f2) - Bug 1210370 - Close wpa_supplicant before we shutdown nsIWifiProxyService. r=mrbkap (5cd4dce58f) - Bug 1218629 - Save audio volume for each device to setting db r=alwu (2f1847dd6f) - Bug 1249437 - Remove workaround of volume control r=alwu (13cd144a89) - Bug 1268432: Replace |Task| with |Runnable| in B2G code r=fabrice (bcc768e9cb) - Bug 1226483 - Add ASSERT check to AudioManager::SelectDeviceFromDevices() r=alwu (446e8f634e) - Bug 1229234 - Enable audio_is_output_device() on ICS r=alwu (84aae07f23) - Bug 1267369 - Only generate typelib data for scriptable interfaces; r=khuey (e49b44c9ce) - Bug 1155969 - Make runtests.py flake8 compliant. r=ted (1de456b206) - Bug 1266569 - Avoid including the ChromeUtils binding in Base64.h. r=froydnj (7ba39a7687) - Bug 1267568 part 1 - Add a weak ptr to nsGlobalChromeWindow to remember the pres shell we set the fullscreen change flag. r=smaug (83995d5296) - Bug 1267568 part 2 - Add helper method to nsIPresShell to get the RefreshDriver. r=smaug (c60589fb40) - Bug 1267568 part 3 - Use an individual method for check whether resize should be delayed. r=smaug (f0ab5156d1) - Bug 1267568 part 4 - Replace InFullscreenChange flag of PresShell with IsResizeSuppressed flag in RefreshDriver. r=smaug (0a54f5a08b) - Bug 1267568 part 5 - Replace the old FullscreenChangePrepare class with a single function. r=smaug (4196e82852) - Bug 1267568 part 6 - Send fullscreen message before triggering any potential reflow. r=dao (fe9133ca2d) - Bug 1243352 - attribute a value for ProxyHandlerInfo::mPrefAction in ProxyHandlerInfo::SetPreferredAction. r=blassey (577c23e4cb) - Bug 1266433 - Send Push observer notifications to parent and content processes. f=janx r=dragana (768c173c2c) - Bug 1267493 - Replace isURIPotentiallyTrustworthy usage in Push with a testing pref. r=dragana (96434b90d9) - Bug 1266433 - Send an observer notification when a push subscription is lost. f=janx r=dragana (a7c7277e02) - Bug 1247685 - Send subscription keys to the Push server. r=mt (651fc0cad3) - Bug 1266540 - Stub out Push error reporting for the GCM and H2 backends. r=wchen (fd00c311aa) - Bug 1266623 - Up/down mix WASAPI capture streams when stream formats don't match. r=padenot (ca92ec20ab) - Bug 1267930 - When the wasapi rendering loop is stuck and we're shuttin down, leak the thread and continue the shutdown process. r=kinetik (04419ad94d) - Bug 1269692 - Update cubeb to revision 17e3048d0afa1152776fb1867cdb61c49fae69e4. (3de098f4bb) - Bug 1251502 - Update cubeb's udpate.sh script to account for new files. r=kinetik (a3ae5f27c1) - Bug 1243234 - Hide MP4Metadata behind an impl pointer. r=giles (1543bedf28) - Bug 1243234 - Update rust mp4parse telemetry reporting. r=kinetik (bb5c999c06) - Bug 1242807 - Fix mp4parse-rust's error reporting via telemetry. r=giles (a3ca1b133b) - Bug 1243234 - Move mp4parse-rust code into MP4MetadataRust impl. r=giles (ec4d6bcf0e) - Bug 1243234 - Remove now-unnecessary StagefrightPrivate wrapper. r=giles (1e2c54232b) - Bug 1243234 - Move mp4parse-rust initialization into constructor and clean up try_rust. r=giles (291c01f45a) - Bug 1243234 - Update rust mp4parse to v0.2.1. r=kinetik (d2774346cd) - Bug 1264622: [MP4] Resync stagefright's updateAudioTrackInfoFromESDS_MPEG4Audio with upstream. r=kentuckyfriedtakahe (b4b596507b) - Bug 1254721: Ensure consistency between Cenc offsets and sizes table. r=gerald (59bd7122d1) - Bug 1151202 - libstagefright: Fix compilation for systems without <sys/cdefs.h>. r=cpearce (e219658c31) - Bug 1255866 - stagefright: Fix unused variable warnings. r=ajones (62afc26384) - Bug 1251821: increase UDP socket send buffer on Win 7 r=jdm,jesup (e0d6e545f4) - Bug 929977: Add support for RFC 7675 ICE consent freshness. r=bwc,mt (ea8a565a65) - Bug 1231981 - Part 1: Very basic test TURN server for running in CI. r=ahal,drno (c98a79810b) - Bug 1231981 - Part 2: A websocket-to-process bridge script that can be used by JS to launch an ICE server for testing. r=ahal (5bdb00dfd1) - Bug 1231981 - Part 2.1: Only run the websocket/process bridge for media tests. r=ahal (86f97e2eb6) - Bug 1225729: Whitelist specific bad RTCP timestamp value r=drno (f0c8402fd0) - Bug 1193045 - Check selected attribute for all calls. r=bwc (7eb4095c34) - Bug 1213056 - update tests to use maplike getStats. r=bwc (d27f997290) - Bug 1231981 - Part 3: Set up TURN server for webrtc mochitests, when configured to. r=drno (38e4455eec) - Bug 1231975 - Part 1: Basic audio mochitests for NAT scenarios. r=drno (16efaf581e) - Bug 1231975 - Part 2: Break a reference cycle between NrTcpSocketIpc and TCPSocketChild, in the same manner as the UDP case. r=mcmanus (1fa55e3e5f)
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 Runnable
|
|
{
|
|
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 Runnable
|
|
{
|
|
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;
|
|
}
|
|
|