mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
86a3aa0b54
- missing part of Bug 1165772: P1. (7311039be4) - missing gstreamer stuff (54a80d69b2) - Bug 1214208: Do not use MP3Decoder on B2G. r=alfredo (0a19e7946e) - Bug 1194014 - Remove redundant includes. r=jya (ccc3753113) - Bug 1039639 - Add support for Flac on Firefox OS. r=cajbir (7d76197e07) - Bug 875573 - Add video/x-m4v mime type. r=kentuckyfriedtakahe (6ec8af93e6) - cleanup (6fb3d5dd26) - Bug 1180621 - [FxOS] Enable VP9 codec for the Android version after KK. r=sotaro (58f7c2b657) - Bug 1187247: [MSE] P2. Enable WebM in MediaSource. r=jya (2df0ee1f7a) - Bug 1187247: [MSE] P1. Continue parsing MediaSegment if buffer starts with SimpleBlock/Block. r=kinetik (574475ed6f) - Bug 1217170: P1. Rename functions to explicitly reflect what they are doing. r=kentuckyfriedtakahe (70c81a8179) - Bug 1070216 - Split DOMMediaStream::InitStreamCommon into three. r=roc (1bda71cc88) - Bug 1215582 - Rename Blacklist to Block list in GStreamerFormatReader. r=gerald (4f08077f5e) - Bug 1170958 - Destroy track-locked MediaInputPorts when the track ends. r=roc (ff3922a2d6) - Bug 1070216 - constify DOMMediaStream::Get[Audio/Video]Tracks(). r=roc (ba09f6f191) - Bug 1070216 - Guard against adding a track owned by one MSG to a stream owned by another. r=padenot (a80deb8b30) - Bug 1070216 - Implement MediaStream constructors. r=smaug,jib,padenot (3403ef2599) - Bug 1070216 - Guard against a null MediaInputPort in DOMMediaStream::FindPlaybackDOMTrack(). r=roc (453a9ffbc1) - Bug 1212783 - Expose TrackPort in DOMMediaStream.h r=roc (fb61c79ae7) - Bug 1219711 - Ensure MediaStreamTrack.enabled propagates across peer connections. r=jesup (d9d1e54dae) - Bug 1129051 - Fix double free in Camera Control Listener. Fix webrtc memory leak. r=aosmond (3e9b3bccfd) - Bug 1152260 - Generate focused event for drivers that do not notify us when using continuous auto focus. r=mikeh (6c7bd42fdc) - Bug 1175656 - Implement generation of recording posters in Gecko. r=dhylands,bz (51b2c66dc7) - Bug 1187364 - Part 1. Add ability for camera to pause/resume recording. r=dhylands,bz (c54c735e37) - Bug 1187364 - Part 2. Ensure that recording is resumed with a key frame. r=mchiang (c1c6048982) - Bug 1187364 - Part 3. Fix missing end comment in WebIDL. r=me,bz (7faf106cc1) - Bug 1212783 - Add a MediaStreamTrack to DOMCameraControl. r=aosmond (91e11efd3a) - Bug 1124338 - Fix possible camera cached parameters invalidation from underlying driver modification. r=aosmond (dea67dc155) - Bug 1196330 - Do not restart preview if configuration is unchanged. r=dhylands (097644f5d9) - Bug 1215372 - Filter empty camera face detected events at gonk layer. r=dhylands (733efe50eb) - Bug 1179726 - Prefer lower resolutions than 4kuhd as the default video recording profile. r=dhylands (27c71273dc) - Bug 1222122 - Add picture size to verified parameters when reconfiguring the camera. r=dhylands (8c1fac6a4a) - Bug 1141267 - register CameraThread with profiler, r=aosmond (299592a024) - Bug 1008483 - removes the RW lock in CameraControlImpl and replaces it with a standard mutex. r=aosmond (45936cb90d) - Bug 1008483 - Part 2. Readd missing nsPrintfCString.h include which has broken some local builds. r=me (9dd84b0f19) - Bug 1191731 - Update poster API to allow application control over when poster is saved. r=bz, r=dhylands (73f9e7e0f4) - Bug 1155648 - Fix documentation for DOMMediaStream::OnTracksAvailable. r=jesup (702828c304) - Bug 1217170: [MSE] P2. Enable WebM/MSE on systems with no MP4/H264 support. r=kentuckyfriedtakahe (0b814b0708) - Bug 1213177: Enable WebM on machines where H264 HW decoding is disabled. r=kentuckyfriedtakahe (e64da2ea24) - add back some sps telemetry (52c2c64f5b) - missing bit of Bug 1195073: [MSE/webm] P1 (9c45e82c3d) - Bug 1150305 - sourcebuffer.buffered returns the same object if not changed. r=roc, r=bz, r=jya (6005d56c0c) - Bug 1215447 - move flag setting from SeekStarted() to Seek(). r=roc. (a646b744c1) - Bug 1119936 - Audio from FM Radio or Music app ceases to play when switching between front/back camera. r=roc (1a60aa7d69) - Bug 1186806 - Part 1: Replace nsBaseHashtable::EnumerateRead() with iterators in HTMLFormControlsCollection. r=khuey (ccb8cb180a) - Bug 1186806 - Part 2: Use NS_IMPL_CYCLE_COLLECTION_TRAVERSE instead of manual traversal in HTMLFormElement. r=khuey (57e6eabf1b) - Bug 1186806 - Part 3: Replace nsBaseHashtable::EnumerateRead() with iterators in HTMLMediaElement. r=khuey (243ef6e83b) - Bug 1186806 - Part 4: Replace nsBaseHashtable::EnumerateRead() with iterators in HTMLPropertiesCollection. r=khuey (499bdef85f) - Bug 1163958 - Reduce the allocation in MediaStreamGraph - patch 3 CLOSED TREE (a557661df1) - Bug 1219330 - Prevent the creation of TextureClient after shutdown. r=mattwoodrow (a6c047d54f) - Bug 1205559: Make TextureChild/TextureClient thread-safe. r=nical (307c089631) - missing bit of 1219330 (0e351ea419) - nsRefPtr -> RefPtr (07ba248e69) - Bug 1215023. Part 1 - make MediaDecoder::mOwner a const member. We will check mShuttingDown before calling functions of mOwner. r=kinetik. (da7f201815) - Bug 1215023. Part 2 - remove null check of mOwner. We check mShuttingDown to know whether it is valid to call functions of mOwner. r=kinetik. (8d28a04bbe) - Bug 1220558. Part 2 - remove unused members. r=jya. (d3a9ed8c68) - Bug 1223599 - Remove the throttling argument from AbstractMediaDecoder::NotifyDataArrived(). r=jya. (320323ff1d) - Bug 1194606 - Make MediaDecoderStateMachine capable of requesting different kind (decoded/raw) of media data. r=jya (1e2b6a5c44) - Bug 1197075: P3. Decode frames ahead of MDSM requesting them. r=edwin This makes the media.*-decode-ahead pref performs more according to its name. We decode audio and video in advance so a MediaDataPromise can be resolved almost instantly. Default is 2. (b3f56447c4) - Bug 1189964 - Fix bustage. r=bustage CLOSED TREE (afaa49b4b5) - Bug 1212149 - e10s support for opening notification settings. r=wchen (f0e7778fb6) - Bug 1215644 - Use child process volume service cache for available and storage status requests. r=dhylands (dfd49f2ef3) - bug 1215552 - nsHttpConnectionMgr::PostEvent shouldnt manually ref count r=hurley (5e2f1886e6) - Bug 1219392 - Capitalize mozilla::unused to avoid conflicts. r=froydnj (0c8bb7f15a) - bug 1217834 - buzzfeed packet loss r=dragana (e9a60b605f) - Bug 1168033 - Add a comment to nsHttpConnectionMgr.cpp explaining the assignment of attemptedOptimisticPipeline. r=mcmanus (2451996350) - bug 1189645 - remove spdy telem r=hurley (cda90abbdb) - Bug 1148268 - fixed misspelling attribute mActorDestoryed. r=dhyland. (3615d68765) - Bug 1216031 - Make MediaDecoder::mVideoFrameContainer const. r=kinetik. (a3feb9d6bc) - missing bits of Bug 1165515 - Part 13-2 (009e32281f) - Bug 1131473 - crash in -[NativeMenuItemTarget menuItemHit:]. r=spohl (ea2da6441c) - Bug 1216416 - Fix -Wimplicit-fallthrough warnings in widget/cocoa. r=spohl (faaa390b20) - Bug 1181977 - Firefox app menu contains only "Quit" in certain edgecases. r=spohl (0b9d912961)
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 nsRunnable
|
|
{
|
|
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 nsRunnable
|
|
{
|
|
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));
|
|
}
|
|
}
|