mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 13:34: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)
380 lines
9.4 KiB
C++
380 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 "VideoSink.h"
|
|
|
|
namespace mozilla {
|
|
|
|
extern LazyLogModule gMediaDecoderLog;
|
|
#define VSINK_LOG(msg, ...) \
|
|
MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, \
|
|
("VideoSink=%p " msg, this, ##__VA_ARGS__))
|
|
#define VSINK_LOG_V(msg, ...) \
|
|
MOZ_LOG(gMediaDecoderLog, LogLevel::Verbose, \
|
|
("VideoSink=%p " msg, this, ##__VA_ARGS__))
|
|
|
|
using namespace mozilla::layers;
|
|
|
|
namespace media {
|
|
|
|
VideoSink::VideoSink(AbstractThread* aThread,
|
|
MediaSink* aAudioSink,
|
|
MediaQueue<MediaData>& aVideoQueue,
|
|
VideoFrameContainer* aContainer,
|
|
bool aRealTime,
|
|
FrameStatistics& aFrameStats,
|
|
int aDelayDuration,
|
|
uint32_t aVQueueSentToCompositerSize)
|
|
: mOwnerThread(aThread)
|
|
, mAudioSink(aAudioSink)
|
|
, mVideoQueue(aVideoQueue)
|
|
, mContainer(aContainer)
|
|
, mProducerID(ImageContainer::AllocateProducerID())
|
|
, mRealTime(aRealTime)
|
|
, mFrameStats(aFrameStats)
|
|
, mVideoFrameEndTime(-1)
|
|
, mHasVideo(false)
|
|
, mUpdateScheduler(aThread)
|
|
, mDelayDuration(aDelayDuration)
|
|
, mVideoQueueSendToCompositorSize(aVQueueSentToCompositerSize)
|
|
{
|
|
MOZ_ASSERT(mAudioSink, "AudioSink should exist.");
|
|
}
|
|
|
|
VideoSink::~VideoSink()
|
|
{
|
|
}
|
|
|
|
const MediaSink::PlaybackParams&
|
|
VideoSink::GetPlaybackParams() const
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
return mAudioSink->GetPlaybackParams();
|
|
}
|
|
|
|
void
|
|
VideoSink::SetPlaybackParams(const PlaybackParams& aParams)
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
mAudioSink->SetPlaybackParams(aParams);
|
|
}
|
|
|
|
RefPtr<GenericPromise>
|
|
VideoSink::OnEnded(TrackType aType)
|
|
{
|
|
AssertOwnerThread();
|
|
MOZ_ASSERT(mAudioSink->IsStarted(), "Must be called after playback starts.");
|
|
|
|
if (aType == TrackInfo::kAudioTrack) {
|
|
return mAudioSink->OnEnded(aType);
|
|
} else if (aType == TrackInfo::kVideoTrack) {
|
|
return mEndPromise;
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
int64_t
|
|
VideoSink::GetEndTime(TrackType aType) const
|
|
{
|
|
AssertOwnerThread();
|
|
MOZ_ASSERT(mAudioSink->IsStarted(), "Must be called after playback starts.");
|
|
|
|
if (aType == TrackInfo::kVideoTrack) {
|
|
return mVideoFrameEndTime;
|
|
} else if (aType == TrackInfo::kAudioTrack) {
|
|
return mAudioSink->GetEndTime(aType);
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
int64_t
|
|
VideoSink::GetPosition(TimeStamp* aTimeStamp) const
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
return mAudioSink->GetPosition(aTimeStamp);
|
|
}
|
|
|
|
bool
|
|
VideoSink::HasUnplayedFrames(TrackType aType) const
|
|
{
|
|
AssertOwnerThread();
|
|
MOZ_ASSERT(aType == TrackInfo::kAudioTrack, "Not implemented for non audio tracks.");
|
|
|
|
return mAudioSink->HasUnplayedFrames(aType);
|
|
}
|
|
|
|
void
|
|
VideoSink::SetPlaybackRate(double aPlaybackRate)
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
mAudioSink->SetPlaybackRate(aPlaybackRate);
|
|
}
|
|
|
|
void
|
|
VideoSink::SetVolume(double aVolume)
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
mAudioSink->SetVolume(aVolume);
|
|
}
|
|
|
|
void
|
|
VideoSink::SetPreservesPitch(bool aPreservesPitch)
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
mAudioSink->SetPreservesPitch(aPreservesPitch);
|
|
}
|
|
|
|
void
|
|
VideoSink::SetPlaying(bool aPlaying)
|
|
{
|
|
AssertOwnerThread();
|
|
VSINK_LOG_V(" playing (%d) -> (%d)", mAudioSink->IsPlaying(), aPlaying);
|
|
|
|
if (!aPlaying) {
|
|
// Reset any update timer if paused.
|
|
mUpdateScheduler.Reset();
|
|
// Since playback is paused, tell compositor to render only current frame.
|
|
RenderVideoFrames(1);
|
|
}
|
|
|
|
mAudioSink->SetPlaying(aPlaying);
|
|
|
|
if (mHasVideo && aPlaying) {
|
|
// There's no thread in VideoSink for pulling video frames, need to trigger
|
|
// rendering while becoming playing status. because the VideoQueue may be
|
|
// full already.
|
|
TryUpdateRenderedVideoFrames();
|
|
}
|
|
}
|
|
|
|
void
|
|
VideoSink::Start(int64_t aStartTime, const MediaInfo& aInfo)
|
|
{
|
|
AssertOwnerThread();
|
|
VSINK_LOG("[%s]", __func__);
|
|
|
|
mAudioSink->Start(aStartTime, aInfo);
|
|
|
|
mHasVideo = aInfo.HasVideo();
|
|
|
|
if (mHasVideo) {
|
|
mEndPromise = mEndPromiseHolder.Ensure(__func__);
|
|
ConnectListener();
|
|
TryUpdateRenderedVideoFrames();
|
|
}
|
|
}
|
|
|
|
void
|
|
VideoSink::Stop()
|
|
{
|
|
AssertOwnerThread();
|
|
MOZ_ASSERT(mAudioSink->IsStarted(), "playback not started.");
|
|
VSINK_LOG("[%s]", __func__);
|
|
|
|
mAudioSink->Stop();
|
|
|
|
mUpdateScheduler.Reset();
|
|
if (mHasVideo) {
|
|
DisconnectListener();
|
|
mEndPromiseHolder.Resolve(true, __func__);
|
|
mEndPromise = nullptr;
|
|
}
|
|
mVideoFrameEndTime = -1;
|
|
}
|
|
|
|
bool
|
|
VideoSink::IsStarted() const
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
return mAudioSink->IsStarted();
|
|
}
|
|
|
|
bool
|
|
VideoSink::IsPlaying() const
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
return mAudioSink->IsPlaying();
|
|
}
|
|
|
|
void
|
|
VideoSink::Shutdown()
|
|
{
|
|
AssertOwnerThread();
|
|
MOZ_ASSERT(!mAudioSink->IsStarted(), "must be called after playback stops.");
|
|
VSINK_LOG("[%s]", __func__);
|
|
|
|
mAudioSink->Shutdown();
|
|
}
|
|
|
|
void
|
|
VideoSink::OnVideoQueueEvent()
|
|
{
|
|
AssertOwnerThread();
|
|
// Listen to push event, VideoSink should try rendering ASAP if first frame
|
|
// arrives but update scheduler is not triggered yet.
|
|
TryUpdateRenderedVideoFrames();
|
|
}
|
|
|
|
void
|
|
VideoSink::Redraw()
|
|
{
|
|
AssertOwnerThread();
|
|
RenderVideoFrames(1);
|
|
}
|
|
|
|
void
|
|
VideoSink::TryUpdateRenderedVideoFrames()
|
|
{
|
|
AssertOwnerThread();
|
|
if (!mUpdateScheduler.IsScheduled() && VideoQueue().GetSize() >= 1 &&
|
|
mAudioSink->IsPlaying()) {
|
|
UpdateRenderedVideoFrames();
|
|
}
|
|
}
|
|
|
|
void
|
|
VideoSink::UpdateRenderedVideoFramesByTimer()
|
|
{
|
|
AssertOwnerThread();
|
|
mUpdateScheduler.CompleteRequest();
|
|
UpdateRenderedVideoFrames();
|
|
}
|
|
|
|
void
|
|
VideoSink::ConnectListener()
|
|
{
|
|
AssertOwnerThread();
|
|
mPushListener = VideoQueue().PushEvent().Connect(
|
|
mOwnerThread, this, &VideoSink::OnVideoQueueEvent);
|
|
}
|
|
|
|
void
|
|
VideoSink::DisconnectListener()
|
|
{
|
|
AssertOwnerThread();
|
|
mPushListener.Disconnect();
|
|
}
|
|
|
|
void
|
|
VideoSink::RenderVideoFrames(int32_t aMaxFrames,
|
|
int64_t aClockTime,
|
|
const TimeStamp& aClockTimeStamp)
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
nsAutoTArray<RefPtr<MediaData>,16> frames;
|
|
VideoQueue().GetFirstElements(aMaxFrames, &frames);
|
|
if (frames.IsEmpty() || !mContainer) {
|
|
return;
|
|
}
|
|
|
|
nsAutoTArray<ImageContainer::NonOwningImage,16> images;
|
|
TimeStamp lastFrameTime;
|
|
MediaSink::PlaybackParams params = mAudioSink->GetPlaybackParams();
|
|
for (uint32_t i = 0; i < frames.Length(); ++i) {
|
|
VideoData* frame = frames[i]->As<VideoData>();
|
|
|
|
frame->mSentToCompositor = true;
|
|
|
|
if (!frame->mImage || !frame->mImage->IsValid()) {
|
|
continue;
|
|
}
|
|
|
|
int64_t frameTime = frame->mTime;
|
|
if (frameTime < 0) {
|
|
// Frame times before the start time are invalid; drop such frames
|
|
continue;
|
|
}
|
|
|
|
TimeStamp t;
|
|
if (aMaxFrames > 1) {
|
|
MOZ_ASSERT(!aClockTimeStamp.IsNull());
|
|
int64_t delta = frame->mTime - aClockTime;
|
|
t = aClockTimeStamp +
|
|
TimeDuration::FromMicroseconds(delta / params.mPlaybackRate);
|
|
if (!lastFrameTime.IsNull() && t <= lastFrameTime) {
|
|
// Timestamps out of order; drop the new frame. In theory we should
|
|
// probably replace the previous frame with the new frame if the
|
|
// timestamps are equal, but this is a corrupt video file already so
|
|
// never mind.
|
|
continue;
|
|
}
|
|
lastFrameTime = t;
|
|
}
|
|
|
|
ImageContainer::NonOwningImage* img = images.AppendElement();
|
|
img->mTimeStamp = t;
|
|
img->mImage = frame->mImage;
|
|
img->mFrameID = frame->mFrameID;
|
|
img->mProducerID = mProducerID;
|
|
|
|
VSINK_LOG_V("playing video frame %lld (id=%x) (vq-queued=%i)",
|
|
frame->mTime, frame->mFrameID, VideoQueue().GetSize());
|
|
}
|
|
mContainer->SetCurrentFrames(frames[0]->As<VideoData>()->mDisplay, images);
|
|
}
|
|
|
|
void
|
|
VideoSink::UpdateRenderedVideoFrames()
|
|
{
|
|
AssertOwnerThread();
|
|
MOZ_ASSERT(mAudioSink->IsPlaying(), "should be called while playing.");
|
|
|
|
TimeStamp nowTime;
|
|
const int64_t clockTime = mAudioSink->GetPosition(&nowTime);
|
|
// Skip frames up to the frame at the playback position, and figure out
|
|
// the time remaining until it's time to display the next frame and drop
|
|
// the current frame.
|
|
NS_ASSERTION(clockTime >= 0, "Should have positive clock time.");
|
|
|
|
int64_t remainingTime = mDelayDuration;
|
|
if (VideoQueue().GetSize() > 0) {
|
|
RefPtr<MediaData> currentFrame = VideoQueue().PopFront();
|
|
int32_t framesRemoved = 0;
|
|
while (VideoQueue().GetSize() > 0) {
|
|
MediaData* nextFrame = VideoQueue().PeekFront();
|
|
if (!mRealTime && nextFrame->mTime > clockTime) {
|
|
remainingTime = nextFrame->mTime - clockTime;
|
|
break;
|
|
}
|
|
++framesRemoved;
|
|
if (!currentFrame->As<VideoData>()->mSentToCompositor) {
|
|
mFrameStats.NotifyDecodedFrames(0, 0, 1);
|
|
VSINK_LOG_V("discarding video frame mTime=%lld clock_time=%lld",
|
|
currentFrame->mTime, clockTime);
|
|
}
|
|
currentFrame = VideoQueue().PopFront();
|
|
}
|
|
VideoQueue().PushFront(currentFrame);
|
|
if (framesRemoved > 0) {
|
|
mVideoFrameEndTime = currentFrame->GetEndTime();
|
|
mFrameStats.NotifyPresentedFrame();
|
|
}
|
|
}
|
|
|
|
RenderVideoFrames(mVideoQueueSendToCompositorSize, clockTime, nowTime);
|
|
|
|
TimeStamp target = nowTime + TimeDuration::FromMicroseconds(remainingTime);
|
|
|
|
RefPtr<VideoSink> self = this;
|
|
mUpdateScheduler.Ensure(target, [self] () {
|
|
self->UpdateRenderedVideoFramesByTimer();
|
|
}, [self] () {
|
|
self->UpdateRenderedVideoFramesByTimer();
|
|
});
|
|
}
|
|
|
|
} // namespace media
|
|
} // namespace mozilla
|