mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:11:03 +00:00
f632bc6ab3
- Bug 1267186 - Split lookup of WebIDL DOM class names from lookup of DOMCI DOM class names. r=bz. (1cb4c3698e) - Bug 1206637: P1. Add MediaPrefs convenience class. r=cpearce (d352b9ca0b) - Bug 1254378 - Make new 'speech-synth-started' component service category. r=smaug (ece851540b) - Bug 1206637: P2. Replace all cached preferences with MediaPrefs ones. r=cpearce (1492083f62) - Bug 1216407 - Use mozilla/Endian.h for NfcService. r=yoshi (b2a508186d) - Bug 1237493 - [NFC] Separate Gecko and Gonk layers for accessing Androids properties. r=yoshi (062e468bed) - Bug 1272135, part 1 - Fix leading tab usage in ipc/chromium. r=billm (cf29df6977) - Bug 1272135, part 2 - Delete two weird modelines in ipc/chromium. r=billm (da4cdafc7c) - Bug 1272135, part 3 - Fix mode lines in ipc/chromium/. r=billm (040b11738e) - Bug 1273307 - Remove copy constructor/assignment operator for Message/Pickle (r=froydnj) (b53e6d3470) - Bug 1262671 - Remove unused TrimWriteData (r=froydnj) (8fbcefde63) - Bug 1267438 - Group ScrollMetadata's optional clip rect and mask layer index into a LayerClip structure. r=mstange (dcd01e3bce) - Bug 1267438 - Use IntersectMaybeRects() in Layer::GetCombinedClipRect(). r=mstange (5ec2d68aac) - Bug 1262937 - part 1 - don't include the protocol name in Clone error messages; r=jld (3e23610fb1) - Bug 1191452 - Limit IPDL-generated Move()s to Recv methods. r=billm (991cc733b6) - Bug 1262937 - part 2 - don't include the message name when complaining about handler failure; r=jld (b8abbc5c8b) - Bug 1262937 - part 3 - move quoting out of checkedRead; r=jld (16d36ae02a) - Bug 1262937 - part 4 - publically inherit from MessageListener in IProtocol; r=jld (b89aaa7347) - Bug 1262937 - part 5 - factor out actor reading code to a common base class; r=jld (702388bce7) - Bug 1262937 - part 7 - factor out union type deserialization errors; r=jld (dcdf428efc) - Bug 1262937 - part 6 - enable custom error message for ipdl.py's checkedRead; r=jld (5cf11d5d24) - Bug 1262937 - part 8 - factor out array length deserialization errors; r=jld (d1149cc120) - Bug 1271601: If a child process fails to duplicate a TransportDescriptor pipe handle then send it anyway and get the target to duplicate. r=gabor (d578cd0c85) - Bug 1270247 - Crash in ParamTraits<mozilla::net::NetAddr>::Write if the family is unknown. r=hurley (3ed49495c0) - Bug 1267474 - cache-control: immutable tests 3/3 r=mayhemer (ba0bc6e71a) - bug 1188100 - fold PSM's test_client_cert.js into necko's test_tls_server.js r=mcmanus (a2b93abbbb) - Bug 669259 - Expose original header received from a peer. r=mcmanus (cf53cad7ac) - Bug 386743 - Set default event bubbling/cancelable flags in the WidgetEvent constructor. r=smaug (1c68cfffd2) - Bug 1259661 part.1 Rename WidgetMouseEvent::reasonType to WidgetMouseEvent::Reason r=smaug (0edd107b56) - Bug 1259661 part.2 Rename WidgetMouseEvent::context to WidgetMouseEvent::ContextMenuTrigger r=smaug (0049757099) - Bug 1259661 part.3 Rename WidgetMouseEvent::exitType to WidgetMouseEvent::ExitFrom r=smaug (5ffd3f41b1) - Bug 1259661 part.4 Rename WidgetMouseEvent::reason to WidgetMouseEvent::mReason r=smaug (5605ce8fd0) - Bug 1259661 part.5 Rename WidgetMouseEvent::context to WidgetMouseEvent::mContextMenuTrigger r=smaug (4dd92f0066) - Bug 1259661 part.6 Rename WidgetMouseEvent::exit to WidgetMouseEvent::mExitFrom r=smaug (c46f5fe1bc) - Bug 1259661 part.7 Get rid of WidgetMouseEvent::acceptActivation because of unused r=smaug (4867aaf1a7) - Bug 1259661 part.8 Rename WidgetMouseEvent::ignoreRootScrollFrame to WidgetMouseEvent::mIgnoreRootScrollFrame r=smaug (c829c446fd) - Bug 1259661 part.9 Rename WidgetMouseEvent::clickCount to WidgetMouseEvent::mClickCount r=smaug (2fa015c006) - Bug 1259661 part.10 Clean up some nits of WidgetMouseEvent definition r=smaug (58d3a0cb2c) - Bug 1179346 - Add strings and accesskeys for Microsoft Edge. r=mak (b97f5e7ab4) - Bug 931445 part 1 - Remove unused code from pointerlock_utils.js. r=smaug (e1b9c15569) - Bug 931445 part 2 - Use util code from fullscreen tests to improve robustness of pointerlock tests. r=smaug (3c7b47751e) - Bug 931445 part 3 - Reset synth centering pointer when unlocking pointer. r=smaug (e272fec9c7) - Bug 1263389 NativeKey should initialize WidgetKeyboardEvent::mKeyValue of WM_KEYDOWN of VK_PACKET with following char message r=m_kato (e56a31bd4b) - Bug 1261880 NativeKey should decide printable KeyboardEvent.key value of keydown and keypress events with following WM_CHAR message of WM_KEYDOWN r=m_kato (7208001852) - Bug 1254755 part.1 Rename WidgetKeyboardEvent::keyCode to WidgetKeyboardEvent::mKeyCode r=smaug (97ebefa314) - put back some XP/2003 code, as well as crash/debug (73b3147e58) - Bug 1259679 - Space key shouldn't work as a space key if it's assigned to a function key. r=masayuki (db422c248b) - Bug 1101975, handle access keys in content process before menus, r=masayuki (760213b62e) - Bug 1254755 part.2 Rename WidgetKeyboardEvent::charCode to WidgetKeyboardEvent::mCharCode r=smaug (6cef6114a5) - Bug 1254755 part.3 Rename WidgetKeyboardEvent::alternativeCharCodes to WidgetKeyboardEvent::mAlternativeCharCodes r=smaug (9d23a113fd) - Bug 1254755 part.4 Rename WidgetKeyboardEvent::location to WidgetKeyboardEvent::mLocation r=smaug (f44e0212a6) - Bug 1254755 part.5 Rename WidgetKeyboardEvent::isChar to WidgetKeyboardEvent::mIsChar r=smaug (a713d9903c) - Bug 1254755 part.6 Reorder the members of WidgetKeyboardEvent for reducing its instance size r=smaug (39a14a7d4f) - Bug 1262671 - void** -> PickleIterator (r=froydnj) (716a88b499)
332 lines
9.4 KiB
C++
332 lines
9.4 KiB
C++
/* -*- mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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 "MediaSourceDecoder.h"
|
|
|
|
#include "mozilla/Logging.h"
|
|
#include "mozilla/dom/HTMLMediaElement.h"
|
|
#include "MediaDecoderStateMachine.h"
|
|
#include "MediaSource.h"
|
|
#include "MediaSourceResource.h"
|
|
#include "MediaSourceUtils.h"
|
|
#include "VideoUtils.h"
|
|
#include "MediaSourceDemuxer.h"
|
|
#include "SourceBufferList.h"
|
|
#include <algorithm>
|
|
|
|
extern mozilla::LogModule* GetMediaSourceLog();
|
|
|
|
#define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Debug, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
|
|
#define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Verbose, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
|
|
|
|
using namespace mozilla::media;
|
|
|
|
namespace mozilla {
|
|
|
|
MediaSourceDecoder::MediaSourceDecoder(dom::HTMLMediaElement* aElement)
|
|
: MediaDecoder(aElement)
|
|
, mMediaSource(nullptr)
|
|
, mEnded(false)
|
|
{
|
|
SetExplicitDuration(UnspecifiedNaN<double>());
|
|
}
|
|
|
|
MediaDecoder*
|
|
MediaSourceDecoder::Clone(MediaDecoderOwner* aOwner)
|
|
{
|
|
// TODO: Sort out cloning.
|
|
return nullptr;
|
|
}
|
|
|
|
MediaDecoderStateMachine*
|
|
MediaSourceDecoder::CreateStateMachine()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mDemuxer = new MediaSourceDemuxer();
|
|
mReader = new MediaFormatReader(this, mDemuxer, GetVideoFrameContainer());
|
|
return new MediaDecoderStateMachine(this, mReader);
|
|
}
|
|
|
|
nsresult
|
|
MediaSourceDecoder::Load(nsIStreamListener**)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(!GetStateMachine());
|
|
SetStateMachine(CreateStateMachine());
|
|
if (!GetStateMachine()) {
|
|
NS_WARNING("Failed to create state machine!");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
nsresult rv = GetStateMachine()->Init(this);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
SetStateMachineParameters();
|
|
return NS_OK;
|
|
}
|
|
|
|
media::TimeIntervals
|
|
MediaSourceDecoder::GetSeekable()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (!mMediaSource) {
|
|
NS_WARNING("MediaSource element isn't attached");
|
|
return media::TimeIntervals::Invalid();
|
|
}
|
|
|
|
media::TimeIntervals seekable;
|
|
double duration = mMediaSource->Duration();
|
|
if (IsNaN(duration)) {
|
|
// Return empty range.
|
|
} else if (duration > 0 && mozilla::IsInfinite(duration)) {
|
|
media::TimeIntervals buffered = GetBuffered();
|
|
|
|
// 1. If live seekable range is not empty:
|
|
if (mMediaSource->HasLiveSeekableRange()) {
|
|
// 1. Let union ranges be the union of live seekable range and the
|
|
// HTMLMediaElement.buffered attribute.
|
|
media::TimeIntervals unionRanges =
|
|
buffered + mMediaSource->LiveSeekableRange();
|
|
// 2. Return a single range with a start time equal to the earliest start
|
|
// time in union ranges and an end time equal to the highest end time in
|
|
// union ranges and abort these steps.
|
|
seekable +=
|
|
media::TimeInterval(unionRanges.GetStart(), unionRanges.GetEnd());
|
|
return seekable;
|
|
}
|
|
|
|
if (buffered.Length()) {
|
|
seekable +=
|
|
media::TimeInterval(media::TimeUnit::FromSeconds(0), buffered.GetEnd());
|
|
}
|
|
} else {
|
|
seekable += media::TimeInterval(media::TimeUnit::FromSeconds(0),
|
|
media::TimeUnit::FromSeconds(duration));
|
|
}
|
|
MSE_DEBUG("ranges=%s", DumpTimeRanges(seekable).get());
|
|
return seekable;
|
|
}
|
|
|
|
media::TimeIntervals
|
|
MediaSourceDecoder::GetBuffered()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
dom::SourceBufferList* sourceBuffers = mMediaSource->ActiveSourceBuffers();
|
|
if (!sourceBuffers) {
|
|
// Media source object is shutting down.
|
|
return TimeIntervals();
|
|
}
|
|
media::TimeUnit highestEndTime;
|
|
nsTArray<media::TimeIntervals> activeRanges;
|
|
media::TimeIntervals buffered;
|
|
|
|
for (uint32_t i = 0; i < sourceBuffers->Length(); i++) {
|
|
bool found;
|
|
dom::SourceBuffer* sb = sourceBuffers->IndexedGetter(i, found);
|
|
MOZ_ASSERT(found);
|
|
|
|
activeRanges.AppendElement(sb->GetTimeIntervals());
|
|
highestEndTime =
|
|
std::max(highestEndTime, activeRanges.LastElement().GetEnd());
|
|
}
|
|
|
|
buffered +=
|
|
media::TimeInterval(media::TimeUnit::FromMicroseconds(0), highestEndTime);
|
|
|
|
for (auto& range : activeRanges) {
|
|
if (mEnded && range.Length()) {
|
|
// Set the end time on the last range to highestEndTime by adding a
|
|
// new range spanning the current end time to highestEndTime, which
|
|
// Normalize() will then merge with the old last range.
|
|
range +=
|
|
media::TimeInterval(range.GetEnd(), highestEndTime);
|
|
}
|
|
buffered.Intersection(range);
|
|
}
|
|
|
|
MSE_DEBUG("ranges=%s", DumpTimeRanges(buffered).get());
|
|
return buffered;
|
|
}
|
|
|
|
RefPtr<ShutdownPromise>
|
|
MediaSourceDecoder::Shutdown()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MSE_DEBUG("Shutdown");
|
|
// Detach first so that TrackBuffers are unused on the main thread when
|
|
// shut down on the decode task queue.
|
|
if (mMediaSource) {
|
|
mMediaSource->Detach();
|
|
}
|
|
mDemuxer = nullptr;
|
|
|
|
return MediaDecoder::Shutdown();
|
|
}
|
|
|
|
/*static*/
|
|
already_AddRefed<MediaResource>
|
|
MediaSourceDecoder::CreateResource(nsIPrincipal* aPrincipal)
|
|
{
|
|
return RefPtr<MediaResource>(new MediaSourceResource(aPrincipal)).forget();
|
|
}
|
|
|
|
void
|
|
MediaSourceDecoder::AttachMediaSource(dom::MediaSource* aMediaSource)
|
|
{
|
|
MOZ_ASSERT(!mMediaSource && !GetStateMachine() && NS_IsMainThread());
|
|
mMediaSource = aMediaSource;
|
|
}
|
|
|
|
void
|
|
MediaSourceDecoder::DetachMediaSource()
|
|
{
|
|
MOZ_ASSERT(mMediaSource && NS_IsMainThread());
|
|
mMediaSource = nullptr;
|
|
}
|
|
|
|
void
|
|
MediaSourceDecoder::Ended(bool aEnded)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
static_cast<MediaSourceResource*>(GetResource())->SetEnded(aEnded);
|
|
mEnded = true;
|
|
}
|
|
|
|
void
|
|
MediaSourceDecoder::AddSizeOfResources(ResourceSizes* aSizes)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (GetDemuxer()) {
|
|
GetDemuxer()->AddSizeOfResources(aSizes);
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaSourceDecoder::SetInitialDuration(int64_t aDuration)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
// Only use the decoded duration if one wasn't already
|
|
// set.
|
|
if (!mMediaSource || !IsNaN(ExplicitDuration())) {
|
|
return;
|
|
}
|
|
double duration = aDuration;
|
|
// A duration of -1 is +Infinity.
|
|
if (aDuration >= 0) {
|
|
duration /= USECS_PER_S;
|
|
}
|
|
SetMediaSourceDuration(duration, MSRangeRemovalAction::SKIP);
|
|
}
|
|
|
|
void
|
|
MediaSourceDecoder::SetMediaSourceDuration(double aDuration, MSRangeRemovalAction aAction)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
double oldDuration = ExplicitDuration();
|
|
if (aDuration >= 0) {
|
|
int64_t checkedDuration;
|
|
if (NS_FAILED(SecondsToUsecs(aDuration, checkedDuration))) {
|
|
// INT64_MAX is used as infinity by the state machine.
|
|
// We want a very bigger number, but not infinity.
|
|
checkedDuration = INT64_MAX - 1;
|
|
}
|
|
SetExplicitDuration(aDuration);
|
|
} else {
|
|
SetExplicitDuration(PositiveInfinity<double>());
|
|
}
|
|
|
|
if (mMediaSource && aAction != MSRangeRemovalAction::SKIP) {
|
|
mMediaSource->DurationChange(oldDuration, aDuration);
|
|
}
|
|
}
|
|
|
|
double
|
|
MediaSourceDecoder::GetMediaSourceDuration()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return ExplicitDuration();
|
|
}
|
|
|
|
void
|
|
MediaSourceDecoder::GetMozDebugReaderData(nsAString& aString)
|
|
{
|
|
if (mReader && mDemuxer) {
|
|
mReader->GetMozDebugReaderData(aString);
|
|
mDemuxer->GetMozDebugReaderData(aString);
|
|
}
|
|
}
|
|
|
|
double
|
|
MediaSourceDecoder::GetDuration()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return ExplicitDuration();
|
|
}
|
|
|
|
MediaDecoderOwner::NextFrameStatus
|
|
MediaSourceDecoder::NextFrameBufferedStatus()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (!mMediaSource ||
|
|
mMediaSource->ReadyState() == dom::MediaSourceReadyState::Closed) {
|
|
return MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE;
|
|
}
|
|
|
|
// Next frame hasn't been decoded yet.
|
|
// Use the buffered range to consider if we have the next frame available.
|
|
TimeUnit currentPosition = TimeUnit::FromMicroseconds(CurrentPosition());
|
|
TimeInterval interval(currentPosition,
|
|
currentPosition + media::TimeUnit::FromMicroseconds(DEFAULT_NEXT_FRAME_AVAILABLE_BUFFERED),
|
|
MediaSourceDemuxer::EOS_FUZZ);
|
|
return GetBuffered().Contains(ClampIntervalToEnd(interval))
|
|
? MediaDecoderOwner::NEXT_FRAME_AVAILABLE
|
|
: MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE;
|
|
}
|
|
|
|
bool
|
|
MediaSourceDecoder::CanPlayThrough()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (NextFrameBufferedStatus() == MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE) {
|
|
return false;
|
|
}
|
|
|
|
if (IsNaN(mMediaSource->Duration())) {
|
|
// Don't have any data yet.
|
|
return false;
|
|
}
|
|
TimeUnit duration = TimeUnit::FromSeconds(mMediaSource->Duration());
|
|
TimeUnit currentPosition = TimeUnit::FromMicroseconds(CurrentPosition());
|
|
if (duration <= currentPosition) {
|
|
return true;
|
|
}
|
|
// If we have data up to the mediasource's duration or 30s ahead, we can
|
|
// assume that we can play without interruption.
|
|
TimeUnit timeAhead =
|
|
std::min(duration, currentPosition + TimeUnit::FromSeconds(30));
|
|
TimeInterval interval(currentPosition,
|
|
timeAhead,
|
|
MediaSourceDemuxer::EOS_FUZZ);
|
|
return GetBuffered().Contains(ClampIntervalToEnd(interval));
|
|
}
|
|
|
|
TimeInterval
|
|
MediaSourceDecoder::ClampIntervalToEnd(const TimeInterval& aInterval)
|
|
{
|
|
if (!mEnded) {
|
|
return aInterval;
|
|
}
|
|
TimeInterval interval(TimeUnit(), TimeUnit::FromSeconds(GetDuration()));
|
|
return aInterval.Intersection(interval);
|
|
}
|
|
|
|
#undef MSE_DEBUG
|
|
#undef MSE_DEBUGV
|
|
|
|
} // namespace mozilla
|