mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:11:03 +00:00
147c5fa2eb
- Bug 1150437 - Make gmp-clearkey consistently Apache2 licensed. r=edwin,jwwang,kentuckyfriedtakahe (3c954c73dd) - Bug 1223486 - Ensure WrapTexCoord returns 0.0 instead of 1.0 when given a negative whole number. r=Bas (b4af8eb524) - Bug 1160914 - Make gmp-clearkey's decoders threadsafe refcounted, to handle DecodingComplete while GMPVideoHost::CreateFrame() is waiting. r=edwin (03359c7730) - Bug 1206763 - Enable SkiaGL canvas on gonk r=mattwoodrow (1588079b23) - Decouple CairoImage from ImageContainer. (bug 1222910, r=roc) (a93a4dad82) - Decouple D3D11ShareHandleImage from ImageContainer. (bug 1222910, r=mattwoodrow) (9642ef1c53) - Bug 1194753 - Wait longer when decoding the first frame of D3D9 DXVA video before deciding it is invalid. r=cpearce (865fe1d2f3) - Decouple D3D9SurfaceImage from ImageContainer. (bug 1222910, r=mattwoodrow) (55bc5abffc) - Bug 1191534 - Implement BlitImageToFramebuffer for IOSurface. r=jgilbert (0da6aff77f) - Decouple EGLImageImage from ImageContainer. (bug 1222910, r=snorp) (cffb7aadcb) - Decouple SurfaceTextureImage from ImageContainer. (bug 1222910, r=snorp) (5b920014d0) - Decouple MacIOSurfaceImage from ImageContainer. (bug 1222910, r=mstange) (ffab69155c) - Decouple SharedRGBImage and PlanarYCbCrImage from ImageContainer. (bug 1222910, r=mattwoodrow) (a9f6e23788) - Remove Gonk usage of ImageContainer::CreateImage. (bug 1222910, r=sotaro) (3f460b901d) - Remove CreateImage() from ImageContainer, ImageFactory, and ImageClient. (bug 1222910, r=roc) (873d5d5e47) - Bug 1212795: P1. Ensure the check if HW acceleration is allowed is performed on the main thread. r=jwwang (7cac257e5a) - Bug 1137529: Prefer Apple's VDA hardware acceleration for Hi-Def videos. r=rillian (a3ffc48e5e) - Bug 1212795: P2. Ensure all frameworks required for video decoding on mac are loaded. r=jwwang (b903b94c60) - Bug 1212795: P3. Make AppleDecoderModule detects if the required modules are loaded. r=jwwang (fb132e36b0) - Bug 1221991 - [1.3] Make SupportsMimeType a const function. r=jya (2450030808) - Bug 1221991 - [2.3] Split DecoderLoop into functions, simplify decoding state and clean up style. r=snorp (7c0e665cf7) - Bug 1221991 - [3.1] Manage module state via accessor functions. r=snorp (491b00f74b) - Bug 1221991 - [4.2] Add AndroidDecoderModule logging. r=snorp (7213505016) - Bug 1153110: Don't prefer VDA for 720p and above. r=rillian (50d5fbfa7c) - remove PR_LOGGING (44f4efbaa2) - Bug 1169653 - Limit use of the speech recognition API in JS to certified apps or apps with the proper flags set. r=smaug (c93a8949b8) - Bug 1133633: Part2. Enable async decoding on mac. r=mattmoodrow (c9740168bd) - Bug 1154896: Report decoding errors back to MP4Reader. r=rillian (26291f72e1) - Bug 1154896: Part2. Ignore kVTDecodeInfo_FrameDropped flag. r=rillian (bfca4c264e) - Bug 1198094: P1. Limit rate at which InputExhausted could be called by mac decoder. r=rillian (e5819c1666) - Bug 1214678 - Allow Apple media decoders to work on iOS r=jya (c475eff0be) - Bug 1219140 - Remove AskMediaCodecAndWait() r=bwu (dbe8d364ec) - fix includes (432c3419b0) - adapted Bug 1159509 - Support audio AMR-NB for Gonk in MP4Reader. r=jya (adaddc5c21) - Bug 1154512 - Remove MediaTaskQueue::SyncDispatch() from PDM. r=cpearce (5bddd082bd) - Bug 1204622 - release codec listener at reader task queue. r=jya (72b062b5d7) - Bug 1097498 - Wait fence for the graphic buffer. r=sotaro (c72f301939) - Bug 1198664 - Refactor: move common behaviors to base class. r=bwu,jya (a754813c5b) - Bug 1198664 - Use looper to process decoder tasks. r=bwu (768315de13) - Bug 1174721 - Use AudioCompactor for GonkAudioDecoderManager. r=sotaro (768e68c946) - Bug 1199809 - Refactor: use RAII to help manage output buffer lifecycle. r=sotaro (9a6e0dceb7) - Bug 1133955 - Record the last seek time to decide the direction to seek. r=sotaro (d0bcdbe68b) - Bug 1210045 - Fix GonkVideoDecoderManager shutdown during initialization r=bwu (b379248ff1) - Bug 1214997 - Use MozPromise in MediaCodecProxy and OMXCodecProxy r=bwu (ab9a92d640) - Bug 1199809 - Make a copy of output buffer after flush(). r=sotaro (17465ecaea) - Bug 1216895 - assert that decoder methods are run on correct thread. r=jya (b8c106c2ca) - Bug 1185018 - Part 1 of 1 - Made speech recognition services language dependent and removed assumption of a single service. r=smaug (f83acf82b4) - Bug 1207416: Add Telemetry for time spent in different Load states in WebRTC r=gcp (e3959b6760) - Bug 1219480 - Replace PRLogModuleInfo with LazyLogModule in the media directory. r=rillian (a9b13ef334) - Bug 1196558: Don't assert should output task not be dispatched. r=edwin (a2569bca73) - Bug 1199193: Ensure DrainComplete() is called once all decoded frames have been output. r=rillian (760fb42753) - Bug 1079621 - Change non-fatal errors to warnings. r=rillian (20c85e7e56) - Bug 1185234 - Implement SpeechRecognition::interimResults. r=smaug (b3d635d8c0) - Bug 1171850 - Remove 'models' dir from MODELSPS_DEST as the dir 'models' now comes from MODELSPS_FILES. r=gps (5515511e3a) - Bug 1183503 - Rename model and dictionary files for recognition in preparation for localization. r=smaug (32c78610af) - Bug 1185235 - Implement SpeechRecognition::maxAlternatives. r=smaug (91eac7f30f) - Bug 1177514 - Remove final text of 'ERROR' on recognition error, should be signaled by SpeechRecognitionError. r=smaug (c8d7b198e0) - Bug 1187791 - Part 1 of 1 - SpeechRecognition::maxAlternatives can't throw; so, rm webidl throws specifier. r=smaug (e295b2bde5) - Bug 1213131: [vpx] Configure libvpx decoder to use multi-threads decoding. r=kentuckyfriedtakahe (f38ba0ef82) - Bug 1206845: Prevent overflows in MediaCache. r=roc (e8a228dcd3) - Bug 1205825 - part 1 - don't reacquire the media cache's monitor in MediaCacheStream::FlushPartialBlockInternal; r=roc (6342592be3) - Bug 1205825 - part 2 - call Get*CachedData*Internal variants from MediaCacheStream::GetCachedRanges; r=roc (f229c8f757)
246 lines
6.7 KiB
C++
246 lines
6.7 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim:set ts=2 sw=2 sts=2 et cindent: */
|
|
/* 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 "ImageCapture.h"
|
|
#include "mozilla/dom/BlobEvent.h"
|
|
#include "mozilla/dom/DOMException.h"
|
|
#include "mozilla/dom/File.h"
|
|
#include "mozilla/dom/ImageCaptureError.h"
|
|
#include "mozilla/dom/ImageCaptureErrorEvent.h"
|
|
#include "mozilla/dom/ImageCaptureErrorEventBinding.h"
|
|
#include "mozilla/dom/VideoStreamTrack.h"
|
|
#include "nsIDocument.h"
|
|
#include "CaptureTask.h"
|
|
#include "MediaEngine.h"
|
|
|
|
namespace mozilla {
|
|
|
|
LogModule* GetICLog()
|
|
{
|
|
static LazyLogModule log("ImageCapture");
|
|
return log;
|
|
}
|
|
|
|
namespace dom {
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_INHERITED(ImageCapture, DOMEventTargetHelper,
|
|
mVideoStreamTrack)
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ImageCapture)
|
|
NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)
|
|
|
|
NS_IMPL_ADDREF_INHERITED(ImageCapture, DOMEventTargetHelper)
|
|
NS_IMPL_RELEASE_INHERITED(ImageCapture, DOMEventTargetHelper)
|
|
|
|
ImageCapture::ImageCapture(VideoStreamTrack* aVideoStreamTrack,
|
|
nsPIDOMWindow* aOwnerWindow)
|
|
: DOMEventTargetHelper(aOwnerWindow)
|
|
{
|
|
MOZ_ASSERT(aOwnerWindow);
|
|
MOZ_ASSERT(aVideoStreamTrack);
|
|
|
|
mVideoStreamTrack = aVideoStreamTrack;
|
|
}
|
|
|
|
ImageCapture::~ImageCapture()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
}
|
|
|
|
already_AddRefed<ImageCapture>
|
|
ImageCapture::Constructor(const GlobalObject& aGlobal,
|
|
VideoStreamTrack& aTrack,
|
|
ErrorResult& aRv)
|
|
{
|
|
nsCOMPtr<nsPIDOMWindow> win = do_QueryInterface(aGlobal.GetAsSupports());
|
|
if (!win) {
|
|
aRv.Throw(NS_ERROR_FAILURE);
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<ImageCapture> object = new ImageCapture(&aTrack, win);
|
|
|
|
return object.forget();
|
|
}
|
|
|
|
VideoStreamTrack*
|
|
ImageCapture::GetVideoStreamTrack() const
|
|
{
|
|
return mVideoStreamTrack;
|
|
}
|
|
|
|
nsresult
|
|
ImageCapture::TakePhotoByMediaEngine()
|
|
{
|
|
// Callback for TakPhoto(), it also monitor the principal. If principal
|
|
// changes, it returns PHOTO_ERROR with security error.
|
|
class TakePhotoCallback : public MediaEngineSource::PhotoCallback,
|
|
public DOMMediaStream::PrincipalChangeObserver
|
|
{
|
|
public:
|
|
TakePhotoCallback(DOMMediaStream* aStream, ImageCapture* aImageCapture)
|
|
: mStream(aStream)
|
|
, mImageCapture(aImageCapture)
|
|
, mPrincipalChanged(false)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mStream->AddPrincipalChangeObserver(this);
|
|
}
|
|
|
|
void PrincipalChanged(DOMMediaStream* aMediaStream) override
|
|
{
|
|
mPrincipalChanged = true;
|
|
}
|
|
|
|
nsresult PhotoComplete(already_AddRefed<Blob> aBlob) override
|
|
{
|
|
RefPtr<Blob> blob = aBlob;
|
|
|
|
if (mPrincipalChanged) {
|
|
return PhotoError(NS_ERROR_DOM_SECURITY_ERR);
|
|
}
|
|
return mImageCapture->PostBlobEvent(blob);
|
|
}
|
|
|
|
nsresult PhotoError(nsresult aRv) override
|
|
{
|
|
return mImageCapture->PostErrorEvent(ImageCaptureError::PHOTO_ERROR, aRv);
|
|
}
|
|
|
|
protected:
|
|
~TakePhotoCallback()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mStream->RemovePrincipalChangeObserver(this);
|
|
}
|
|
|
|
RefPtr<DOMMediaStream> mStream;
|
|
RefPtr<ImageCapture> mImageCapture;
|
|
bool mPrincipalChanged;
|
|
};
|
|
|
|
RefPtr<DOMMediaStream> domStream = mVideoStreamTrack->GetStream();
|
|
DOMLocalMediaStream* domLocalStream = domStream->AsDOMLocalMediaStream();
|
|
if (domLocalStream) {
|
|
RefPtr<MediaEngineSource> mediaEngine =
|
|
domLocalStream->GetMediaEngine(mVideoStreamTrack->GetTrackID());
|
|
RefPtr<MediaEngineSource::PhotoCallback> callback =
|
|
new TakePhotoCallback(domStream, this);
|
|
return mediaEngine->TakePhoto(callback);
|
|
}
|
|
|
|
return NS_ERROR_NOT_IMPLEMENTED;
|
|
}
|
|
|
|
void
|
|
ImageCapture::TakePhoto(ErrorResult& aResult)
|
|
{
|
|
// According to spec, VideoStreamTrack.readyState must be "live"; however
|
|
// gecko doesn't implement it yet (bug 910249). Instead of readyState, we
|
|
// check VideoStreamTrack.enable before bug 910249 is fixed.
|
|
// The error code should be INVALID_TRACK, but spec doesn't define it in
|
|
// ImageCaptureError. So it returns PHOTO_ERROR here before spec updates.
|
|
if (!mVideoStreamTrack->Enabled()) {
|
|
PostErrorEvent(ImageCaptureError::PHOTO_ERROR, NS_ERROR_FAILURE);
|
|
return;
|
|
}
|
|
|
|
// Try if MediaEngine supports taking photo.
|
|
nsresult rv = TakePhotoByMediaEngine();
|
|
|
|
// It falls back to MediaStreamGraph image capture if MediaEngine doesn't
|
|
// support TakePhoto().
|
|
if (rv == NS_ERROR_NOT_IMPLEMENTED) {
|
|
IC_LOG("MediaEngine doesn't support TakePhoto(), it falls back to MediaStreamGraph.");
|
|
RefPtr<CaptureTask> task =
|
|
new CaptureTask(this, mVideoStreamTrack->GetTrackID());
|
|
|
|
// It adds itself into MediaStreamGraph, so ImageCapture doesn't need to hold
|
|
// the reference.
|
|
task->AttachStream();
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
ImageCapture::PostBlobEvent(Blob* aBlob)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (!CheckPrincipal()) {
|
|
// Media is not same-origin, don't allow the data out.
|
|
return PostErrorEvent(ImageCaptureError::PHOTO_ERROR, NS_ERROR_DOM_SECURITY_ERR);
|
|
}
|
|
|
|
BlobEventInit init;
|
|
init.mBubbles = false;
|
|
init.mCancelable = false;
|
|
init.mData = aBlob;
|
|
|
|
RefPtr<BlobEvent> blob_event =
|
|
BlobEvent::Constructor(this, NS_LITERAL_STRING("photo"), init);
|
|
|
|
return DispatchTrustedEvent(blob_event);
|
|
}
|
|
|
|
nsresult
|
|
ImageCapture::PostErrorEvent(uint16_t aErrorCode, nsresult aReason)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
nsresult rv = CheckInnerWindowCorrectness();
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsString errorMsg;
|
|
if (NS_FAILED(aReason)) {
|
|
nsCString name, message;
|
|
rv = NS_GetNameAndMessageForDOMNSResult(aReason, name, message);
|
|
if (NS_SUCCEEDED(rv)) {
|
|
CopyASCIItoUTF16(message, errorMsg);
|
|
}
|
|
}
|
|
|
|
RefPtr<ImageCaptureError> error =
|
|
new ImageCaptureError(this, aErrorCode, errorMsg);
|
|
|
|
ImageCaptureErrorEventInit init;
|
|
init.mBubbles = false;
|
|
init.mCancelable = false;
|
|
init.mImageCaptureError = error;
|
|
|
|
nsCOMPtr<nsIDOMEvent> event =
|
|
ImageCaptureErrorEvent::Constructor(this, NS_LITERAL_STRING("error"), init);
|
|
|
|
return DispatchTrustedEvent(event);
|
|
}
|
|
|
|
bool
|
|
ImageCapture::CheckPrincipal()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
RefPtr<DOMMediaStream> ms = mVideoStreamTrack->GetStream();
|
|
if (!ms) {
|
|
return false;
|
|
}
|
|
nsCOMPtr<nsIPrincipal> principal = ms->GetPrincipal();
|
|
|
|
if (!GetOwner()) {
|
|
return false;
|
|
}
|
|
nsCOMPtr<nsIDocument> doc = GetOwner()->GetExtantDoc();
|
|
if (!doc || !principal) {
|
|
return false;
|
|
}
|
|
|
|
bool subsumes;
|
|
if (NS_FAILED(doc->NodePrincipal()->Subsumes(principal, &subsumes))) {
|
|
return false;
|
|
}
|
|
|
|
return subsumes;
|
|
}
|
|
|
|
} // namespace dom
|
|
} // namespace mozilla
|