mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
d899ba7218
- Bug 1268085 - Remove unused post barrier callbacks r=terrence (0ab13411c9) - Bug 1267699 - Move some public types to the right namespace; r=sfink (3d5008e610) - Bug 1267550 (part 1) - Rename MOZ_MUST_USE as MOZ_MUST_USE_TYPE. r=ehsan. (6f47375796) - Bug 1259021 - Rename Vector::extractRawBuffer to extractOrCopyRawBuffer r=Waldo (97ca94495b) - Bug 1259021 - Add Vector::extractRawBuffer method that doesn't copy the buffer r=Waldo (e58deec48f) - Bug 1265892 - Change Vector to use Impl::new_ consistently. r=Waldo (7a52d21b29) - Bug 1267912 - Rename nsNetUtil.inl as nsNetUtilInlines.h. r=valentin. (548a41b293) - Bug 1265690 part 1 - Mark StringBuffer methods WARN_UNUSED_RESULT, fix OOM issues. r=jonco (0d7e6837e3) - Bug 1265690 part 2 - Fix some more OOM issues in TypedObject code. r=jonco (b60902453e) - Bug 1263490 - Part 2: Add GetFirstDollarIndex intrinsic and use it inRegExpReplace. r=till (4ba19db8c4) - Bug 1263490 - Part 3: Inline GetFirstDollarIndex intrinsic. r=h4writer (e7d9b5d1cc) - Bug 1263490 - Part 4: Fold GetFirstDollarIndex into a integer constant. r=h4writer (3479c7d1af) - Bug 1267269 - Make MIRType an enum class. r=bbouvier (d580ef372a) - Bug 1259295 - BaldrMonkey: Postorder (r=luke) (6ef7a77663) - Bug 1254142: BaldrMonkey: make br_table yield (r=luke) (80e7635e58) - Bug 1263202 - BaldrMonkey: switch to arities on branches, calls and return (r=bbouvier) (f5a0358634) - Bug 1236358 - Improper reading of string16 in Pickle::ReadString16. r=jld (8370ba6a0b) - Bug 1263205 - BaldrMonkey: Update section headers for proposed spec changes (r=luke) (0def2e6bc2) - Bug 1263205 - BaldrMonkey: Update for proposed new section names (r=luke) (e57f0e3367) - Bug 1263205 - BaldrMonkey: Add 'form' field to types section (r=bbouvier) (794edc890f) - Bug 1259021 - Use in-place storage in AutoStableStringChars to avoid allocation for short strings r=jandem r=Waldo (ffb53cbcf4) - Bug 1267550 (part 2) - Rename MOZ_WARN_UNUSED_RESULT as MOZ_MUST_USE. r=froydnj. (47bc674b86) - Bug 1268518: Baldr: implement int32/int64 rotations; r=luke (0d5eedccce) - Bug 1255008: IonMonkey - Add a by default disabled flow sensitive alias analysis pass, r=jandem (521c585d75) - Bug 1266781: Baldr: implement proper checked truncations to integer types; r=sunfish (46078fb3d3) - Bug 1266781: Rename MTruncateToInt64 into MWasmTruncateInt64; r=sunfish (c7d7d1ac11) - Bug 1266781: Add new traps; r=luke (b7ed3d44e6) - Bug 1268024: Pass the atomic attribute down to EmitHeapAccess; r=luke (6195f7d7a3) - Bug 1268024: A few cleanups related to loads/stores; r=luke (88141e3a01) - Bug 1258312 - Make Pickle::Resize infallible r=jld (241ee9b60d) - Bug 1162772, part 1 - Allow CompartmentCreationOptions to store Secure Context state. r=jorendorff (ff666384cf) - Bug 1162772, part 2 - Expose whether SEC_FORCE_INHERIT_PRINCIPAL was dropped from an nsILoadInfo. r=bz (ada46f86bf) - Bug 1162772, part 3 - Add a getChannelResultPrincipalIfNotSandboxed method to nsIScriptSecurityManager. r=bz (5b1d9f6807) - Bug 1162772, part 4 - Implement nsGlobalWindow::IsSecureContext. r=bz (f392f439c9) - Bug 1162772, part 5 - Expose Window.isSecureContext to content. r=bz (e7296e2cf1) - Bug 1267509 - Make nsContentSecurityManager::IsURIPotentiallyTrustworthy act on an nsIPrincipal. r=bz (83de80350a) - Bug 1219098 - Use UniquePtr in UncompressedSourceCache, for it is good (r=jandem) (b68769c729) - Bug 1244279 - Part 1: Take a bit in ObjectElements::Flags to indicate whether the object is in the whole cell store buffer. r=terrence (968cf373f9) - Bug 1244279 - Part 0: Add a GC ubench for large arrays with both elements and properties. r=terrence (ec76b48323) - Bug 1255925 - Give a name to getters/setters and integer-named methods. r=efaust (f978cc6916) - Bug 888969 - Make the getPrototypeOf/setPrototypeOf traps scriptable. r=efaust, r=bholley (eb2325a9ea) - Bug 1267557 part 0 - Move JS poison constants to jsutil.h. r=jonco (65afc690d2) - Bug 1267557 part 1 - Also poison bytes allocated before the actual jitcode. r=nbp (70f0b327d3) - Bug 1267557 part 2 - Use different jitcode poison values. r=nbp (08008ab9dc) - Bug 1267557 part 3 - Define JS_SWEPT_CODE_PATTERN for mips. r=nbp (17e894d59d) - Bug 1267449 - Do not infinite loop in js_fputs; r=jimb (67f961b6cd) - Bug 1219098 - Reenable compression on large sources, but revert to uncompressed if decompression happens (r=jandem) (b44ee8d77d) - Bug 1267551 (part 1) - Use MOZ_MUST_USE more in jsnum.h. r=jonco. (d2476bf8f4) - Bug 1267551 (part 2) - Use MOZ_MUST_USE more in js/src/ds/. r=jonco. (4ff5d9aa88) - Bug 1267412 - Use MutableHandleValue instead of pointer-to-AutoValueVector; r=sfink (3f6dd284bb) - Bug 1266406 - Use EnumSet<AllocKind> to simplify GC sweeping phase information r=terrence (64811500e7) - Bug 1266457 - Update pointers in GC things in two phases when compacting r=terrence (f6f5bc4e4d) - Bug 1266457 - Simplify typed object trace hook r=terence (3b06c8d1e5) - Bug 1268541 - Compact arenas containing base shapes r=terrence (b458b92eea) - Bug 1268805 - Implement PrivateGCThingValue. (r=terrence) (deec9a83ae) - Bug 1268415: Initialize members in UpdatePointerTasks; r=jonco (6cb219005a) - Bug 1268501 - Release the GC lock periodically when releasing arenas on the backgound thread r=terrence (37f0997682) - Bug 1263572 - Wait for background sweeping to finish before checking base shapes r=terrence (354801a411) - Bug 1266887 - Store Rooted heads on the Zone; r=sfink (91c0101ee3) - Bug 1266402 - Add iteration to EnumSet<T> so that it can be used in range-based for loops r=Waldo (e9507a2524) - Bug 1266404 - Allow construction of an EnumSet<T> using an initializer list r=Waldo (1b6d340e99) - Bug 1254020 - Always compute theme scaling factor when per-monitor dpi aware, even if only a single display is currently present. r=emk (a00cda21f4) - Bug 1263525 - Add dedicated function for std_Array self-hosted intrinsic. r=efaust (449d8bb7eb) - Bug 1255925 - Change JSFunction::name to return a JSAtom. r=efaust (5ab396ce83) - Bug 888969 - Make our tree's sole implementation of nsIRemoteTagService.getRemoteObjectTag not depend upon the infallibility of [[GetPrototypeOf]] on the object provided to it. r=bz (f388f4bf1f) - Bug 1264896 - Kill off nsIRemoteTagService and do what it does, in its sole caller, in far-faster C++. r=billm (5ed3fb103d) - Bug 1268246 - Add a simple Poison class lifetime checker. r=froydnj (7b237bc70e) - Bug 1249496 - Don't apply dpi-based scaling for window titlebar dimensions when on a secondary display, because windows doesn't scale it. r=emk (64dd706dbc) - Bug 1164518 - Avoid unnecessary DB updates when caching Safe Browsing results. r=gcp (3cafd9a4df) - Bug 1264472 - Use nsRunnables in FIDO U2F. r=keeler (3aa9570132) - Bug 1236060 - Dispatch error should advance queue. r=smaug (74155b75dd) - Bug 1251697 part 1. Thread an ErrorResult reference through the worker XHR WorkerThreadProxySyncRunnable implementations. r=khuey (77804cbb7c) - Bug 1251697 part 2. Have WorkerThreadProxySyncRunnable hand the ErrorResult reference it holds to its ResponseRunnable so it can report exceptions on there instead of on a JSContext. r=khuey (355c9ee313) - Bug 1251697 part 3. Remove the JSContext argument of StopSyncLoopRunnable::MaybeSetException. r=khuey (010f5b1058) - Bug 1155328. r=smaug (e1f8dac304) - Bug 1265927: Move nsRunnable to mozilla::Runnable, CancelableRunnable to mozilla::CancelableRunnable. r=froydnj (f83bfcae02) - Bug 1239946 - Change test to return error on Speak. r=eeejay (1d402beb02) - Bug 1254378 - Update synth tests and introduce no voiceschanged test. r=smaug (f5823bb70e) - Bug 1251627. Fix XMLHttpRequest.send() to follow the spec better in terms of the exceptions it throws. r=khuey (cd0e321948) - Bug 1268868: [MSE] P1. Re-enable gap detection within a media segment. r=gerald (b8b8df4bc2) - Bug 1268868: [MSE] P2. Reset longest duration after keyframe is seen. r=gerald (2b1401465c) - Bug 1268868: [MSE] P3. Prevent crash should gap be detected in content. r=gerald (063d9376fc) - Bug 1254378 - Implement nsISynthVoiceRegistry.notifyVoicesChanged. r=smaug (4b63b1c360) - Bug 1266804 - Un-inline js::Unbox(); r=jorendorff (0f288b6173) - Bug 1268863 - Report ScriptSources that are only reachable via AsmJSModule (r=njn) (5ba40acb64) - Bug 1262062 - remove old futex names. r=bbouvier (62662bdd2e) - missing bit of 1219804 (358b1931e0) - memory: build fix after renaming MOZ_WARN_UNUSED_RESULT (7254dc8d53) - import from mozilla: - Bug 1268725 - BaldrMonkey: Refactor away the internal storage from ExprIter. r=luke (1931bd636f17) - Bug 1268725 - BaldrMonkey: Convert default arguments into explicit arguments. r=luke (c8a11b8b6bbd) (867ec715d6)
796 lines
20 KiB
C++
796 lines
20 KiB
C++
/* 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 "CameraControlImpl.h"
|
|
#include "base/basictypes.h"
|
|
#include "mozilla/Assertions.h"
|
|
#include "mozilla/unused.h"
|
|
#include "nsPrintfCString.h"
|
|
#include "nsIWeakReferenceUtils.h"
|
|
#include "CameraCommon.h"
|
|
#include "nsGlobalWindow.h"
|
|
#include "DeviceStorageFileDescriptor.h"
|
|
#include "CameraControlListener.h"
|
|
|
|
using namespace mozilla;
|
|
|
|
/* static */ StaticRefPtr<nsIThread> CameraControlImpl::sCameraThread;
|
|
|
|
CameraControlImpl::CameraControlImpl()
|
|
: mListenerLock("mozilla::camera::CameraControlImpl.Listeners")
|
|
, mPreviewState(CameraControlListener::kPreviewStopped)
|
|
, mHardwareState(CameraControlListener::kHardwareUninitialized)
|
|
, mHardwareStateChangeReason(NS_OK)
|
|
{
|
|
DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
|
|
mCurrentConfiguration.mMode = ICameraControl::kUnspecifiedMode;
|
|
|
|
class Delegate : public Runnable
|
|
{
|
|
public:
|
|
NS_IMETHOD
|
|
Run()
|
|
{
|
|
char stackBaseGuess;
|
|
profiler_register_thread("CameraThread", &stackBaseGuess);
|
|
return NS_OK;
|
|
}
|
|
};
|
|
|
|
// reuse the same camera thread to conserve resources
|
|
nsCOMPtr<nsIThread> ct = do_QueryInterface(sCameraThread);
|
|
if (ct) {
|
|
mCameraThread = ct.forget();
|
|
} else {
|
|
nsresult rv = NS_NewNamedThread("CameraThread", getter_AddRefs(mCameraThread));
|
|
if (NS_FAILED(rv)) {
|
|
MOZ_CRASH("Failed to create new Camera Thread");
|
|
}
|
|
mCameraThread->Dispatch(new Delegate(), NS_DISPATCH_NORMAL);
|
|
sCameraThread = mCameraThread;
|
|
}
|
|
}
|
|
|
|
CameraControlImpl::~CameraControlImpl()
|
|
{
|
|
DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::OnHardwareStateChange(CameraControlListener::HardwareState aNewState,
|
|
nsresult aReason)
|
|
{
|
|
// This callback can run on threads other than the Main Thread and
|
|
// the Camera Thread. On Gonk, it may be called from the camera's
|
|
// local binder thread, should the mediaserver process die.
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
if (aNewState == mHardwareState) {
|
|
DOM_CAMERA_LOGI("OnHardwareStateChange: state did not change from %d\n", mHardwareState);
|
|
return;
|
|
}
|
|
|
|
const char* state[] = { "uninitialized", "closed", "open", "failed" };
|
|
MOZ_ASSERT(aNewState >= 0);
|
|
if (static_cast<unsigned int>(aNewState) < sizeof(state) / sizeof(state[0])) {
|
|
DOM_CAMERA_LOGI("New hardware state is '%s' (reason=0x%x)\n",
|
|
state[aNewState], aReason);
|
|
} else {
|
|
DOM_CAMERA_LOGE("OnHardwareStateChange: got invalid HardwareState value %d\n", aNewState);
|
|
}
|
|
|
|
mHardwareState = aNewState;
|
|
mHardwareStateChangeReason = aReason;
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
l->OnHardwareStateChange(mHardwareState, mHardwareStateChangeReason);
|
|
}
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::OnConfigurationChange()
|
|
{
|
|
MOZ_ASSERT(NS_GetCurrentThread() == mCameraThread);
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
DOM_CAMERA_LOGI("OnConfigurationChange : %zu listeners\n", mListeners.Length());
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
l->OnConfigurationChange(mCurrentConfiguration);
|
|
}
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::OnAutoFocusComplete(bool aAutoFocusSucceeded)
|
|
{
|
|
// This callback can run on threads other than the Main Thread and
|
|
// the Camera Thread. On Gonk, it is called from the camera
|
|
// library's auto focus thread.
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
l->OnAutoFocusComplete(aAutoFocusSucceeded);
|
|
}
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::OnAutoFocusMoving(bool aIsMoving)
|
|
{
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
l->OnAutoFocusMoving(aIsMoving);
|
|
}
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::OnFacesDetected(const nsTArray<Face>& aFaces)
|
|
{
|
|
// This callback can run on threads other than the Main Thread and
|
|
// the Camera Thread. On Gonk, it is called from the camera
|
|
// library's face detection thread.
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
l->OnFacesDetected(aFaces);
|
|
}
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::OnTakePictureComplete(const uint8_t* aData, uint32_t aLength, const nsAString& aMimeType)
|
|
{
|
|
// This callback can run on threads other than the Main Thread and
|
|
// the Camera Thread. On Gonk, it is called from the camera
|
|
// library's snapshot thread.
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
l->OnTakePictureComplete(aData, aLength, aMimeType);
|
|
}
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::OnPoster(dom::BlobImpl* aBlobImpl)
|
|
{
|
|
// This callback can run on threads other than the Main Thread and
|
|
// the Camera Thread.
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
l->OnPoster(aBlobImpl);
|
|
}
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::OnShutter()
|
|
{
|
|
// This callback can run on threads other than the Main Thread and
|
|
// the Camera Thread. On Gonk, it is called from the camera driver's
|
|
// preview thread.
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
l->OnShutter();
|
|
}
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::OnRecorderStateChange(CameraControlListener::RecorderState aState,
|
|
int32_t aStatus, int32_t aTrackNumber)
|
|
{
|
|
// This callback can run on threads other than the Main Thread and
|
|
// the Camera Thread. On Gonk, it is called from the media encoder
|
|
// thread.
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
l->OnRecorderStateChange(aState, aStatus, aTrackNumber);
|
|
}
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::OnPreviewStateChange(CameraControlListener::PreviewState aNewState)
|
|
{
|
|
// This callback runs on the Main Thread and the Camera Thread, and
|
|
// may run on the local binder thread, should the mediaserver
|
|
// process die.
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
if (aNewState == mPreviewState) {
|
|
DOM_CAMERA_LOGI("OnPreviewStateChange: state did not change from %d\n", mPreviewState);
|
|
return;
|
|
}
|
|
|
|
const char* state[] = { "stopped", "paused", "started" };
|
|
MOZ_ASSERT(aNewState >= 0);
|
|
if (static_cast<unsigned int>(aNewState) < sizeof(state) / sizeof(state[0])) {
|
|
DOM_CAMERA_LOGI("New preview state is '%s'\n", state[aNewState]);
|
|
} else {
|
|
DOM_CAMERA_LOGE("OnPreviewStateChange: got unknown PreviewState value %d\n", aNewState);
|
|
}
|
|
|
|
mPreviewState = aNewState;
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
l->OnPreviewStateChange(mPreviewState);
|
|
}
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::OnRateLimitPreview(bool aLimit)
|
|
{
|
|
// This function runs on neither the Main Thread nor the Camera Thread.
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
DOM_CAMERA_LOGI("OnRateLimitPreview: %d\n", aLimit);
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
l->OnRateLimitPreview(aLimit);
|
|
}
|
|
}
|
|
|
|
bool
|
|
CameraControlImpl::OnNewPreviewFrame(layers::Image* aImage, uint32_t aWidth, uint32_t aHeight)
|
|
{
|
|
// This function runs on neither the Main Thread nor the Camera Thread.
|
|
// On Gonk, it is called from the camera driver's preview thread.
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
DOM_CAMERA_LOGI("OnNewPreviewFrame: we have %zu preview frame listener(s)\n",
|
|
mListeners.Length());
|
|
|
|
bool consumed = false;
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
consumed = l->OnNewPreviewFrame(aImage, aWidth, aHeight) || consumed;
|
|
}
|
|
return consumed;
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::OnUserError(CameraControlListener::UserContext aContext,
|
|
nsresult aError)
|
|
{
|
|
// This callback can run on threads other than the Main Thread and
|
|
// the Camera Thread.
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
const char* context[] = {
|
|
"StartCamera",
|
|
"StopCamera",
|
|
"AutoFocus",
|
|
"StartFaceDetection",
|
|
"StopFaceDetection",
|
|
"TakePicture",
|
|
"StartRecording",
|
|
"StopRecording",
|
|
"PauseRecording",
|
|
"ResumeRecording",
|
|
"SetConfiguration",
|
|
"StartPreview",
|
|
"StopPreview",
|
|
"SetPictureSize",
|
|
"SetThumbnailSize",
|
|
"ResumeContinuousFocus",
|
|
"Unspecified"
|
|
};
|
|
if (static_cast<size_t>(aContext) < sizeof(context) / sizeof(context[0])) {
|
|
DOM_CAMERA_LOGW("CameraControlImpl::OnUserError : aContext='%s' (%d), aError=0x%x\n",
|
|
context[aContext], aContext, aError);
|
|
} else {
|
|
DOM_CAMERA_LOGE("CameraControlImpl::OnUserError : aContext=%d, aError=0x%x\n",
|
|
aContext, aError);
|
|
}
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
l->OnUserError(aContext, aError);
|
|
}
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::OnSystemError(CameraControlListener::SystemContext aContext,
|
|
nsresult aError)
|
|
{
|
|
// This callback can run on threads other than the Main Thread and
|
|
// the Camera Thread.
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
const char* context[] = {
|
|
"Camera Service"
|
|
};
|
|
if (static_cast<size_t>(aContext) < sizeof(context) / sizeof(context[0])) {
|
|
DOM_CAMERA_LOGW("CameraControlImpl::OnSystemError : aContext='%s' (%d), aError=0x%x\n",
|
|
context[aContext], aContext, aError);
|
|
} else {
|
|
DOM_CAMERA_LOGE("CameraControlImpl::OnSystemError : aContext=%d, aError=0x%x\n",
|
|
aContext, aError);
|
|
}
|
|
|
|
for (uint32_t i = 0; i < mListeners.Length(); ++i) {
|
|
CameraControlListener* l = mListeners[i];
|
|
l->OnSystemError(aContext, aError);
|
|
}
|
|
}
|
|
|
|
// Camera control asynchronous message; these are dispatched from
|
|
// the Main Thread to the Camera Thread, where they are consumed.
|
|
|
|
class CameraControlImpl::ControlMessage : public Runnable
|
|
{
|
|
public:
|
|
ControlMessage(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext)
|
|
: mCameraControl(aCameraControl)
|
|
, mContext(aContext)
|
|
{ }
|
|
|
|
virtual nsresult RunImpl() = 0;
|
|
|
|
NS_IMETHOD
|
|
Run() override
|
|
{
|
|
MOZ_ASSERT(mCameraControl);
|
|
MOZ_ASSERT(NS_GetCurrentThread() == mCameraControl->mCameraThread);
|
|
|
|
nsresult rv = RunImpl();
|
|
if (NS_FAILED(rv)) {
|
|
nsPrintfCString msg("Camera control API(%d) failed with 0x%x", mContext, rv);
|
|
NS_WARNING(msg.get());
|
|
mCameraControl->OnUserError(mContext, rv);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
protected:
|
|
virtual ~ControlMessage() { }
|
|
|
|
RefPtr<CameraControlImpl> mCameraControl;
|
|
CameraControlListener::UserContext mContext;
|
|
};
|
|
|
|
nsresult
|
|
CameraControlImpl::Dispatch(ControlMessage* aMessage)
|
|
{
|
|
nsresult rv = mCameraThread->Dispatch(aMessage, NS_DISPATCH_NORMAL);
|
|
if (NS_SUCCEEDED(rv)) {
|
|
return NS_OK;
|
|
}
|
|
|
|
nsPrintfCString msg("Failed to dispatch camera control message (0x%x)", rv);
|
|
NS_WARNING(msg.get());
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::Start(const Configuration* aConfig)
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext,
|
|
const Configuration* aConfig)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
, mHaveInitialConfig(false)
|
|
{
|
|
if (aConfig) {
|
|
mConfig = *aConfig;
|
|
mHaveInitialConfig = true;
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
if (mHaveInitialConfig) {
|
|
return mCameraControl->StartImpl(&mConfig);
|
|
}
|
|
return mCameraControl->StartImpl();
|
|
}
|
|
|
|
protected:
|
|
bool mHaveInitialConfig;
|
|
Configuration mConfig;
|
|
};
|
|
|
|
return Dispatch(new Message(this, CameraControlListener::kInStartCamera, aConfig));
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::SetConfiguration(const Configuration& aConfig)
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext,
|
|
const Configuration& aConfig)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
, mConfig(aConfig)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
return mCameraControl->SetConfigurationImpl(mConfig);
|
|
}
|
|
|
|
protected:
|
|
Configuration mConfig;
|
|
};
|
|
|
|
return Dispatch(new Message(this, CameraControlListener::kInSetConfiguration, aConfig));
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::AutoFocus()
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
return mCameraControl->AutoFocusImpl();
|
|
}
|
|
};
|
|
|
|
return Dispatch(new Message(this, CameraControlListener::kInAutoFocus));
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::StartFaceDetection()
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
return mCameraControl->StartFaceDetectionImpl();
|
|
}
|
|
};
|
|
|
|
return Dispatch(new Message(this, CameraControlListener::kInStartFaceDetection));
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::StopFaceDetection()
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
return mCameraControl->StopFaceDetectionImpl();
|
|
}
|
|
};
|
|
|
|
return Dispatch(new Message(this, CameraControlListener::kInStopFaceDetection));
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::TakePicture()
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
return mCameraControl->TakePictureImpl();
|
|
}
|
|
};
|
|
|
|
return Dispatch(new Message(this, CameraControlListener::kInTakePicture));
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::StartRecording(DeviceStorageFileDescriptor* aFileDescriptor,
|
|
const StartRecordingOptions* aOptions)
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext,
|
|
const StartRecordingOptions* aOptions,
|
|
DeviceStorageFileDescriptor* aFileDescriptor)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
, mOptionsPassed(false)
|
|
, mFileDescriptor(aFileDescriptor)
|
|
{
|
|
if (aOptions) {
|
|
mOptions = *aOptions;
|
|
mOptionsPassed = true;
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
return mCameraControl->StartRecordingImpl(mFileDescriptor,
|
|
mOptionsPassed ? &mOptions : nullptr);
|
|
}
|
|
|
|
protected:
|
|
StartRecordingOptions mOptions;
|
|
bool mOptionsPassed;
|
|
RefPtr<DeviceStorageFileDescriptor> mFileDescriptor;
|
|
};
|
|
|
|
if (!aFileDescriptor) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
return Dispatch(new Message(this, CameraControlListener::kInStartRecording,
|
|
aOptions, aFileDescriptor));
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::StopRecording()
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
return mCameraControl->StopRecordingImpl();
|
|
}
|
|
};
|
|
|
|
return Dispatch(new Message(this, CameraControlListener::kInStopRecording));
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::PauseRecording()
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
return mCameraControl->PauseRecordingImpl();
|
|
}
|
|
};
|
|
|
|
return Dispatch(new Message(this, CameraControlListener::kInPauseRecording));
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::ResumeRecording()
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
return mCameraControl->ResumeRecordingImpl();
|
|
}
|
|
};
|
|
|
|
return Dispatch(new Message(this, CameraControlListener::kInResumeRecording));
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::StartPreview()
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
return mCameraControl->StartPreviewImpl();
|
|
}
|
|
};
|
|
|
|
return Dispatch(new Message(this, CameraControlListener::kInStartPreview));
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::StopPreview()
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
return mCameraControl->StopPreviewImpl();
|
|
}
|
|
};
|
|
|
|
return Dispatch(new Message(this, CameraControlListener::kInStopPreview));
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::ResumeContinuousFocus()
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
return mCameraControl->ResumeContinuousFocusImpl();
|
|
}
|
|
};
|
|
|
|
return Dispatch(new Message(this, CameraControlListener::kInResumeContinuousFocus));
|
|
}
|
|
|
|
nsresult
|
|
CameraControlImpl::Stop()
|
|
{
|
|
class Message : public ControlMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener::UserContext aContext)
|
|
: ControlMessage(aCameraControl, aContext)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
return mCameraControl->StopImpl();
|
|
}
|
|
};
|
|
|
|
return Dispatch(new Message(this, CameraControlListener::kInStopCamera));
|
|
}
|
|
|
|
class CameraControlImpl::ListenerMessage : public CameraControlImpl::ControlMessage
|
|
{
|
|
public:
|
|
ListenerMessage(CameraControlImpl* aCameraControl,
|
|
CameraControlListener* aListener)
|
|
: ControlMessage(aCameraControl, CameraControlListener::kInUnspecified)
|
|
, mListener(aListener)
|
|
{ }
|
|
|
|
protected:
|
|
RefPtr<CameraControlListener> mListener;
|
|
};
|
|
|
|
void
|
|
CameraControlImpl::AddListenerImpl(already_AddRefed<CameraControlListener> aListener)
|
|
{
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
CameraControlListener* l = *mListeners.AppendElement() = aListener;
|
|
DOM_CAMERA_LOGI("Added camera control listener %p\n", l);
|
|
|
|
// Update the newly-added listener's state
|
|
l->OnConfigurationChange(mCurrentConfiguration);
|
|
l->OnHardwareStateChange(mHardwareState, mHardwareStateChangeReason);
|
|
l->OnPreviewStateChange(mPreviewState);
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::AddListener(CameraControlListener* aListener)
|
|
{
|
|
class Message : public ListenerMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl,
|
|
CameraControlListener* aListener)
|
|
: ListenerMessage(aCameraControl, aListener)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
mCameraControl->AddListenerImpl(mListener.forget());
|
|
return NS_OK;
|
|
}
|
|
};
|
|
|
|
if (aListener) {
|
|
Dispatch(new Message(this, aListener));
|
|
}
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::RemoveListenerImpl(CameraControlListener* aListener)
|
|
{
|
|
MutexAutoLock lock(mListenerLock);
|
|
|
|
RefPtr<CameraControlListener> l(aListener);
|
|
mListeners.RemoveElement(l);
|
|
DOM_CAMERA_LOGI("Removed camera control listener %p\n", l.get());
|
|
// XXXmikeh - do we want to notify the listener that it has been removed?
|
|
}
|
|
|
|
void
|
|
CameraControlImpl::RemoveListener(CameraControlListener* aListener)
|
|
{
|
|
class Message : public ListenerMessage
|
|
{
|
|
public:
|
|
Message(CameraControlImpl* aCameraControl, CameraControlListener* aListener)
|
|
: ListenerMessage(aCameraControl, aListener)
|
|
{ }
|
|
|
|
nsresult
|
|
RunImpl() override
|
|
{
|
|
mCameraControl->RemoveListenerImpl(mListener);
|
|
return NS_OK;
|
|
}
|
|
};
|
|
|
|
if (aListener) {
|
|
Dispatch(new Message(this, aListener));
|
|
}
|
|
}
|