author | JW Wang <jwwang@mozilla.com> |
Wed, 11 Nov 2015 07:43:41 +0800 | |
changeset 272061 | b509735f38afb0bc47d1644260294195aaed8883 |
parent 272060 | ef5ac56a15d2c3a25c231608aebaa4f3401ee49d |
child 272062 | 7fe3d7c91ecdc9829d8f6b81040b98c746570baf |
push id | 29659 |
push user | cbook@mozilla.com |
push date | Wed, 11 Nov 2015 11:43:09 +0000 |
treeherder | mozilla-central@84a7cf29f4f1 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jya |
bugs | 1220558 |
milestone | 45.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/media/MediaDecoderReader.h +++ b/dom/media/MediaDecoderReader.h @@ -361,17 +361,16 @@ protected: // Duration, mirrored from the state machine task queue. Mirror<media::NullableTimeUnit> mDuration; // State for ThrottledNotifyDataArrived. MozPromiseRequestHolder<MediaTimerPromise> mThrottledNotify; const TimeDuration mThrottleDuration; TimeStamp mLastThrottledNotify; - Maybe<media::Interval<int64_t>> mThrottledInterval; // Whether we should accept media that we know we can't play // directly, because they have a number of channel higher than // what we support. bool mIgnoreAudioOutputFormat; // The start time of the media, in microseconds. This is the presentation // time of the first frame decoded from the media. This is initialized to -1,
--- a/dom/media/mediasource/SourceBuffer.cpp +++ b/dom/media/mediasource/SourceBuffer.cpp @@ -305,17 +305,16 @@ SourceBuffer::Ended() } SourceBuffer::SourceBuffer(MediaSource* aMediaSource, const nsACString& aType) : DOMEventTargetHelper(aMediaSource->GetParentObject()) , mMediaSource(aMediaSource) , mUpdating(false) , mActive(false) , mUpdateID(0) - , mReportedOffset(0) , mType(aType) { MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(aMediaSource); mEvictionThreshold = Preferences::GetUint("media.mediasource.eviction_threshold", 100 * (1 << 20)); bool generateTimestamps = false; if (aType.LowerCaseEqualsLiteral("audio/mpeg") ||
--- a/dom/media/mediasource/SourceBuffer.h +++ b/dom/media/mediasource/SourceBuffer.h @@ -265,17 +265,16 @@ private: bool mUpdating; mozilla::Atomic<bool> mActive; // Each time mUpdating is set to true, mUpdateID will be incremented. // This allows for a queued AppendData task to identify if it was earlier // aborted and another AppendData queued. uint32_t mUpdateID; - int64_t mReportedOffset; MozPromiseRequestHolder<SourceBufferContentManager::AppendPromise> mPendingAppend; const nsCString mType; RefPtr<TimeRanges> mBuffered; }; } // namespace dom