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)
258 lines
7.0 KiB
C++
258 lines
7.0 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 "MediaSystemResourceManagerParent.h"
|
|
#include "mozilla/layers/CompositorParent.h"
|
|
#include "mozilla/unused.h"
|
|
|
|
#include "MediaSystemResourceService.h"
|
|
|
|
using namespace mozilla::layers;
|
|
|
|
namespace mozilla {
|
|
|
|
/* static */ StaticRefPtr<MediaSystemResourceService> MediaSystemResourceService::sSingleton;
|
|
|
|
/* static */ MediaSystemResourceService*
|
|
MediaSystemResourceService::Get()
|
|
{
|
|
if (sSingleton) {
|
|
return sSingleton;
|
|
}
|
|
Init();
|
|
return sSingleton;
|
|
}
|
|
|
|
/* static */ void
|
|
MediaSystemResourceService::Init()
|
|
{
|
|
if (!sSingleton) {
|
|
sSingleton = new MediaSystemResourceService();
|
|
}
|
|
}
|
|
|
|
/* static */ void
|
|
MediaSystemResourceService::Shutdown()
|
|
{
|
|
if (sSingleton) {
|
|
sSingleton->Destroy();
|
|
sSingleton = nullptr;
|
|
}
|
|
}
|
|
|
|
MediaSystemResourceService::MediaSystemResourceService()
|
|
: mDestroyed(false)
|
|
{
|
|
MOZ_ASSERT(CompositorParent::IsInCompositorThread());
|
|
#ifdef MOZ_WIDGET_GONK
|
|
// The maximum number of hardware resoureces available.
|
|
// XXX need to hange to a dynamic way.
|
|
enum
|
|
{
|
|
VIDEO_DECODER_COUNT = 1,
|
|
VIDEO_ENCODER_COUNT = 1
|
|
};
|
|
|
|
MediaSystemResource* resource;
|
|
|
|
resource = new MediaSystemResource(VIDEO_DECODER_COUNT);
|
|
mResources.Put(static_cast<uint32_t>(MediaSystemResourceType::VIDEO_DECODER), resource);
|
|
|
|
resource = new MediaSystemResource(VIDEO_ENCODER_COUNT);
|
|
mResources.Put(static_cast<uint32_t>(MediaSystemResourceType::VIDEO_ENCODER), resource);
|
|
#endif
|
|
}
|
|
|
|
MediaSystemResourceService::~MediaSystemResourceService()
|
|
{
|
|
}
|
|
|
|
void
|
|
MediaSystemResourceService::Destroy()
|
|
{
|
|
mDestroyed = true;
|
|
}
|
|
|
|
void
|
|
MediaSystemResourceService::Acquire(media::MediaSystemResourceManagerParent* aParent,
|
|
uint32_t aId,
|
|
MediaSystemResourceType aResourceType,
|
|
bool aWillWait)
|
|
{
|
|
MOZ_ASSERT(CompositorParent::IsInCompositorThread());
|
|
MOZ_ASSERT(aParent);
|
|
|
|
if (mDestroyed) {
|
|
return;
|
|
}
|
|
|
|
MediaSystemResource* resource = mResources.Get(static_cast<uint32_t>(aResourceType));
|
|
|
|
if (!resource ||
|
|
resource->mResourceCount == 0) {
|
|
// Resource does not exit
|
|
// Send fail response
|
|
mozilla::Unused << aParent->SendResponse(aId, false /* fail */);
|
|
return;
|
|
}
|
|
|
|
// Try to acquire a resource
|
|
if (resource->mAcquiredRequests.size() < resource->mResourceCount) {
|
|
// Resource is available
|
|
resource->mAcquiredRequests.push_back(
|
|
MediaSystemResourceRequest(aParent, aId));
|
|
// Send success response
|
|
mozilla::Unused << aParent->SendResponse(aId, true /* success */);
|
|
return;
|
|
} else if (!aWillWait) {
|
|
// Resource is not available and do not wait.
|
|
// Send fail response
|
|
mozilla::Unused << aParent->SendResponse(aId, false /* fail */);
|
|
return;
|
|
}
|
|
// Wait until acquire.
|
|
resource->mWaitingRequests.push_back(
|
|
MediaSystemResourceRequest(aParent, aId));
|
|
}
|
|
|
|
void
|
|
MediaSystemResourceService::ReleaseResource(media::MediaSystemResourceManagerParent* aParent,
|
|
uint32_t aId,
|
|
MediaSystemResourceType aResourceType)
|
|
{
|
|
MOZ_ASSERT(CompositorParent::IsInCompositorThread());
|
|
MOZ_ASSERT(aParent);
|
|
|
|
if (mDestroyed) {
|
|
return;
|
|
}
|
|
|
|
MediaSystemResource* resource = mResources.Get(static_cast<uint32_t>(aResourceType));
|
|
|
|
if (!resource ||
|
|
resource->mResourceCount == 0) {
|
|
// Resource does not exit
|
|
return;
|
|
}
|
|
RemoveRequest(aParent, aId, aResourceType);
|
|
UpdateRequests(aResourceType);
|
|
}
|
|
|
|
void
|
|
MediaSystemResourceService::ReleaseResource(media::MediaSystemResourceManagerParent* aParent)
|
|
{
|
|
MOZ_ASSERT(aParent);
|
|
|
|
if (mDestroyed) {
|
|
return;
|
|
}
|
|
|
|
for (auto iter = mResources.Iter(); !iter.Done(); iter.Next()) {
|
|
const uint32_t& key = iter.Key();
|
|
RemoveRequests(aParent, static_cast<MediaSystemResourceType>(key));
|
|
UpdateRequests(static_cast<MediaSystemResourceType>(key));
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaSystemResourceService::RemoveRequest(media::MediaSystemResourceManagerParent* aParent,
|
|
uint32_t aId,
|
|
MediaSystemResourceType aResourceType)
|
|
{
|
|
MOZ_ASSERT(aParent);
|
|
|
|
MediaSystemResource* resource = mResources.Get(static_cast<uint32_t>(aResourceType));
|
|
if (!resource) {
|
|
return;
|
|
}
|
|
|
|
std::deque<MediaSystemResourceRequest>::iterator it;
|
|
std::deque<MediaSystemResourceRequest>& acquiredRequests =
|
|
resource->mAcquiredRequests;
|
|
for (it = acquiredRequests.begin(); it != acquiredRequests.end(); it++) {
|
|
if (((*it).mParent == aParent) && ((*it).mId == aId)) {
|
|
acquiredRequests.erase(it);
|
|
return;
|
|
}
|
|
}
|
|
|
|
std::deque<MediaSystemResourceRequest>& waitingRequests =
|
|
resource->mWaitingRequests;
|
|
for (it = waitingRequests.begin(); it != waitingRequests.end(); it++) {
|
|
if (((*it).mParent == aParent) && ((*it).mId == aId)) {
|
|
waitingRequests.erase(it);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaSystemResourceService::RemoveRequests(media::MediaSystemResourceManagerParent* aParent,
|
|
MediaSystemResourceType aResourceType)
|
|
{
|
|
MOZ_ASSERT(aParent);
|
|
|
|
MediaSystemResource* resource = mResources.Get(static_cast<uint32_t>(aResourceType));
|
|
|
|
if (!resource ||
|
|
resource->mResourceCount == 0) {
|
|
// Resource does not exit
|
|
return;
|
|
}
|
|
|
|
std::deque<MediaSystemResourceRequest>::iterator it;
|
|
std::deque<MediaSystemResourceRequest>& acquiredRequests =
|
|
resource->mAcquiredRequests;
|
|
for (it = acquiredRequests.begin(); it != acquiredRequests.end();) {
|
|
if ((*it).mParent == aParent) {
|
|
it = acquiredRequests.erase(it);
|
|
} else {
|
|
it++;
|
|
}
|
|
}
|
|
|
|
std::deque<MediaSystemResourceRequest>& waitingRequests =
|
|
resource->mWaitingRequests;
|
|
for (it = waitingRequests.begin(); it != waitingRequests.end();) {
|
|
if ((*it).mParent == aParent) {
|
|
it = waitingRequests.erase(it);
|
|
return;
|
|
} else {
|
|
it++;
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaSystemResourceService::UpdateRequests(MediaSystemResourceType aResourceType)
|
|
{
|
|
MediaSystemResource* resource = mResources.Get(static_cast<uint32_t>(aResourceType));
|
|
|
|
if (!resource ||
|
|
resource->mResourceCount == 0) {
|
|
// Resource does not exit
|
|
return;
|
|
}
|
|
|
|
std::deque<MediaSystemResourceRequest>& acquiredRequests =
|
|
resource->mAcquiredRequests;
|
|
std::deque<MediaSystemResourceRequest>& waitingRequests =
|
|
resource->mWaitingRequests;
|
|
|
|
while ((acquiredRequests.size() < resource->mResourceCount) &&
|
|
(waitingRequests.size() > 0)) {
|
|
MediaSystemResourceRequest& request = waitingRequests.front();
|
|
MOZ_ASSERT(request.mParent);
|
|
// Send response
|
|
mozilla::Unused << request.mParent->SendResponse(request.mId, true /* success */);
|
|
// Move request to mAcquiredRequests
|
|
acquiredRequests.push_back(waitingRequests.front());
|
|
waitingRequests.pop_front();
|
|
}
|
|
}
|
|
|
|
} // namespace mozilla
|