mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-29 18:18:27 +00:00
bc8ce42355
- Bug 1226200: Don't assume a TCPSocket has only one managee (and rename LoneManagedOrNull) r=jdm (aa2d0fcc14) - Bug 1227300, Part 1 - Add an alert notification component. r=MattN,wchen (37758ce9ff) - Bug 1230700. Make Notification::ShowInternal explicitly suppress the exception from GetPermissionInternal. r=smaug (9e288cf5ae) - Bug 1225336 - Add telemetry about web notification display/messages. r=wchen,kitcambridge p=vladan# Please enter the commit message for your changes. Lines starting (b2e481691a) - Bug 1219030 - Collect notification management telemetry. r=wchen,MattN; p=ally (c0ba425b4e) - Bug 1212611 - Use system notification for website notifications in Android. r=mfinkle (84985bcf01) - Bug 1227300, Part 2 - Implement showAlert. r=MattN,wchen (33eedc7e91) - Bug 1214305 - Part 0: Ensure site security service is initialized before trying to use DataStorage via IPC. (8bd73f43b0) - Bug 1137681 - Make user agent docshell overrides affect network requests. r=jduell (e8dabb8338) - Bug 1233245 - Propagate the interception information in the non-e10s case for all HTTP redirects, not just the internal ones; r=jdm (6922fddcf8) - Bug 1226444 - Use helper function to identify preloads. r=sicking (d110669f73) - Bug 1214305 - Part 1: Refactor the logic for querying whether a connection should go through a secure upgrade into NS_ShouldSecureUpgrade; r=mcmanus (2d04c78290) - Bug 1137681 - Per-tab user agent emulation. r=bz (4ff70db690) - Bug 1227300, Part 3 - Implement showAlert for the OS X alerts backend. r=mstange (5eb05d0728) - Bug 1227300, Part 4 - Implement showAlert for the libnotify alerts backend. r=karlt (0942fa2764) - Bug 1227300, Part 5 - Implement showAlert for the B2G alerts backend. r=mhenretty (e39581aea5) - Bug 1227300, Part 6 - Use showAlert to display web notifications. r=wchen (ab79eaa0c8) - domBug 1227300, Part 7 - Update test interfaces. a=testonly (387cb62772) - Bug 1214305 - Part 3: Add a nsIInterceptedChannel.secureUpgradedChannelURI helper; r=jdm (811d25bd58) - Bug 1214305 - Part 4: Use the secure upgraded channel URI in ServiceWorkerManager::PrepareFetchEvent; r=jdm (0c44bf527c) - Bug 1214305 - Part 5: Use the secure upgraded channel URI in FetchEventRunnable::Init; r=jdm (a30f239261) - Bug 1214305 - Part 6: Use a non-IPC redirect for synthesized upgraded responses to ensure the response URL is correctly propagated; r=mcmanus (8ba8a5728c) - Bug 1214305 - Part 7: Decide in the child process whether an intercepted channel should go through a secure upgrade; r=mcmanus (93e27decae) - Bug 1198397 - Add a test for interception of requests upgraded through the CSP upgrade-insecure-requests directive; r=jdm (21eb14eb34) - Bug 1214305 - Part 8: Enable secure upgrade service worker tests on e10s; r=jdm (c14f5fb504) - Bug 1214305 - Part 10: Clean up global DataStorage references in the child process; r=keeler (ef0b52d049) - Bug 1224771 - Close all web notifications when the originating tab is closed. r=wchen (da295b4ba7) - Bug 1214305 - Part 2: Refactor the logic for obtaining the secure upgraded URI into HttpBaseChannel; r=mcmanus (3346078285) - Bug 1237151 (part 1) - Remove ignored qualifiers in dom/media/gmp/. r=cpearce. (18134820a6) - Bug 1237151 (part 2) - Remove ignored qualifiers in WebRTC-relate code. r=jesup. (effe5bd694) - Bug 1118820 part 1 (style system part) - [css-grid] Implement the 'auto-fill' and 'auto-fit' keywords in the repeat() function. r=dholbert (5db1a577db) - Bug 1118820 part 2a - [css-grid] Add a LineNameMap class that lets us lookup line names with a dynamic number of 'repeat(auto-fill/auto-fit)' tracks taken into account. r=dholbert (3ecf4b53f0) - Bug 1118820 part 2b - [css-grid] Move the static functions FindLine/RFindLine/FindNamedLine into the LineNameMap class (idempotent patch). r=dholbert (efb12c594b) - Bug 1118820 part 2c+2d - [css-grid] Modify the LineNameMap::FindLine/RFindLine/FindNamedLine methods to take line names associated with 'repeat(auto-fill/auto-fit)' tracks into account. Instantiate and pass around a LineNameMap object instead of an array of line name arrays. r=dholbert (a3db750297) - Bug 1118820 part 3a - [css-grid] Modify TrackSizingFunctions to take a dynamic number of 'repeat(auto-fill/auto-fit)' tracks taking into account. r=dholbert (9aa6033332) - Bug 1118820 part 3b - [css-grid] Implement the CalculateRepeatFillCount method that calculates the number of 'repeat(auto-fill/auto-fit)' tracks to use for the given sizes. r=dholbert (cf75fab8a8) - Bug 1118820 part 4 - [css-grid] Provide the sizes to use for CalculateRepeatFillCount. r=dholbert (8184c00dba) - Bug 1118820 part 5 - [css-grid] Remove any empty 'repeat(auto-fit)' tracks at the end of its range and adjust affected grid area line numbers accordingly. r=dholbert (c02ba6a6e3) - Bug 1229165 - [css-grid] Reftests for min/max-width/height properties on the grid container. (725097f878) - Bug 1229999 - [css-grid] Reftest. (51b5bc9535) - Bug 1237151 (part 3) - Remove ignored qualifiers in all remaining code. r=froydnj. (69917ebbad) - more bits of Bug 1178892 - Split the profiler into Core & Gecko files (41bb127b9c) - Bug 1199841 - Restructure private browsing to remember status after OnStopRequest r=jdm (16c2c1044d) - Bug 1233845 - Report an interception error and cancel the HTTP channel when encountering a known topcrash situation. r=ehsan (5d08075110) - Bug 664163 - Fix Get(Local|Remote)(Address|Port) in HttpChannelChild. r=jduell (cbf70af4e8) - Bug 1229177 - Show the tracking protection shield for fetch and XHR requests. r=jduell (5833b3e872) - Bug 1220678 Don't crash when DivertToParent() is called on an intercepted channel. r=jdm (5d7ff6ecc8) - Bug 1220681 P1 Make HttpChannelChild::DivertToParent() work with synthetic responses. r=jdm (67715703ef) - Bug 1169819 Add browser chrome test to validate SW force refresh. r=ehsan (c0b6b3e874) - Bug 1220681 P2 Test synthetic responses that trigger downloads. r=ehsan (c701f3ddb1) - Bug 1220681 P3 Delay diversion on parent side until response head has been synthesized. r=jdm (7c697aacee) - Bug 1220681 P4 Automatically suspend the parent channel after synthesizing the response for diverison. r=jdm (27f31bcb35) - Bug 1220681 P5 Don't double suspend parent channel during synthesized divert to parent. r=jdm (62081d4b56) - Bug 1220681 P6 Use clients.claim() in browser_download.js to avoid worker unregister race. r=jdm (c8de291727) - Bug 1240161 - Remove "only-if-cached" from RequestCache; r=bkelly (283486f584) - Bug 1184550 - Add a mochitest for the Request constructor that tests that the body is set to used after being fetched and then fails on the second fetch with the same Request. r=bkelly (db4a967203) - Bug 1205495 - Correctly use the requests's body and redirect mode in reroute.js; r=nsm (a36a96624a) - Bug 1189656 - Fix fetch-request-fallback test paths. r=bkelly (366c884179) - Bug 1219085 - Import the fetch-request-redirect.https.html test from Blink; r=jdm (bf6b484d82) - Bug 1209081 - Part 1: Implement the "navigate" value for RequestMode; r=bkelly (a22f19d94b) - Bug 1209081 - Part 2: Upgrade the saved Requests in the DOM Cache to reflect the "navigate" RequestMode if they represent navigation content policy types; r=bkelly (60d1da23bb) - Bug 1219469 - Part 1: Revert the error reporting added in bug 1233845; r=jdm (dcc022b9d3) - Bug 1219469 - Part 2: Make HttpChannelParentListener be the controller; r=jdm,jduell (9c5f0dfbe0) - Bug 1229369 - Intercept redirected network fetches that have their request mode set to manual; r=jdm (fb21d86ed2)
274 lines
8.1 KiB
C++
274 lines
8.1 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 MEDIAENGINE_H_
|
|
#define MEDIAENGINE_H_
|
|
|
|
#include "mozilla/RefPtr.h"
|
|
#include "DOMMediaStream.h"
|
|
#include "MediaStreamGraph.h"
|
|
#include "mozilla/dom/MediaStreamTrackBinding.h"
|
|
#include "mozilla/dom/VideoStreamTrack.h"
|
|
|
|
namespace mozilla {
|
|
|
|
namespace dom {
|
|
class Blob;
|
|
}
|
|
|
|
enum {
|
|
kVideoTrack = 1,
|
|
kAudioTrack = 2,
|
|
kTrackCount
|
|
};
|
|
|
|
/**
|
|
* Abstract interface for managing audio and video devices. Each platform
|
|
* must implement a concrete class that will map these classes and methods
|
|
* to the appropriate backend. For example, on Desktop platforms, these will
|
|
* correspond to equivalent webrtc (GIPS) calls, and on B2G they will map to
|
|
* a Gonk interface.
|
|
*/
|
|
class MediaEngineVideoSource;
|
|
class MediaEngineAudioSource;
|
|
class MediaEnginePrefs;
|
|
|
|
enum MediaEngineState {
|
|
kAllocated,
|
|
kStarted,
|
|
kStopped,
|
|
kReleased
|
|
};
|
|
|
|
class MediaEngine
|
|
{
|
|
public:
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaEngine)
|
|
|
|
static const int DEFAULT_VIDEO_FPS = 30;
|
|
static const int DEFAULT_VIDEO_MIN_FPS = 10;
|
|
static const int DEFAULT_43_VIDEO_WIDTH = 640;
|
|
static const int DEFAULT_43_VIDEO_HEIGHT = 480;
|
|
static const int DEFAULT_169_VIDEO_WIDTH = 1280;
|
|
static const int DEFAULT_169_VIDEO_HEIGHT = 720;
|
|
static const int DEFAULT_AUDIO_TIMER_MS = 10;
|
|
|
|
#ifndef MOZ_B2G
|
|
static const int DEFAULT_SAMPLE_RATE = 32000;
|
|
#else
|
|
static const int DEFAULT_SAMPLE_RATE = 16000;
|
|
#endif
|
|
|
|
/* Populate an array of video sources in the nsTArray. Also include devices
|
|
* that are currently unavailable. */
|
|
virtual void EnumerateVideoDevices(dom::MediaSourceEnum,
|
|
nsTArray<RefPtr<MediaEngineVideoSource> >*) = 0;
|
|
|
|
/* Populate an array of audio sources in the nsTArray. Also include devices
|
|
* that are currently unavailable. */
|
|
virtual void EnumerateAudioDevices(dom::MediaSourceEnum,
|
|
nsTArray<RefPtr<MediaEngineAudioSource> >*) = 0;
|
|
|
|
virtual void Shutdown() = 0;
|
|
|
|
protected:
|
|
virtual ~MediaEngine() {}
|
|
};
|
|
|
|
/**
|
|
* Common abstract base class for audio and video sources.
|
|
*/
|
|
class MediaEngineSource : public nsISupports
|
|
{
|
|
public:
|
|
// code inside webrtc.org assumes these sizes; don't use anything smaller
|
|
// without verifying it's ok
|
|
static const unsigned int kMaxDeviceNameLength = 128;
|
|
static const unsigned int kMaxUniqueIdLength = 256;
|
|
|
|
virtual ~MediaEngineSource() {}
|
|
|
|
virtual void Shutdown() = 0;
|
|
|
|
/* Populate the human readable name of this device in the nsAString */
|
|
virtual void GetName(nsAString&) = 0;
|
|
|
|
/* Populate the UUID of this device in the nsACString */
|
|
virtual void GetUUID(nsACString&) = 0;
|
|
|
|
/* Release the device back to the system. */
|
|
virtual nsresult Deallocate() = 0;
|
|
|
|
/* Start the device and add the track to the provided SourceMediaStream, with
|
|
* the provided TrackID. You may start appending data to the track
|
|
* immediately after. */
|
|
virtual nsresult Start(SourceMediaStream*, TrackID) = 0;
|
|
|
|
/* tell the source if there are any direct listeners attached */
|
|
virtual void SetDirectListeners(bool) = 0;
|
|
|
|
/* Called when the stream wants more data */
|
|
virtual void NotifyPull(MediaStreamGraph* aGraph,
|
|
SourceMediaStream *aSource,
|
|
TrackID aId,
|
|
StreamTime aDesiredTime) = 0;
|
|
|
|
/* Stop the device and release the corresponding MediaStream */
|
|
virtual nsresult Stop(SourceMediaStream *aSource, TrackID aID) = 0;
|
|
|
|
/* Restart with new capability */
|
|
virtual nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
|
|
const MediaEnginePrefs &aPrefs,
|
|
const nsString& aDeviceId) = 0;
|
|
|
|
/* Change device configuration. */
|
|
virtual nsresult Config(bool aEchoOn, uint32_t aEcho,
|
|
bool aAgcOn, uint32_t aAGC,
|
|
bool aNoiseOn, uint32_t aNoise,
|
|
int32_t aPlayoutDelay) = 0;
|
|
|
|
/* Returns true if a source represents a fake capture device and
|
|
* false otherwise
|
|
*/
|
|
virtual bool IsFake() = 0;
|
|
|
|
/* Returns the type of media source (camera, microphone, screen, window, etc) */
|
|
virtual dom::MediaSourceEnum GetMediaSource() const = 0;
|
|
|
|
// Callback interface for TakePhoto(). Either PhotoComplete() or PhotoError()
|
|
// should be called.
|
|
class PhotoCallback {
|
|
public:
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(PhotoCallback)
|
|
|
|
// aBlob is the image captured by MediaEngineSource. It is
|
|
// called on main thread.
|
|
virtual nsresult PhotoComplete(already_AddRefed<dom::Blob> aBlob) = 0;
|
|
|
|
// It is called on main thread. aRv is the error code.
|
|
virtual nsresult PhotoError(nsresult aRv) = 0;
|
|
|
|
protected:
|
|
virtual ~PhotoCallback() {}
|
|
};
|
|
|
|
/* If implementation of MediaEngineSource supports TakePhoto(), the picture
|
|
* should be return via aCallback object. Otherwise, it returns NS_ERROR_NOT_IMPLEMENTED.
|
|
* Currently, only Gonk MediaEngineSource implementation supports it.
|
|
*/
|
|
virtual nsresult TakePhoto(PhotoCallback* aCallback) = 0;
|
|
|
|
/* Return false if device is currently allocated or started */
|
|
bool IsAvailable() {
|
|
if (mState == kAllocated || mState == kStarted) {
|
|
return false;
|
|
} else {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
/* It is an error to call Start() before an Allocate(), and Stop() before
|
|
* a Start(). Only Allocate() may be called after a Deallocate(). */
|
|
|
|
void SetHasFakeTracks(bool aHasFakeTracks) {
|
|
mHasFakeTracks = aHasFakeTracks;
|
|
}
|
|
|
|
/* This call reserves but does not start the device. */
|
|
virtual nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
|
|
const MediaEnginePrefs &aPrefs,
|
|
const nsString& aDeviceId) = 0;
|
|
|
|
virtual uint32_t GetBestFitnessDistance(
|
|
const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets,
|
|
const nsString& aDeviceId) = 0;
|
|
|
|
protected:
|
|
// Only class' own members can be initialized in constructor initializer list.
|
|
explicit MediaEngineSource(MediaEngineState aState)
|
|
: mState(aState)
|
|
, mHasFakeTracks(false)
|
|
{}
|
|
MediaEngineState mState;
|
|
bool mHasFakeTracks;
|
|
};
|
|
|
|
/**
|
|
* Video source and friends.
|
|
*/
|
|
class MediaEnginePrefs {
|
|
public:
|
|
int32_t mWidth;
|
|
int32_t mHeight;
|
|
int32_t mFPS;
|
|
int32_t mMinFPS;
|
|
int32_t mFreq; // for test tones (fake:true)
|
|
|
|
// mWidth and/or mHeight may be zero (=adaptive default), so use functions.
|
|
|
|
int32_t GetWidth(bool aHD = false) const {
|
|
return mWidth? mWidth : (mHeight?
|
|
(mHeight * GetDefWidth(aHD)) / GetDefHeight(aHD) :
|
|
GetDefWidth(aHD));
|
|
}
|
|
|
|
int32_t GetHeight(bool aHD = false) const {
|
|
return mHeight? mHeight : (mWidth?
|
|
(mWidth * GetDefHeight(aHD)) / GetDefWidth(aHD) :
|
|
GetDefHeight(aHD));
|
|
}
|
|
private:
|
|
static int32_t GetDefWidth(bool aHD = false) {
|
|
// It'd be nice if we could use the ternary operator here, but we can't
|
|
// because of bug 1002729.
|
|
if (aHD) {
|
|
return MediaEngine::DEFAULT_169_VIDEO_WIDTH;
|
|
}
|
|
|
|
return MediaEngine::DEFAULT_43_VIDEO_WIDTH;
|
|
}
|
|
|
|
static int32_t GetDefHeight(bool aHD = false) {
|
|
// It'd be nice if we could use the ternary operator here, but we can't
|
|
// because of bug 1002729.
|
|
if (aHD) {
|
|
return MediaEngine::DEFAULT_169_VIDEO_HEIGHT;
|
|
}
|
|
|
|
return MediaEngine::DEFAULT_43_VIDEO_HEIGHT;
|
|
}
|
|
};
|
|
|
|
class MediaEngineVideoSource : public MediaEngineSource
|
|
{
|
|
public:
|
|
virtual ~MediaEngineVideoSource() {}
|
|
|
|
protected:
|
|
explicit MediaEngineVideoSource(MediaEngineState aState)
|
|
: MediaEngineSource(aState) {}
|
|
MediaEngineVideoSource()
|
|
: MediaEngineSource(kReleased) {}
|
|
};
|
|
|
|
/**
|
|
* Audio source and friends.
|
|
*/
|
|
class MediaEngineAudioSource : public MediaEngineSource
|
|
{
|
|
public:
|
|
virtual ~MediaEngineAudioSource() {}
|
|
|
|
protected:
|
|
explicit MediaEngineAudioSource(MediaEngineState aState)
|
|
: MediaEngineSource(aState) {}
|
|
MediaEngineAudioSource()
|
|
: MediaEngineSource(kReleased) {}
|
|
|
|
};
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif /* MEDIAENGINE_H_ */
|