2014-02-04 05:49:21 +04:00
|
|
|
/* -*- 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/. */
|
|
|
|
#if !defined(MediaQueue_h_)
|
|
|
|
#define MediaQueue_h_
|
|
|
|
|
|
|
|
#include "mozilla/ReentrantMonitor.h"
|
2015-07-16 21:52:43 +03:00
|
|
|
#include "mozilla/TaskQueue.h"
|
|
|
|
|
|
|
|
#include "nsDeque.h"
|
2015-08-06 05:14:15 +03:00
|
|
|
#include "MediaEventSource.h"
|
2014-02-04 05:49:21 +04:00
|
|
|
|
|
|
|
namespace mozilla {
|
|
|
|
|
|
|
|
// Thread and type safe wrapper around nsDeque.
|
|
|
|
template <class T>
|
|
|
|
class MediaQueueDeallocator : public nsDequeFunctor {
|
2014-08-14 13:24:00 +04:00
|
|
|
virtual void* operator() (void* aObject) {
|
2015-10-18 08:24:48 +03:00
|
|
|
RefPtr<T> releaseMe = dont_AddRef(static_cast<T*>(aObject));
|
2014-02-04 05:49:21 +04:00
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2015-07-23 09:12:00 +03:00
|
|
|
template <class T>
|
|
|
|
class MediaQueue : private nsDeque {
|
|
|
|
public:
|
|
|
|
MediaQueue()
|
|
|
|
: nsDeque(new MediaQueueDeallocator<T>()),
|
|
|
|
mReentrantMonitor("mediaqueue"),
|
|
|
|
mEndOfStream(false)
|
|
|
|
{}
|
2014-02-04 05:49:21 +04:00
|
|
|
|
|
|
|
~MediaQueue() {
|
|
|
|
Reset();
|
|
|
|
}
|
|
|
|
|
2016-04-25 05:13:55 +03:00
|
|
|
inline size_t GetSize() const {
|
2014-02-04 05:49:21 +04:00
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
return nsDeque::GetSize();
|
|
|
|
}
|
|
|
|
|
|
|
|
inline void Push(T* aItem) {
|
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
2014-06-18 09:07:02 +04:00
|
|
|
MOZ_ASSERT(aItem);
|
2014-11-20 00:01:10 +03:00
|
|
|
NS_ADDREF(aItem);
|
Bug 1258870 - Don't push late video frames to the compositor, drop them. r=jwwang
We can get out of A/V sync if the decode is struggling to keep up. This is
because of the loop in VideoSink::UpdateRenderedVideoFrames(). If this function
runs while there's only one frame in the video queue, we won't drop that one
frame if it's late. If we're struggling to keep up, it's increasingly likely
that we'll end up running this function with only one frame in the video queue.
That results in us entering VideoSink::RenderVideoFrames() with only 1 late
frame, which the compositor dutifully draws. Resulting in a late frame being
drawn, and thus broken A/V sync.
This change makes VideoSink::UpdateRenderedVideoFrames() drop all late
frames, even the last one in the video queue. We now keep A/V sync when the
decode is struggling to keep up. However, if I do this, we end up dropping
(and reporting that we drop) a lot more frames, and thus rendering a lot fewer.
But since we when we drop the frames we report them as dropped, a well written
MSE player can detect that we've failing miserably to keep up, and and lower
their bitrate.
MozReview-Commit-ID: ybkq48mKk2
--HG--
extra : rebase_source : f03c186059a365a45de698b2a30e632daae47fb8
2016-08-15 04:35:52 +03:00
|
|
|
MOZ_ASSERT(aItem->GetEndTime() >= aItem->mTime);
|
2014-02-04 05:49:21 +04:00
|
|
|
nsDeque::Push(aItem);
|
2015-11-25 10:15:05 +03:00
|
|
|
mPushEvent.Notify(RefPtr<T>(aItem));
|
2014-02-04 05:49:21 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
inline void PushFront(T* aItem) {
|
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
2014-06-18 09:07:02 +04:00
|
|
|
MOZ_ASSERT(aItem);
|
2014-11-20 00:01:10 +03:00
|
|
|
NS_ADDREF(aItem);
|
2014-02-04 05:49:21 +04:00
|
|
|
nsDeque::PushFront(aItem);
|
|
|
|
}
|
|
|
|
|
2014-11-20 00:01:10 +03:00
|
|
|
inline already_AddRefed<T> PopFront() {
|
2014-02-04 05:49:21 +04:00
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
2015-10-18 08:24:48 +03:00
|
|
|
RefPtr<T> rv = dont_AddRef(static_cast<T*>(nsDeque::PopFront()));
|
2014-03-11 07:44:09 +04:00
|
|
|
if (rv) {
|
2015-08-06 05:14:15 +03:00
|
|
|
mPopEvent.Notify(rv);
|
2014-03-11 07:44:09 +04:00
|
|
|
}
|
2014-11-20 00:01:10 +03:00
|
|
|
return rv.forget();
|
2014-02-04 05:49:21 +04:00
|
|
|
}
|
|
|
|
|
2016-04-25 05:13:55 +03:00
|
|
|
inline RefPtr<T> Peek() const {
|
2014-02-04 05:49:21 +04:00
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
return static_cast<T*>(nsDeque::Peek());
|
|
|
|
}
|
|
|
|
|
2016-04-25 05:13:55 +03:00
|
|
|
inline RefPtr<T> PeekFront() const {
|
2014-02-04 05:49:21 +04:00
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
return static_cast<T*>(nsDeque::PeekFront());
|
|
|
|
}
|
|
|
|
|
|
|
|
void Reset() {
|
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
while (GetSize() > 0) {
|
2016-04-19 18:04:02 +03:00
|
|
|
RefPtr<T> x = dont_AddRef(static_cast<T*>(nsDeque::PopFront()));
|
2014-02-04 05:49:21 +04:00
|
|
|
}
|
|
|
|
mEndOfStream = false;
|
|
|
|
}
|
|
|
|
|
2016-04-25 05:13:55 +03:00
|
|
|
bool AtEndOfStream() const {
|
2014-02-04 05:49:21 +04:00
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
return GetSize() == 0 && mEndOfStream;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Returns true if the media queue has had its last item added to it.
|
|
|
|
// This happens when the media stream has been completely decoded. Note this
|
|
|
|
// does not mean that the corresponding stream has finished playback.
|
2016-04-25 05:13:55 +03:00
|
|
|
bool IsFinished() const {
|
2014-02-04 05:49:21 +04:00
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
return mEndOfStream;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Informs the media queue that it won't be receiving any more items.
|
|
|
|
void Finish() {
|
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
mEndOfStream = true;
|
2015-08-06 05:14:15 +03:00
|
|
|
mFinishEvent.Notify();
|
2014-02-04 05:49:21 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
// Returns the approximate number of microseconds of items in the queue.
|
|
|
|
int64_t Duration() {
|
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
2014-12-24 13:10:24 +03:00
|
|
|
if (GetSize() == 0) {
|
2014-02-04 05:49:21 +04:00
|
|
|
return 0;
|
|
|
|
}
|
2016-04-25 09:36:07 +03:00
|
|
|
T* last = static_cast<T*>(nsDeque::Peek());
|
|
|
|
T* first = static_cast<T*>(nsDeque::PeekFront());
|
2014-12-24 13:10:24 +03:00
|
|
|
return last->GetEndTime() - first->mTime;
|
2014-02-04 05:49:21 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void LockedForEach(nsDequeFunctor& aFunctor) const {
|
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
ForEach(aFunctor);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Extracts elements from the queue into aResult, in order.
|
|
|
|
// Elements whose start time is before aTime are ignored.
|
2015-10-18 08:24:48 +03:00
|
|
|
void GetElementsAfter(int64_t aTime, nsTArray<RefPtr<T>>* aResult) {
|
2014-02-04 05:49:21 +04:00
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
2015-11-15 16:48:08 +03:00
|
|
|
if (GetSize() == 0)
|
2014-02-04 05:49:21 +04:00
|
|
|
return;
|
2015-11-15 16:48:08 +03:00
|
|
|
size_t i;
|
2014-02-04 05:49:21 +04:00
|
|
|
for (i = GetSize() - 1; i > 0; --i) {
|
|
|
|
T* v = static_cast<T*>(ObjectAt(i));
|
|
|
|
if (v->GetEndTime() < aTime)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
// Elements less than i have a end time before aTime. It's also possible
|
|
|
|
// that the element at i has a end time before aTime, but that's OK.
|
|
|
|
for (; i < GetSize(); ++i) {
|
2015-11-15 16:48:08 +03:00
|
|
|
RefPtr<T> elem = static_cast<T*>(ObjectAt(static_cast<size_t>(i)));
|
2014-11-20 00:01:10 +03:00
|
|
|
aResult->AppendElement(elem);
|
2014-02-04 05:49:21 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-18 08:24:48 +03:00
|
|
|
void GetFirstElements(uint32_t aMaxElements, nsTArray<RefPtr<T>>* aResult) {
|
2015-03-30 11:30:03 +03:00
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
2015-11-15 16:48:08 +03:00
|
|
|
for (size_t i = 0; i < aMaxElements && i < GetSize(); ++i) {
|
2015-03-30 11:30:03 +03:00
|
|
|
*aResult->AppendElement() = static_cast<T*>(ObjectAt(i));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-04 05:49:21 +04:00
|
|
|
uint32_t FrameCount() {
|
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
uint32_t frames = 0;
|
2015-11-15 16:48:08 +03:00
|
|
|
for (size_t i = 0; i < GetSize(); ++i) {
|
2014-02-04 05:49:21 +04:00
|
|
|
T* v = static_cast<T*>(ObjectAt(i));
|
|
|
|
frames += v->mFrames;
|
|
|
|
}
|
|
|
|
return frames;
|
|
|
|
}
|
|
|
|
|
2015-10-18 08:24:48 +03:00
|
|
|
MediaEventSource<RefPtr<T>>& PopEvent() {
|
2015-08-06 05:14:15 +03:00
|
|
|
return mPopEvent;
|
2014-03-11 07:44:09 +04:00
|
|
|
}
|
|
|
|
|
2015-11-25 10:15:05 +03:00
|
|
|
MediaEventSource<RefPtr<T>>& PushEvent() {
|
2015-08-06 05:14:15 +03:00
|
|
|
return mPushEvent;
|
|
|
|
}
|
|
|
|
|
|
|
|
MediaEventSource<void>& FinishEvent() {
|
|
|
|
return mFinishEvent;
|
2014-03-11 07:44:09 +04:00
|
|
|
}
|
|
|
|
|
2014-02-04 05:49:21 +04:00
|
|
|
private:
|
|
|
|
mutable ReentrantMonitor mReentrantMonitor;
|
2015-10-18 08:24:48 +03:00
|
|
|
MediaEventProducer<RefPtr<T>> mPopEvent;
|
2015-11-25 10:15:05 +03:00
|
|
|
MediaEventProducer<RefPtr<T>> mPushEvent;
|
2015-08-06 05:14:15 +03:00
|
|
|
MediaEventProducer<void> mFinishEvent;
|
2014-02-04 05:49:21 +04:00
|
|
|
// True when we've decoded the last frame of data in the
|
|
|
|
// bitstream for which we're queueing frame data.
|
|
|
|
bool mEndOfStream;
|
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace mozilla
|
|
|
|
|
|
|
|
#endif
|