mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
0b93aaef9b
- Bug 1194466. Use the table-outer frame's margin when requesting the margin for table element with getBoxQuads. r=mats (cb73af6b17) - Backed out changeset 3f51676191a6 (bug 1225703) for cpp unittest failures on at least Windows CLOSED TREE (833dc52434) - Bug 1225703 - Update in-tree libcubeb. r=padenot (103b1296c1) - Bug 1236977 - Default initialize IMMDevice temporary to avoid potential garbage CloseHandle on error. r=padenot (fdb076c905) - Bug 1221228 - Work around busted OpenSL causing hangs/reboots on Android r=padenot (a9f8c9e5dd) - Bug 1104643 - Interpolate the audio clock by system clock if the qudio clock is not going forward. r=padenot (180c4ae7c7) - Bug 1241476: Update libcubeb from upstream rs=kinetik (f68d4010e9) - Bug 1242152 - fix sndio build after full-duplex API changes r=kinetik (cd30999c19) - Bug 1243275: Update libcubeb to pick up device-change-notification changes and a pulse fix rs=kinetik (1c5bf75ac2) - Bug 1189197 - enqueue a silent frame to kick off the buffer queue callbacks. r=kinetik. (98a312ec62) - Bug 948267. Part 1 - add the interface DataSource to implement pull model and remove members no longer useful in the pull model. r=kinetik. (8ff0635fca) - Bug 948267. Part 2 - implement AudioStream::DataSource for DecodedAudioDataSink and remove its audio thread. r=kinetik. (00365c71b8) - Bug 948267. Part 3 - remove MDSM::AdjustAudioThresholds() to ensure we have enough data for AudioStream::DataCallback() to consume in the audio-only case. Also increase the amount of prerolling audio to 1s (which is the size of the circular buffer of AudioStream) to ensure a smooth start of playback. r=kinetik. (00f1bfbe02) - Bug 1240417. Part 1 - add a writer class to encapsulate pointer arithmetic. r=kinetik. (a625befc30) - Bug 1240417. Part 2 - remove unused code. r=kinetik. (086c6c461b) - Bug 1240419 - improve logging macros and include |this| in the log message. r=kinetik. (a0242c4e78) - Bug 1240420. Part 1 - move checks of mismatched sample rate or channel numbers to AudioStream. r=kinetik. (41435e9551) - Bug 1240420. Part 2 - fix warnings of signed/unsigned comparison. r=kinetik. (558ce6a918) - Bug 1230902 - initialize mSampleRate and mMicrophoneActive. r=cpearce (a99b661e8b) - Bug 1203585 - Add comments about threading and locking on GraphDriver's members. r=jesup (5dcaa286c3) - Bug 1203585 - Remove some dead code in GraphDriver.cpp. r=jesup (9618d10e70) - Bug 1070216 - Assert main MediaEngine APIs are called on the owning thread. r=jib (6c950d62d0) - Bug 1221587: allow getUserMedia to use full-duplex cubeb streams r=padenot (f67c2219aa) - Bug 1221587: Rename MediaStreamGraphShutdownThreadRunnable2 r=padenot (d9fe2125e7) - Bug 1203585 - Add new methods to GraphDriver to assert that locks are held. r=jesup (a8e2bfbcef) - Bug 1221587: Base update of the MSG API for full-duplex r=padenot (4be37a6184) - Bug 1221587: change audio listeners for full-duplex audio r=padenot (5d94102a32) - Bug 1221587: use cubeb devids to select input devices r=padenot (2f0806756b) - Bug 1221587: Update for API changes in cubeb r=padenot (87c581ce5f) - Bug 1237414: Switch AsyncCubebOperation to a SharedThreadPool r=padenot (965831dac8) - Bug 1203585 - Add a comment block on how MediaStreamGraph switch GraphDrivers. r=jesup (a4839dccb1) - Bug 1240411: P7. Clean up webspeech header declarations. r=rillian (2e91bebdb5) - Bug 1207220: Ensure MediaShutdownManager waits until all MediaDecoder have completed their shutdown. r=cpearce (1782ffb35a) - Bug 1240411: P8. Clean up MediaSource headers. r=cpearce Remove redundant virtual keyword and add missing override if any. (0f99efac9e) - Bug 1240411: P9. Clean up media headers. r=jwwang (cc1165a3f2) - Bug 1203585 - Update the MediaStreamGraph code to lock properly. r=jesup (d523db643a) - Bug 1221587: Implement switching of AudioCallbackDrivers for full-duplex r=padenot (2349ec7734) - Bug 1221587: stall MSG final shutdown until AudioCallbackDriver shutdown has finished r=pehrsons (ad2dfb76dd) - Bug 1203585 - Add threading assertions to GraphDriver switching methods. r=jesup (8c1c2b4d9d) - Bug 1221587: Improve logging of callback driver/switching r=padenot (87253e8f9c) - Bug 1237794: Extend ClearOnShutdown() to allow specifying the shutdown phase r=froyd (cfe5e30311) - Bug 1221587: add per-platform prefs to control full-duplex cubeb input r=jib (0b004cfd10) - Bug 1229240 - test that applyConstraints() rejects on non-Gum track. r=jesup (c65f7ecc4a) - Bug 987186 - remove AudioConfig, send agc/aec/noise from prefs r=jib,smaug (812108e255) - Bug 1245216: plumb preferred sample rate from full_duplex cubeb through NotifyInput/Output r=padenot (9c123866cc) - Bug 1245216: Fix getUserMedia input in full_duplex mode coming from the wrong place r=padenot (8d10177675) - Bug 1227407 - Ensure Cameras is alive before calling through it. r=jesup (e94d7803ee) - Bug 1239384 - Remove static interface for Cameras using forwarding. r=jesup (e5329280c5) - Bug 1239384 - Encapsulate Cameras dispatch, locking and success handling in a class. r=jesup (a0c2391c44) - Bug 1177242 - Verify whether sandboxed Content process has permissions to access the camera/mic. r=jesup (611c4cb04e) - Bug 1247236. r=jesup (fc0286ccb3) - Bug 1239873 - Use AsyncShutdown API to shut down MediaStreamGraph thread. r=jesup (9e45760ab9) - Bug 1247395 - use UniquePtr for control messages in MediaStreamGraphImpl; r=roc (949149234e) - Bug 1221587: Block attempts to open two mics at once until supported in full-duplex r=jib (4bb1412bb1) - Bug 1242061: re-enumerate audio devices in full_duplex via cubeb when getUserMedia is called r=jib (aa98e4dfff) - Bug 1242061 follow up to fix static analysis build bustage. r=me (3ee4f733f1) - Bug 1242061: fix leaked static nsTArrays r=bustage on a CLOSED TREE (6f57c3e0fd) - Bug 1237816: count open input sources for MediaStreams to release inputs on Destroy() r=roc,padenot (e9fd08c6bd) - Bug 1245216: white-list the fake 440Hz audio source used in automation for getUserMedia enumeration r=padenot (5c1632f0bd) - Bug 1242061: remove small strdup() leak of devicename strings in getUserMedia enumeration rs=jib (112163f77c) - Bug 1245216: Avoid reallocating and leaking AudioPacketizer output buffer r=padenot (86c0a5c277) - Bug 1165963 - Fix regression by bug 1104643: Detect "over compensation" and reset the anchor. r=padenot (9393a44d1b) - Bug 1145195 part 1 - Create a helper function for PrependLocalTransformsTo in SVGContentUtils r=dholbert (91bcee16ad) - Bug 1138065 - view elements as fragment identifiers should have normal target matching. r=dholbert (17b6b7af57) - Bug 1145195 part 2 - SVGFragmentIdentifier::ProcessSVGViewSpec() shouldn't actually let #svgView() affect attribute values r=dholbert (e7663e08c2)
277 lines
7.2 KiB
C++
277 lines
7.2 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
|
|
/* 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 "CanvasCaptureMediaStream.h"
|
|
#include "DOMMediaStream.h"
|
|
#include "gfxPlatform.h"
|
|
#include "ImageContainer.h"
|
|
#include "MediaStreamGraph.h"
|
|
#include "mozilla/dom/CanvasCaptureMediaStreamBinding.h"
|
|
#include "mozilla/gfx/2D.h"
|
|
#include "mozilla/Atomics.h"
|
|
#include "nsContentUtils.h"
|
|
|
|
using namespace mozilla::layers;
|
|
using namespace mozilla::gfx;
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
|
|
class OutputStreamDriver::StreamListener : public MediaStreamListener
|
|
{
|
|
public:
|
|
explicit StreamListener(OutputStreamDriver* aDriver,
|
|
TrackID aTrackId,
|
|
SourceMediaStream* aSourceStream)
|
|
: mEnded(false)
|
|
, mSourceStream(aSourceStream)
|
|
, mTrackId(aTrackId)
|
|
, mMutex("CanvasCaptureMediaStream OutputStreamDriver::StreamListener")
|
|
, mImage(nullptr)
|
|
{
|
|
MOZ_ASSERT(mSourceStream);
|
|
}
|
|
|
|
void EndStream() {
|
|
mEnded = true;
|
|
}
|
|
|
|
void SetImage(const RefPtr<layers::Image>& aImage)
|
|
{
|
|
MutexAutoLock lock(mMutex);
|
|
mImage = aImage;
|
|
}
|
|
|
|
void NotifyPull(MediaStreamGraph* aGraph, StreamTime aDesiredTime) override
|
|
{
|
|
// Called on the MediaStreamGraph thread.
|
|
StreamTime delta = aDesiredTime - mSourceStream->GetEndOfAppendedData(mTrackId);
|
|
if (delta > 0) {
|
|
MutexAutoLock lock(mMutex);
|
|
MOZ_ASSERT(mSourceStream);
|
|
|
|
RefPtr<Image> image = mImage;
|
|
IntSize size = image ? image->GetSize() : IntSize(0, 0);
|
|
VideoSegment segment;
|
|
segment.AppendFrame(image.forget(), delta, size);
|
|
|
|
mSourceStream->AppendToTrack(mTrackId, &segment);
|
|
}
|
|
|
|
if (mEnded) {
|
|
mSourceStream->EndAllTrackAndFinish();
|
|
}
|
|
}
|
|
|
|
protected:
|
|
~StreamListener() { }
|
|
|
|
private:
|
|
Atomic<bool> mEnded;
|
|
const RefPtr<SourceMediaStream> mSourceStream;
|
|
const TrackID mTrackId;
|
|
|
|
Mutex mMutex;
|
|
// The below members are protected by mMutex.
|
|
RefPtr<layers::Image> mImage;
|
|
};
|
|
|
|
OutputStreamDriver::OutputStreamDriver(SourceMediaStream* aSourceStream,
|
|
const TrackID& aTrackId)
|
|
: FrameCaptureListener()
|
|
, mSourceStream(aSourceStream)
|
|
, mStreamListener(new StreamListener(this, aTrackId, aSourceStream))
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(mSourceStream);
|
|
mSourceStream->AddListener(mStreamListener);
|
|
mSourceStream->AddTrack(aTrackId, 0, new VideoSegment());
|
|
mSourceStream->AdvanceKnownTracksTime(STREAM_TIME_MAX);
|
|
mSourceStream->SetPullEnabled(true);
|
|
|
|
// All CanvasCaptureMediaStreams shall at least get one frame.
|
|
mFrameCaptureRequested = true;
|
|
}
|
|
|
|
OutputStreamDriver::~OutputStreamDriver()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mStreamListener) {
|
|
// MediaStreamGraph will keep the listener alive until it can finish the
|
|
// stream on the next NotifyPull().
|
|
mStreamListener->EndStream();
|
|
}
|
|
}
|
|
|
|
void
|
|
OutputStreamDriver::SetImage(const RefPtr<layers::Image>& aImage)
|
|
{
|
|
if (mStreamListener) {
|
|
mStreamListener->SetImage(aImage);
|
|
}
|
|
}
|
|
|
|
// ----------------------------------------------------------------------
|
|
|
|
class TimerDriver : public OutputStreamDriver
|
|
{
|
|
public:
|
|
explicit TimerDriver(SourceMediaStream* aSourceStream,
|
|
const double& aFPS,
|
|
const TrackID& aTrackId)
|
|
: OutputStreamDriver(aSourceStream, aTrackId)
|
|
, mFPS(aFPS)
|
|
, mTimer(nullptr)
|
|
{
|
|
if (mFPS == 0.0) {
|
|
return;
|
|
}
|
|
|
|
mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
|
|
if (!mTimer) {
|
|
return;
|
|
}
|
|
mTimer->InitWithFuncCallback(&TimerTick, this, int(1000 / mFPS), nsITimer::TYPE_REPEATING_SLACK);
|
|
}
|
|
|
|
static void TimerTick(nsITimer* aTimer, void* aClosure)
|
|
{
|
|
MOZ_ASSERT(aClosure);
|
|
TimerDriver* driver = static_cast<TimerDriver*>(aClosure);
|
|
|
|
driver->RequestFrameCapture();
|
|
}
|
|
|
|
void NewFrame(already_AddRefed<Image> aImage) override
|
|
{
|
|
RefPtr<Image> image = aImage;
|
|
|
|
if (!mFrameCaptureRequested) {
|
|
return;
|
|
}
|
|
|
|
mFrameCaptureRequested = false;
|
|
SetImage(image.forget());
|
|
}
|
|
|
|
void Forget() override
|
|
{
|
|
if (mTimer) {
|
|
mTimer->Cancel();
|
|
mTimer = nullptr;
|
|
}
|
|
}
|
|
|
|
protected:
|
|
virtual ~TimerDriver() {}
|
|
|
|
private:
|
|
const double mFPS;
|
|
nsCOMPtr<nsITimer> mTimer;
|
|
};
|
|
|
|
// ----------------------------------------------------------------------
|
|
|
|
class AutoDriver : public OutputStreamDriver
|
|
{
|
|
public:
|
|
explicit AutoDriver(SourceMediaStream* aSourceStream,
|
|
const TrackID& aTrackId)
|
|
: OutputStreamDriver(aSourceStream, aTrackId) {}
|
|
|
|
void NewFrame(already_AddRefed<Image> aImage) override
|
|
{
|
|
// Don't reset `mFrameCaptureRequested` since AutoDriver shall always have
|
|
// `mFrameCaptureRequested` set to true.
|
|
// This also means we should accept every frame as NewFrame is called only
|
|
// after something changed.
|
|
|
|
RefPtr<Image> image = aImage;
|
|
SetImage(image.forget());
|
|
}
|
|
|
|
protected:
|
|
virtual ~AutoDriver() {}
|
|
};
|
|
|
|
// ----------------------------------------------------------------------
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_INHERITED(CanvasCaptureMediaStream, DOMMediaStream,
|
|
mCanvas)
|
|
|
|
NS_IMPL_ADDREF_INHERITED(CanvasCaptureMediaStream, DOMMediaStream)
|
|
NS_IMPL_RELEASE_INHERITED(CanvasCaptureMediaStream, DOMMediaStream)
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CanvasCaptureMediaStream)
|
|
NS_INTERFACE_MAP_END_INHERITING(DOMMediaStream)
|
|
|
|
CanvasCaptureMediaStream::CanvasCaptureMediaStream(HTMLCanvasElement* aCanvas)
|
|
: mCanvas(aCanvas)
|
|
, mOutputStreamDriver(nullptr)
|
|
{
|
|
}
|
|
|
|
CanvasCaptureMediaStream::~CanvasCaptureMediaStream()
|
|
{
|
|
if (mOutputStreamDriver) {
|
|
mOutputStreamDriver->Forget();
|
|
}
|
|
}
|
|
|
|
JSObject*
|
|
CanvasCaptureMediaStream::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
|
{
|
|
return dom::CanvasCaptureMediaStreamBinding::Wrap(aCx, this, aGivenProto);
|
|
}
|
|
|
|
void
|
|
CanvasCaptureMediaStream::RequestFrame()
|
|
{
|
|
MOZ_ASSERT(mOutputStreamDriver);
|
|
if (mOutputStreamDriver) {
|
|
mOutputStreamDriver->RequestFrameCapture();
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
CanvasCaptureMediaStream::Init(const dom::Optional<double>& aFPS,
|
|
const TrackID& aTrackId)
|
|
{
|
|
if (!aFPS.WasPassed()) {
|
|
mOutputStreamDriver =
|
|
new AutoDriver(GetInputStream()->AsSourceStream(), aTrackId);
|
|
} else if (aFPS.Value() < 0) {
|
|
return NS_ERROR_ILLEGAL_VALUE;
|
|
} else {
|
|
// Cap frame rate to 60 FPS for sanity
|
|
double fps = std::min(60.0, aFPS.Value());
|
|
mOutputStreamDriver =
|
|
new TimerDriver(GetInputStream()->AsSourceStream(), fps, aTrackId);
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
already_AddRefed<CanvasCaptureMediaStream>
|
|
CanvasCaptureMediaStream::CreateSourceStream(nsIDOMWindow* aWindow,
|
|
HTMLCanvasElement* aCanvas)
|
|
{
|
|
RefPtr<CanvasCaptureMediaStream> stream = new CanvasCaptureMediaStream(aCanvas);
|
|
MediaStreamGraph* graph =
|
|
MediaStreamGraph::GetInstance(MediaStreamGraph::SYSTEM_THREAD_DRIVER,
|
|
AudioChannel::Normal);
|
|
stream->InitSourceStream(aWindow, graph);
|
|
return stream.forget();
|
|
}
|
|
|
|
FrameCaptureListener*
|
|
CanvasCaptureMediaStream::FrameCaptureListener()
|
|
{
|
|
return mOutputStreamDriver;
|
|
}
|
|
|
|
} // namespace dom
|
|
} // namespace mozilla
|
|
|