mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 13:23:07 +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)
339 lines
10 KiB
C++
339 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_ICAMERACONTROL_H
|
|
#define DOM_CAMERA_ICAMERACONTROL_H
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsString.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "nsISupportsImpl.h"
|
|
#include "base/basictypes.h"
|
|
|
|
struct DeviceStorageFileDescriptor;
|
|
|
|
namespace mozilla {
|
|
|
|
class CameraControlListener;
|
|
|
|
// XXXmikeh - In some future patch this should move into the ICameraControl
|
|
// class as well, and the names updated to the 'k'-style;
|
|
// e.g. kParamPreviewSize, etc.
|
|
enum {
|
|
// current settings
|
|
CAMERA_PARAM_PREVIEWSIZE,
|
|
CAMERA_PARAM_PREVIEWFORMAT,
|
|
CAMERA_PARAM_PREVIEWFRAMERATE,
|
|
CAMERA_PARAM_VIDEOSIZE,
|
|
CAMERA_PARAM_PICTURE_SIZE,
|
|
CAMERA_PARAM_PICTURE_FILEFORMAT,
|
|
CAMERA_PARAM_PICTURE_ROTATION,
|
|
CAMERA_PARAM_PICTURE_LOCATION,
|
|
CAMERA_PARAM_PICTURE_DATETIME,
|
|
CAMERA_PARAM_PICTURE_QUALITY,
|
|
CAMERA_PARAM_EFFECT,
|
|
CAMERA_PARAM_WHITEBALANCE,
|
|
CAMERA_PARAM_SCENEMODE,
|
|
CAMERA_PARAM_FLASHMODE,
|
|
CAMERA_PARAM_FOCUSMODE,
|
|
CAMERA_PARAM_ZOOM,
|
|
CAMERA_PARAM_METERINGAREAS,
|
|
CAMERA_PARAM_FOCUSAREAS,
|
|
CAMERA_PARAM_FOCALLENGTH,
|
|
CAMERA_PARAM_FOCUSDISTANCENEAR,
|
|
CAMERA_PARAM_FOCUSDISTANCEOPTIMUM,
|
|
CAMERA_PARAM_FOCUSDISTANCEFAR,
|
|
CAMERA_PARAM_EXPOSURECOMPENSATION,
|
|
CAMERA_PARAM_THUMBNAILSIZE,
|
|
CAMERA_PARAM_THUMBNAILQUALITY,
|
|
CAMERA_PARAM_SENSORANGLE,
|
|
CAMERA_PARAM_ISOMODE,
|
|
CAMERA_PARAM_LUMINANCE,
|
|
CAMERA_PARAM_SCENEMODE_HDR_RETURNNORMALPICTURE,
|
|
CAMERA_PARAM_RECORDINGHINT,
|
|
CAMERA_PARAM_PREFERRED_PREVIEWSIZE_FOR_VIDEO,
|
|
CAMERA_PARAM_METERINGMODE,
|
|
|
|
// supported features
|
|
CAMERA_PARAM_SUPPORTED_PREVIEWSIZES,
|
|
CAMERA_PARAM_SUPPORTED_PICTURESIZES,
|
|
CAMERA_PARAM_SUPPORTED_VIDEOSIZES,
|
|
CAMERA_PARAM_SUPPORTED_PICTUREFORMATS,
|
|
CAMERA_PARAM_SUPPORTED_WHITEBALANCES,
|
|
CAMERA_PARAM_SUPPORTED_SCENEMODES,
|
|
CAMERA_PARAM_SUPPORTED_EFFECTS,
|
|
CAMERA_PARAM_SUPPORTED_FLASHMODES,
|
|
CAMERA_PARAM_SUPPORTED_FOCUSMODES,
|
|
CAMERA_PARAM_SUPPORTED_MAXFOCUSAREAS,
|
|
CAMERA_PARAM_SUPPORTED_MAXMETERINGAREAS,
|
|
CAMERA_PARAM_SUPPORTED_MINEXPOSURECOMPENSATION,
|
|
CAMERA_PARAM_SUPPORTED_MAXEXPOSURECOMPENSATION,
|
|
CAMERA_PARAM_SUPPORTED_EXPOSURECOMPENSATIONSTEP,
|
|
CAMERA_PARAM_SUPPORTED_ZOOM,
|
|
CAMERA_PARAM_SUPPORTED_ZOOMRATIOS,
|
|
CAMERA_PARAM_SUPPORTED_MAXDETECTEDFACES,
|
|
CAMERA_PARAM_SUPPORTED_JPEG_THUMBNAIL_SIZES,
|
|
CAMERA_PARAM_SUPPORTED_ISOMODES,
|
|
CAMERA_PARAM_SUPPORTED_METERINGMODES
|
|
};
|
|
|
|
class ICameraControl
|
|
{
|
|
public:
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(ICameraControl)
|
|
|
|
// Returns the number of cameras supported by the system.
|
|
//
|
|
// Return values:
|
|
// - NS_OK on success;
|
|
// - NS_ERROR_FAILURE if the camera count cannot be retrieved.
|
|
static nsresult GetNumberOfCameras(int32_t& aDeviceCount);
|
|
|
|
// Gets the (possibly-meaningful) name of a particular camera.
|
|
//
|
|
// Return values:
|
|
// - NS_OK on success;
|
|
// - NS_ERROR_INVALID_ARG if 'aDeviceNum' is not a valid camera number;
|
|
// - NS_ERROR_NOT_AVAILABLE if 'aDeviceNum' is valid but the camera name
|
|
// could still not be retrieved.
|
|
static nsresult GetCameraName(uint32_t aDeviceNum, nsCString& aDeviceName);
|
|
|
|
// Returns a list of names of all cameras supported by the system.
|
|
//
|
|
// Return values:
|
|
// - NS_OK on success, even if no camera names are returned (in which
|
|
// case 'aList' will be empty);
|
|
// - NS_ERROR_NOT_AVAILABLE if the list of cameras cannot be retrieved.
|
|
static nsresult GetListOfCameras(nsTArray<nsString>& aList);
|
|
|
|
enum Mode {
|
|
kUnspecifiedMode,
|
|
kPictureMode,
|
|
kVideoMode,
|
|
};
|
|
|
|
struct Size {
|
|
uint32_t width;
|
|
uint32_t height;
|
|
|
|
bool Equals(const Size& aSize) const
|
|
{
|
|
return width == aSize.width && height == aSize.height;
|
|
}
|
|
};
|
|
|
|
struct Region {
|
|
int32_t top;
|
|
int32_t left;
|
|
int32_t bottom;
|
|
int32_t right;
|
|
uint32_t weight;
|
|
};
|
|
|
|
struct Position {
|
|
double latitude;
|
|
double longitude;
|
|
double altitude;
|
|
double timestamp;
|
|
};
|
|
|
|
struct StartRecordingOptions {
|
|
uint32_t rotation;
|
|
uint64_t maxFileSizeBytes;
|
|
uint64_t maxVideoLengthMs;
|
|
bool autoEnableLowLightTorch;
|
|
bool createPoster;
|
|
};
|
|
|
|
struct Configuration {
|
|
Mode mMode;
|
|
Size mPreviewSize;
|
|
Size mPictureSize;
|
|
nsString mRecorderProfile;
|
|
};
|
|
|
|
struct Point {
|
|
int32_t x;
|
|
int32_t y;
|
|
};
|
|
|
|
struct Face {
|
|
uint32_t id;
|
|
uint32_t score;
|
|
Region bound;
|
|
bool hasLeftEye;
|
|
Point leftEye;
|
|
bool hasRightEye;
|
|
Point rightEye;
|
|
bool hasMouth;
|
|
Point mouth;
|
|
};
|
|
|
|
class RecorderProfile
|
|
{
|
|
public:
|
|
class Video
|
|
{
|
|
public:
|
|
Video() { }
|
|
virtual ~Video() { }
|
|
|
|
const nsString& GetCodec() const { return mCodec; }
|
|
const Size& GetSize() const { return mSize; }
|
|
uint32_t GetBitsPerSecond() const { return mBitsPerSecond; }
|
|
uint32_t GetFramesPerSecond() const { return mFramesPerSecond; }
|
|
|
|
protected:
|
|
nsString mCodec;
|
|
Size mSize;
|
|
uint32_t mBitsPerSecond;
|
|
uint32_t mFramesPerSecond;
|
|
|
|
private:
|
|
DISALLOW_EVIL_CONSTRUCTORS(Video);
|
|
};
|
|
|
|
class Audio
|
|
{
|
|
public:
|
|
Audio() { }
|
|
virtual ~Audio() { }
|
|
|
|
const nsString& GetCodec() const { return mCodec; }
|
|
|
|
uint32_t GetChannels() const { return mChannels; }
|
|
uint32_t GetBitsPerSecond() const { return mBitsPerSecond; }
|
|
uint32_t GetSamplesPerSecond() const { return mSamplesPerSecond; }
|
|
|
|
protected:
|
|
nsString mCodec;
|
|
uint32_t mChannels;
|
|
uint32_t mBitsPerSecond;
|
|
uint32_t mSamplesPerSecond;
|
|
|
|
private:
|
|
DISALLOW_EVIL_CONSTRUCTORS(Audio);
|
|
};
|
|
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(RecorderProfile)
|
|
|
|
RecorderProfile()
|
|
{ }
|
|
|
|
const nsString& GetName() const { return mName; }
|
|
const nsString& GetContainer() const { return mContainer; }
|
|
const nsString& GetMimeType() const { return mMimeType; }
|
|
uint32_t GetPriority() const { return mPriority; }
|
|
|
|
virtual const Video& GetVideo() const = 0;
|
|
virtual const Audio& GetAudio() const = 0;
|
|
|
|
protected:
|
|
virtual ~RecorderProfile() { }
|
|
|
|
nsString mName;
|
|
nsString mContainer;
|
|
nsString mMimeType;
|
|
uint32_t mPriority;
|
|
|
|
private:
|
|
DISALLOW_EVIL_CONSTRUCTORS(RecorderProfile);
|
|
};
|
|
|
|
static already_AddRefed<ICameraControl> Create(uint32_t aCameraId);
|
|
|
|
virtual void AddListener(CameraControlListener* aListener) = 0;
|
|
virtual void RemoveListener(CameraControlListener* aListener) = 0;
|
|
|
|
// Camera control methods.
|
|
//
|
|
// Return values:
|
|
// - NS_OK on success (if the method requires an asynchronous process,
|
|
// this value indicates that the process has begun successfully);
|
|
// - NS_ERROR_INVALID_ARG if one or more arguments is invalid;
|
|
// - NS_ERROR_FAILURE if an asynchronous method could not be dispatched.
|
|
virtual nsresult Start(const Configuration* aInitialConfig = nullptr) = 0;
|
|
virtual nsresult Stop() = 0;
|
|
virtual nsresult SetConfiguration(const Configuration& aConfig) = 0;
|
|
virtual nsresult StartPreview() = 0;
|
|
virtual nsresult StopPreview() = 0;
|
|
virtual nsresult AutoFocus() = 0;
|
|
virtual nsresult TakePicture() = 0;
|
|
virtual nsresult StartRecording(DeviceStorageFileDescriptor* aFileDescriptor,
|
|
const StartRecordingOptions* aOptions = nullptr) = 0;
|
|
virtual nsresult StopRecording() = 0;
|
|
virtual nsresult PauseRecording() = 0;
|
|
virtual nsresult ResumeRecording() = 0;
|
|
virtual nsresult StartFaceDetection() = 0;
|
|
virtual nsresult StopFaceDetection() = 0;
|
|
virtual nsresult ResumeContinuousFocus() = 0;
|
|
|
|
// Camera parameter getters and setters. 'aKey' must be one of the
|
|
// CAMERA_PARAM_* values enumerated above.
|
|
//
|
|
// Return values:
|
|
// - NS_OK on success;
|
|
// - NS_ERROR_INVALID_ARG if 'aValue' contains an invalid value;
|
|
// - NS_ERROR_NOT_IMPLEMENTED if 'aKey' is invalid;
|
|
// - NS_ERROR_NOT_AVAILABLE if the getter fails to retrieve a valid value,
|
|
// or if a setter fails because it requires one or more values that
|
|
// could not be retrieved;
|
|
// - NS_ERROR_FAILURE on unexpected internal failures.
|
|
virtual nsresult Set(uint32_t aKey, const nsAString& aValue) = 0;
|
|
virtual nsresult Get(uint32_t aKey, nsAString& aValue) = 0;
|
|
virtual nsresult Set(uint32_t aKey, double aValue) = 0;
|
|
virtual nsresult Get(uint32_t aKey, double& aValue) = 0;
|
|
virtual nsresult Set(uint32_t aKey, int32_t aValue) = 0;
|
|
virtual nsresult Get(uint32_t aKey, int32_t& aValue) = 0;
|
|
virtual nsresult Set(uint32_t aKey, int64_t aValue) = 0;
|
|
virtual nsresult Get(uint32_t aKey, int64_t& aValue) = 0;
|
|
virtual nsresult Set(uint32_t aKey, bool aValue) = 0;
|
|
virtual nsresult Get(uint32_t aKey, bool& aValue) = 0;
|
|
virtual nsresult Set(uint32_t aKey, const Size& aValue) = 0;
|
|
virtual nsresult Get(uint32_t aKey, Size& aValue) = 0;
|
|
virtual nsresult Set(uint32_t aKey, const nsTArray<Region>& aRegions) = 0;
|
|
virtual nsresult Get(uint32_t aKey, nsTArray<Region>& aRegions) = 0;
|
|
|
|
virtual nsresult SetLocation(const Position& aLocation) = 0;
|
|
|
|
virtual nsresult Get(uint32_t aKey, nsTArray<Size>& aSizes) = 0;
|
|
virtual nsresult Get(uint32_t aKey, nsTArray<nsString>& aValues) = 0;
|
|
virtual nsresult Get(uint32_t aKey, nsTArray<double>& aValues) = 0;
|
|
|
|
virtual nsresult GetRecorderProfiles(nsTArray<nsString>& aProfiles) = 0;
|
|
virtual RecorderProfile* GetProfileInfo(const nsAString& aProfile) = 0;
|
|
|
|
protected:
|
|
virtual ~ICameraControl() { }
|
|
|
|
friend class ICameraControlParameterSetAutoEnter;
|
|
|
|
virtual void BeginBatchParameterSet() = 0;
|
|
virtual void EndBatchParameterSet() = 0;
|
|
};
|
|
|
|
// Helper class to make it easy to update a batch of camera parameters;
|
|
// the parameters are applied atomically when this object goes out of
|
|
// scope.
|
|
class ICameraControlParameterSetAutoEnter
|
|
{
|
|
public:
|
|
explicit ICameraControlParameterSetAutoEnter(ICameraControl* aCameraControl)
|
|
: mCameraControl(aCameraControl)
|
|
{
|
|
mCameraControl->BeginBatchParameterSet();
|
|
}
|
|
virtual ~ICameraControlParameterSetAutoEnter()
|
|
{
|
|
mCameraControl->EndBatchParameterSet();
|
|
}
|
|
|
|
protected:
|
|
RefPtr<ICameraControl> mCameraControl;
|
|
};
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif // DOM_CAMERA_ICAMERACONTROL_H
|