mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +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)
264 lines
10 KiB
C++
264 lines
10 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/. */
|
|
|
|
#ifndef DOM_CAMERA_DOMCAMERACONTROL_H
|
|
#define DOM_CAMERA_DOMCAMERACONTROL_H
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "nsCycleCollectionParticipant.h"
|
|
#include "mozilla/dom/CameraControlBinding.h"
|
|
#include "mozilla/dom/Promise.h"
|
|
#include "ICameraControl.h"
|
|
#include "CameraCommon.h"
|
|
#include "DOMMediaStream.h"
|
|
#include "AudioChannelAgent.h"
|
|
#include "nsProxyRelease.h"
|
|
#include "nsHashPropertyBag.h"
|
|
#include "DeviceStorage.h"
|
|
#include "DOMCameraControlListener.h"
|
|
#include "nsWeakReference.h"
|
|
#ifdef MOZ_WIDGET_GONK
|
|
#include "nsITimer.h"
|
|
#endif
|
|
|
|
class nsDOMDeviceStorage;
|
|
class nsPIDOMWindow;
|
|
class nsIDOMBlob;
|
|
|
|
namespace mozilla {
|
|
|
|
namespace dom {
|
|
class CameraCapabilities;
|
|
struct CameraPictureOptions;
|
|
struct CameraStartRecordingOptions;
|
|
struct CameraRegion;
|
|
struct CameraSize;
|
|
template<typename T> class Optional;
|
|
} // namespace dom
|
|
class ErrorResult;
|
|
class StartRecordingHelper;
|
|
class RecorderPosterHelper;
|
|
class TrackCreatedListener;
|
|
|
|
#define NS_DOM_CAMERA_CONTROL_CID \
|
|
{ 0x3700c096, 0xf920, 0x438d, \
|
|
{ 0x8b, 0x3f, 0x15, 0xb3, 0xc9, 0x96, 0x23, 0x62 } }
|
|
|
|
// Main camera control.
|
|
class nsDOMCameraControl final : public DOMMediaStream
|
|
, public nsSupportsWeakReference
|
|
{
|
|
public:
|
|
NS_DECLARE_STATIC_IID_ACCESSOR(NS_DOM_CAMERA_CONTROL_CID)
|
|
|
|
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMCameraControl, DOMMediaStream)
|
|
NS_DECL_ISUPPORTS_INHERITED
|
|
|
|
// Because this header's filename doesn't match its C++ or DOM-facing
|
|
// classname, we can't rely on the [Func="..."] WebIDL tag to implicitly
|
|
// include the right header for us; instead we must explicitly include a
|
|
// HasSupport() method in each header. We can get rid of these with the
|
|
// Great Renaming proposed in bug 983177.
|
|
static bool HasSupport(JSContext* aCx, JSObject* aGlobal);
|
|
|
|
nsDOMCameraControl(uint32_t aCameraId,
|
|
const dom::CameraConfiguration& aInitialConfig,
|
|
dom::Promise* aPromise,
|
|
nsPIDOMWindow* aWindow);
|
|
|
|
void Shutdown();
|
|
|
|
nsPIDOMWindow* GetParentObject() const { return mWindow; }
|
|
|
|
MediaStream* GetCameraStream() const override;
|
|
|
|
// Called by TrackCreatedListener when the underlying track has been created.
|
|
// XXX Bug 1124630. This can be removed with CameraPreviewMediaStream.
|
|
void TrackCreated(TrackID aTrackID);
|
|
|
|
// Attributes.
|
|
void GetEffect(nsString& aEffect, ErrorResult& aRv);
|
|
void SetEffect(const nsAString& aEffect, ErrorResult& aRv);
|
|
void GetWhiteBalanceMode(nsString& aMode, ErrorResult& aRv);
|
|
void SetWhiteBalanceMode(const nsAString& aMode, ErrorResult& aRv);
|
|
void GetSceneMode(nsString& aMode, ErrorResult& aRv);
|
|
void SetSceneMode(const nsAString& aMode, ErrorResult& aRv);
|
|
void GetFlashMode(nsString& aMode, ErrorResult& aRv);
|
|
void SetFlashMode(const nsAString& aMode, ErrorResult& aRv);
|
|
void GetFocusMode(nsString& aMode, ErrorResult& aRv);
|
|
void SetFocusMode(const nsAString& aMode, ErrorResult& aRv);
|
|
double GetZoom(ErrorResult& aRv);
|
|
void SetZoom(double aZoom, ErrorResult& aRv);
|
|
double GetFocalLength(ErrorResult& aRv);
|
|
double GetFocusDistanceNear(ErrorResult& aRv);
|
|
double GetFocusDistanceOptimum(ErrorResult& aRv);
|
|
double GetFocusDistanceFar(ErrorResult& aRv);
|
|
void SetExposureCompensation(double aCompensation, ErrorResult& aRv);
|
|
double GetExposureCompensation(ErrorResult& aRv);
|
|
int32_t SensorAngle();
|
|
already_AddRefed<dom::CameraCapabilities> Capabilities();
|
|
void GetIsoMode(nsString& aMode, ErrorResult& aRv);
|
|
void SetIsoMode(const nsAString& aMode, ErrorResult& aRv);
|
|
double GetPictureQuality(ErrorResult& aRv);
|
|
void SetPictureQuality(double aQuality, ErrorResult& aRv);
|
|
void GetMeteringMode(nsString& aMode, ErrorResult& aRv);
|
|
void SetMeteringMode(const nsAString& aMode, ErrorResult& aRv);
|
|
|
|
// Methods.
|
|
already_AddRefed<dom::Promise> SetConfiguration(const dom::CameraConfiguration& aConfiguration,
|
|
ErrorResult& aRv);
|
|
void GetMeteringAreas(nsTArray<dom::CameraRegion>& aAreas, ErrorResult& aRv);
|
|
void SetMeteringAreas(const dom::Optional<dom::Sequence<dom::CameraRegion> >& aAreas, ErrorResult& aRv);
|
|
void GetFocusAreas(nsTArray<dom::CameraRegion>& aAreas, ErrorResult& aRv);
|
|
void SetFocusAreas(const dom::Optional<dom::Sequence<dom::CameraRegion> >& aAreas, ErrorResult& aRv);
|
|
void GetPictureSize(dom::CameraSize& aSize, ErrorResult& aRv);
|
|
void SetPictureSize(const dom::CameraSize& aSize, ErrorResult& aRv);
|
|
void GetThumbnailSize(dom::CameraSize& aSize, ErrorResult& aRv);
|
|
void SetThumbnailSize(const dom::CameraSize& aSize, ErrorResult& aRv);
|
|
already_AddRefed<dom::Promise> AutoFocus(ErrorResult& aRv);
|
|
void StartFaceDetection(ErrorResult& aRv);
|
|
void StopFaceDetection(ErrorResult& aRv);
|
|
already_AddRefed<dom::Promise> TakePicture(const dom::CameraPictureOptions& aOptions,
|
|
ErrorResult& aRv);
|
|
already_AddRefed<dom::Promise> StartRecording(const dom::CameraStartRecordingOptions& aOptions,
|
|
nsDOMDeviceStorage& storageArea,
|
|
const nsAString& filename,
|
|
ErrorResult& aRv);
|
|
void StopRecording(ErrorResult& aRv);
|
|
void PauseRecording(ErrorResult& aRv);
|
|
void ResumeRecording(ErrorResult& aRv);
|
|
void ResumePreview(ErrorResult& aRv);
|
|
already_AddRefed<dom::Promise> ReleaseHardware(ErrorResult& aRv);
|
|
void ResumeContinuousFocus(ErrorResult& aRv);
|
|
|
|
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
|
|
|
|
operator nsISupports*() { return static_cast<DOMMediaStream*>(this); }
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
static void PreinitCameraHardware();
|
|
static void DiscardCachedCameraInstance(nsITimer* aTimer, void* aClosure);
|
|
#endif
|
|
|
|
IMPL_EVENT_HANDLER(facesdetected)
|
|
IMPL_EVENT_HANDLER(shutter)
|
|
IMPL_EVENT_HANDLER(close)
|
|
IMPL_EVENT_HANDLER(recorderstatechange)
|
|
IMPL_EVENT_HANDLER(previewstatechange)
|
|
IMPL_EVENT_HANDLER(focus)
|
|
IMPL_EVENT_HANDLER(picture)
|
|
IMPL_EVENT_HANDLER(configurationchange)
|
|
IMPL_EVENT_HANDLER(poster)
|
|
|
|
protected:
|
|
virtual ~nsDOMCameraControl();
|
|
|
|
class DOMCameraConfiguration final : public dom::CameraConfiguration
|
|
{
|
|
public:
|
|
NS_INLINE_DECL_REFCOUNTING(DOMCameraConfiguration)
|
|
|
|
DOMCameraConfiguration();
|
|
explicit DOMCameraConfiguration(const dom::CameraConfiguration& aConfiguration);
|
|
|
|
// Additional configuration options that aren't exposed to the DOM
|
|
uint32_t mMaxFocusAreas;
|
|
uint32_t mMaxMeteringAreas;
|
|
|
|
private:
|
|
// Private destructor, to discourage deletion outside of Release():
|
|
~DOMCameraConfiguration();
|
|
};
|
|
|
|
friend class DOMCameraControlListener;
|
|
friend class mozilla::StartRecordingHelper;
|
|
friend class mozilla::RecorderPosterHelper;
|
|
|
|
void OnCreatedFileDescriptor(bool aSucceeded);
|
|
|
|
void OnAutoFocusComplete(bool aAutoFocusSucceeded);
|
|
void OnAutoFocusMoving(bool aIsMoving);
|
|
void OnTakePictureComplete(nsIDOMBlob* aPicture);
|
|
void OnFacesDetected(const nsTArray<ICameraControl::Face>& aFaces);
|
|
void OnPoster(dom::BlobImpl* aPoster);
|
|
|
|
void OnGetCameraComplete();
|
|
void OnHardwareStateChange(DOMCameraControlListener::HardwareState aState, nsresult aReason);
|
|
void OnPreviewStateChange(DOMCameraControlListener::PreviewState aState);
|
|
void OnRecorderStateChange(CameraControlListener::RecorderState aState, int32_t aStatus, int32_t aTrackNum);
|
|
void OnConfigurationChange(DOMCameraConfiguration* aConfiguration);
|
|
void OnShutter();
|
|
void OnUserError(CameraControlListener::UserContext aContext, nsresult aError);
|
|
|
|
bool IsWindowStillActive();
|
|
nsresult SelectPreviewSize(const dom::CameraSize& aRequestedPreviewSize, ICameraControl::Size& aSelectedPreviewSize);
|
|
|
|
void ReleaseAudioChannelAgent();
|
|
nsresult NotifyRecordingStatusChange(const nsString& aMsg);
|
|
|
|
already_AddRefed<dom::Promise> CreatePromise(ErrorResult& aRv);
|
|
void AbortPromise(RefPtr<dom::Promise>& aPromise);
|
|
virtual void EventListenerAdded(nsIAtom* aType) override;
|
|
void DispatchPreviewStateEvent(DOMCameraControlListener::PreviewState aState);
|
|
void DispatchStateEvent(const nsString& aType, const nsString& aState);
|
|
|
|
RefPtr<ICameraControl> mCameraControl; // non-DOM camera control
|
|
|
|
// An agent used to join audio channel service.
|
|
nsCOMPtr<nsIAudioChannelAgent> mAudioChannelAgent;
|
|
|
|
nsresult Set(uint32_t aKey, const dom::Optional<dom::Sequence<dom::CameraRegion> >& aValue, uint32_t aLimit);
|
|
nsresult Get(uint32_t aKey, nsTArray<dom::CameraRegion>& aValue);
|
|
|
|
RefPtr<DOMCameraConfiguration> mCurrentConfiguration;
|
|
RefPtr<dom::CameraCapabilities> mCapabilities;
|
|
|
|
// camera control pending promises
|
|
RefPtr<dom::Promise> mGetCameraPromise;
|
|
RefPtr<dom::Promise> mAutoFocusPromise;
|
|
RefPtr<dom::Promise> mTakePicturePromise;
|
|
RefPtr<dom::Promise> mStartRecordingPromise;
|
|
RefPtr<dom::Promise> mReleasePromise;
|
|
RefPtr<dom::Promise> mSetConfigurationPromise;
|
|
|
|
// Camera event listener; we only need this weak reference so that
|
|
// we can remove the listener from the camera when we're done
|
|
// with it.
|
|
DOMCameraControlListener* mListener;
|
|
|
|
// our viewfinder stream
|
|
RefPtr<CameraPreviewMediaStream> mInput;
|
|
|
|
// A listener on mInput for adding tracks to the DOM side.
|
|
RefPtr<TrackCreatedListener> mTrackCreatedListener;
|
|
|
|
// set once when this object is created
|
|
nsCOMPtr<nsPIDOMWindow> mWindow;
|
|
|
|
dom::CameraStartRecordingOptions mOptions;
|
|
RefPtr<DeviceStorageFileDescriptor> mDSFileDescriptor;
|
|
DOMCameraControlListener::PreviewState mPreviewState;
|
|
bool mRecording;
|
|
bool mRecordingStoppedDeferred;
|
|
bool mSetInitialConfig;
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
// cached camera control, to improve start-up time
|
|
static StaticRefPtr<ICameraControl> sCachedCameraControl;
|
|
static nsresult sCachedCameraControlStartResult;
|
|
static nsCOMPtr<nsITimer> sDiscardCachedCameraControlTimer;
|
|
#endif
|
|
|
|
private:
|
|
nsDOMCameraControl(const nsDOMCameraControl&) = delete;
|
|
nsDOMCameraControl& operator=(const nsDOMCameraControl&) = delete;
|
|
};
|
|
|
|
NS_DEFINE_STATIC_IID_ACCESSOR(nsDOMCameraControl, NS_DOM_CAMERA_CONTROL_CID)
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif // DOM_CAMERA_DOMCAMERACONTROL_H
|