mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
93f846cd1f
- Bug 1275016 - Rename Endian.h to EndianUtils.h to avoid #include confusion with Android's endian.h stdlib header. r=froydnj (b54a25f572) - add crashreporter stuff (aa7ef15337) - Bug 1261168 - Add AlignedAutoTArray type in Web Audio; r=padenot (285d2cb88b) - Bug 1273390. Part 1 - move some functions to private. r=jya. (07a3037e59) - Bug 1273390. Part 2 - add assertions. r=jya. (2cae7c596a) - Bug 1273390. Part 3 - rename some functions to be consistent with other sub-classes of MediaDataDecoder. r=jya. (c48c7060ce) - Bug 1273390. Part 4 - remove use of FlushableTaskQueue::Flush(). r=jya. (00565a65f4) - Bug 1273390. Part 5 - remove use of FlushableTaskQueue. r=jya. (30600b204e) - Bug 1273774. Part 1 - remove unused members and thread assertions. r=jya (f5177ed641) - Bug 1273774. Part 2 - do decoding jobs synchronously without dispatching. r=jya. (62d840d27c) - Bug 1273774. Part 3 - remove members no longer used. r=jya. (e957ca512a) - Bug 1244410: [ffmpeg] Ensure the last drained frame has the proper duration set. r=gerald (d5521bfdd4) - Bug 1271508. Part 1 - refactor FFmpegAudioDecoder code to be similar to FFmpegVideoDecoder::Input() so it would be easier to extract common code to the parent class. r=jya. (613e6c624c) - Bug 1271508. Part 2 - rename functions so they are the same as those of FFmpegAudioDecoder so it would be easier to extract common code to the parent class. r=jya. (cb281cba26) - Bug 1270350 - per comment 0, use SyncRunnable to repalce the boilerplate code. r=jya. (b99460e571) - Bug 1271508. Part 3 - extract code to the parent class and remove use of mTaskQueue from sub-classes. r=jya. (2a7ff4dd1e) - Bug 1274216 - remove use of FlushableTaskQueue from PlatformDecoderModule. r=jya. (eb160c5fa2) - Bug 1271517. Part 1 - remove use of FlushableTaskQueue::Flush() from FFmpegDataDecoder::Flush(). r=jya. (fdf10da4ab) - Bug 1271517. Part 2 - remove use of FlushableTaskQueue. r=jya. (a7016d8506) - Bug 1273397. Part 1 - rename some functions to be consistent with other MediaDataDecoder sub-classes. r=jya. (7eecb164be) - Bug 1273397. Part 2 - constify some members. r=jya. (e4482f9a23) - Bug 1273397. Part 3 - remove use of FlushableTaskQueue::Flush(). r=jya. (0b7ee073fe) - Bug 1273397. Part 4 - remove use of FlushableTaskQueue. r=jya. (6a612161d5) - Bug 1273397. Part 5 - add assertions. r=jya. (ff3a62a6fb) - Bug 1274199 - remove use of FlushableTaskQueue. r=cpearce. (adc4c84ede) - Bug 1273405. Part 1 - rename some functions to be consistent with other MediaDataDecoder sub-classes. r=jya. (af123d6c21) - Bug 1273405. Part 2 - remove use of FlushableTaskQueue::Flush(). r=jya. (2d144bfbcd) - Bug 1273405. Part 3 - remove use of FlushableTaskQueue. r=jya. (1e9ea3c2c7) - Bug 1273405. Part 4 - add assertions. r=jya. (b400647323) - Bug 1271491: [WMF] P1. Don't use main thread only preferences methods. r=cpearce (7177454dfb) - Bug 1262427. Don't try D3D11 harder. r=dvander (404147d6fa) - Use gfxConfig for D3D9 preferences. (bug 1270650, r=jrmuizel) (40d89c154c) - Bug 1271491: P2. Allow initialization of WMFPlatformDecoderModule from any threads. r=mattwoodrow (c8fe0bf009) - Bug 1271491: P3. Remove refcounting the number of time apple's linkers are called. r=cpearce (0324ffe876) - Bug 1271491: [ffmpeg] P4. Remove requirements to call Init on the main thread. r=cpearce (b511d7dfd5) - Bug 1271491: [GMP] P5. Allow GMPDecoderModule::Init() to be called off the main thread. r=cpearce (2131eb0b2e) - Bug 1266102 - Don't run VP9 benchmark on Android r=jya (57d7b573fe) - Bug 1271491: P6. Remove the need to call PDMFactory::Init(). r=cpearce (5726cfe49c) - Bug 1271491: P7. Remove unused members. r=alfredo (0f8a9dde73) - Bug 1268905 - Disable D3D11 with some Toshiba DLLs - r=cpearce (b5bf77442e) - Bug 1269204 - Disable D3D11 with idg10umd32 9.17.10.2857 - r=cpearce (7eb6a3d96b) - Bug 1273406 - Disable D3D11 with some iSonyVideoProcessor DLLs - r=cpearce (d9b6f0cefe) - Bug 1273406 - Ugly macros transform into beautiful constexpr goodness - r=cpearce (0671483695) - Bug 1273691 - Implement 'media.wmf.disable-d3d11-for-dlls' pref - r=cpearce (193ae53070) - Bug 1272225. Part 1 - add assertions to make thread constraints clear. r=jya. (83c620470e) - Bug 1272225. Part 2 - remove use of FlushableTaskQueue::Flush(). r=jya. (9473e092d1) - Bug 1272553. Part 1 - move code around to be able to extract common code in P2. r=jya. (d727f97ee8) - Bug 1272553. Part 2 - extract common code to the parent class. r=jya. (2fb3cd4bd9) - Bug 1272553. Part 3 - make mTaskQueue private. r=jya. (93fea98cb6) - Bug 1272232. Part 1 - move code around so we can extract common code in P2. r=jya. (8cdaab9078) - Bug 1272232. Part 2 - extract common code to the parent class. r=jya. (27156668b3) - Bug 1272232. Part 3 - constify some members and make them private when possible. r=jya. (550b963d97) - Bug 1272232. Part 4 - remove use of FlushableTaskQueue::Flush(). r=jya. (bdbfdeb6bc) - Bug 1272232. Part 5 - remove use of FlushableTaskQueue. r=jya. (640f889a9d) - Bug 1274913 - Move PDM log definition to header. r=njn (823b07f42b) - Bug 1275538: P1. Abort early if a skip request is in progress. r=gerald,kamidphish (d67b8a2236) - Bug 1272422 - Part 1: Expose control of suspending background video. r=cpearce (ec7193773f) - Bug 1272422 - Part 2: Vidoe -> Video. r=cpearce (97390aee69) - Bug 1272422 - Part 3: Don't reset audio queue. r=jya (e183db1062) - Bug 1272964: P1. Only activate skip to next keyframe logic when next keyframe time is known. r=gerald (1be74df027) - Bug 1272964: P2. Don't activate skip to next keyframe until we passed the internal seek target. r=gerald (c55b6ae003) - Bug 1258922: [MSE] P1. Initialise variable. r=gerald (56a5acb345) - Bug 1258922: [MSE] P2. Do not go over gap when attempting to find the next key frame. r=gerald (db1319f080) - Bug 1258922: [MSE] P3. Check that the data we are attempting to skip to is buffered. r=gerald (621d71d5d6) - Bug 1258922: [MSE] P4. Set draining flag to true when skip to next keyframe failed. r=gerald (6c75613faf) - Bug 1272916: [MSE] P1. Don't rely only on dts gap to establish if we have a gap in our source buffer. r=gerald (8770113b83) - Bug 1272964: [MSE] P3. Do not skip over gaps when searching for the next keyframe. r=gerald (76916c5ac6) - Bug 1272964: P4. Only flush decoder if skip to next keyframe actually succeeds. r=cpearce (5394708eef) - Bug 1270323: P1. Don't reset flag indicating that new data was received. r=cpearce (d32f06ef34) - Bug 1270323: P2. Don't process new incoming data while a skip to next keyframe is pending. r=cpearce (bca7909de9) - Bug 1270323: [ffmpeg] P3. Use the dts of the last sample input, not the dts of the last decoded sample (0d768c33ef) - Bug 1270323: P4. Don't drain decoder if we're already waiting for new data. r=cpearce (679302cb6e) - Bug 1270323: P5. Prevent potential null deref. r=cpearce (cc63270e06) - Bug 1275538: P2. Drop decoded frames that we know are already too late. r=kamidphish (4e7af9398c) - Bug 1273018: P1. Rename some members. r=gerald (3a92fbd994) - Bug 1273018: P2. Don't reject audio waiting promise when performing a video only seek. r=gerald (34e4988db1) - Bug 1273018: P3. Adjust range of audio assertions. r=gerald (feb2afd0ae) - Bug 1249706 - Backout a085ea2d24bb for blowing telemetry server's mind. r=backout (d61fb51f52) - Bug 1249706 - Fix 8fe22dd4fc8a (backout of a085ea2d24bb). r=bustage (ba65251db7) - Bug 1272964: [MSE] P5. Default to skipping to the next keyframe if no keyframe was found past currentTime. (29086fcf56) - Bug 1272964: P6. Exclude frames dropped due to internal seeking from calculations. r=cpearce (bf6faa7612) - Bug 1068151 - keep decoding a corrupted video. r=jya (3b5462e5b6) - Bug 1273947 - Update ResetDecode() to ResetDecode(TargetQueue) r=jya (6c28d46974) - Bug 1277508: P1. Don't attempt to demux new samples while we're currently draining. r=kamidphish (64f200b921) - Bug 1274933: Reject data promise when EOS is encountered following waiting for data. r=gerald (5bba4a7853) - Bug 1277508: P2. Add HasPendingDrain convenience method. r=kamidphish (3d89a90a97)
734 lines
23 KiB
C++
734 lines
23 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 "SeekTask.h"
|
|
#include "MediaDecoderReaderWrapper.h"
|
|
#include "mozilla/AbstractThread.h"
|
|
#include "mozilla/Assertions.h"
|
|
#include "nsPrintfCString.h"
|
|
|
|
namespace mozilla {
|
|
|
|
extern LazyLogModule gMediaDecoderLog;
|
|
extern LazyLogModule gMediaSampleLog;
|
|
|
|
// avoid redefined macro in unified build
|
|
#undef LOG
|
|
#undef DECODER_LOG
|
|
#undef VERBOSE_LOG
|
|
|
|
#define LOG(m, l, x, ...) \
|
|
MOZ_LOG(m, l, ("[SeekTask] Decoder=%p " x, mDecoderID, ##__VA_ARGS__))
|
|
#define DECODER_LOG(x, ...) \
|
|
LOG(gMediaDecoderLog, LogLevel::Debug, x, ##__VA_ARGS__)
|
|
#define VERBOSE_LOG(x, ...) \
|
|
LOG(gMediaDecoderLog, LogLevel::Verbose, x, ##__VA_ARGS__)
|
|
#define SAMPLE_LOG(x, ...) \
|
|
LOG(gMediaSampleLog, LogLevel::Debug, x, ##__VA_ARGS__)
|
|
|
|
// Somehow MSVC doesn't correctly delete the comma before ##__VA_ARGS__
|
|
// when __VA_ARGS__ expands to nothing. This is a workaround for it.
|
|
#define DECODER_WARN_HELPER(a, b) NS_WARNING b
|
|
#define DECODER_WARN(x, ...) \
|
|
DECODER_WARN_HELPER(0, (nsPrintfCString("Decoder=%p " x, mDecoderID, ##__VA_ARGS__).get()))
|
|
|
|
/*static*/ already_AddRefed<SeekTask>
|
|
SeekTask::CreateSeekTask(const void* aDecoderID,
|
|
AbstractThread* aThread,
|
|
MediaDecoderReaderWrapper* aReader,
|
|
SeekJob&& aSeekJob,
|
|
const MediaInfo& aInfo,
|
|
const media::TimeUnit& aDuration,
|
|
int64_t aCurrentMediaTime)
|
|
{
|
|
RefPtr<SeekTask> task(new SeekTask(aDecoderID, aThread,
|
|
aReader, Move(aSeekJob), aInfo,
|
|
aDuration, aCurrentMediaTime));
|
|
|
|
return task.forget();
|
|
}
|
|
|
|
SeekTask::SeekTask(const void* aDecoderID,
|
|
AbstractThread* aThread,
|
|
MediaDecoderReaderWrapper* aReader,
|
|
SeekJob&& aSeekJob,
|
|
const MediaInfo& aInfo,
|
|
const media::TimeUnit& aDuration,
|
|
int64_t aCurrentMediaTime)
|
|
: mDecoderID(aDecoderID)
|
|
, mOwnerThread(aThread)
|
|
, mReader(aReader)
|
|
, mSeekJob(Move(aSeekJob))
|
|
, mCurrentTimeBeforeSeek(aCurrentMediaTime)
|
|
, mAudioRate(aInfo.mAudio.mRate)
|
|
, mHasAudio(aInfo.HasAudio())
|
|
, mHasVideo(aInfo.HasVideo())
|
|
, mDropAudioUntilNextDiscontinuity(false)
|
|
, mDropVideoUntilNextDiscontinuity(false)
|
|
, mIsDiscarded(false)
|
|
, mIsAudioQueueFinished(false)
|
|
, mIsVideoQueueFinished(false)
|
|
, mNeedToStopPrerollingAudio(false)
|
|
, mNeedToStopPrerollingVideo(false)
|
|
{
|
|
// Bound the seek time to be inside the media range.
|
|
int64_t end = aDuration.ToMicroseconds();
|
|
NS_ASSERTION(end != -1, "Should know end time by now");
|
|
int64_t seekTime = mSeekJob.mTarget.GetTime().ToMicroseconds();
|
|
seekTime = std::min(seekTime, end);
|
|
seekTime = std::max(int64_t(0), seekTime);
|
|
NS_ASSERTION(seekTime >= 0 && seekTime <= end,
|
|
"Can only seek in range [0,duration]");
|
|
mSeekJob.mTarget.SetTime(media::TimeUnit::FromMicroseconds(seekTime));
|
|
|
|
mDropAudioUntilNextDiscontinuity = HasAudio();
|
|
mDropVideoUntilNextDiscontinuity = HasVideo();
|
|
|
|
// Configure MediaDecoderReaderWrapper.
|
|
SetMediaDecoderReaderWrapperCallback();
|
|
}
|
|
|
|
SeekTask::~SeekTask()
|
|
{
|
|
MOZ_ASSERT(mIsDiscarded);
|
|
}
|
|
|
|
void
|
|
SeekTask::Resolve(const char* aCallSite)
|
|
{
|
|
SeekTaskResolveValue val;
|
|
val.mSeekedAudioData = mSeekedAudioData;
|
|
val.mSeekedVideoData = mSeekedVideoData;
|
|
val.mIsAudioQueueFinished = mIsAudioQueueFinished;
|
|
val.mIsVideoQueueFinished = mIsVideoQueueFinished;
|
|
val.mNeedToStopPrerollingAudio = mNeedToStopPrerollingAudio;
|
|
val.mNeedToStopPrerollingVideo = mNeedToStopPrerollingVideo;
|
|
|
|
mSeekTaskPromise.Resolve(val, aCallSite);
|
|
}
|
|
|
|
void
|
|
SeekTask::RejectIfExist(const char* aCallSite)
|
|
{
|
|
SeekTaskRejectValue val;
|
|
val.mIsAudioQueueFinished = mIsAudioQueueFinished;
|
|
val.mIsVideoQueueFinished = mIsVideoQueueFinished;
|
|
val.mNeedToStopPrerollingAudio = mNeedToStopPrerollingAudio;
|
|
val.mNeedToStopPrerollingVideo = mNeedToStopPrerollingVideo;
|
|
|
|
mSeekTaskPromise.RejectIfExists(val, aCallSite);
|
|
}
|
|
|
|
void
|
|
SeekTask::AssertOwnerThread() const
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
}
|
|
|
|
bool
|
|
SeekTask::HasAudio() const
|
|
{
|
|
return mHasAudio;
|
|
}
|
|
|
|
bool
|
|
SeekTask::HasVideo() const
|
|
{
|
|
return mHasVideo;
|
|
}
|
|
|
|
AbstractThread*
|
|
SeekTask::OwnerThread() const
|
|
{
|
|
return mOwnerThread;
|
|
}
|
|
|
|
void
|
|
SeekTask::Discard()
|
|
{
|
|
// Disconnect MediaDecoder.
|
|
mSeekJob.RejectIfExists(__func__);
|
|
|
|
// Disconnect MDSM.
|
|
RejectIfExist(__func__);
|
|
|
|
// Disconnect MediaDecoderReaderWrapper.
|
|
mSeekRequest.DisconnectIfExists();
|
|
mAudioWaitRequest.DisconnectIfExists();
|
|
mVideoWaitRequest.DisconnectIfExists();
|
|
CancelMediaDecoderReaderWrapperCallback();
|
|
|
|
mIsDiscarded = true;
|
|
}
|
|
|
|
bool
|
|
SeekTask::NeedToResetMDSM() const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
SeekJob&
|
|
SeekTask::GetSeekJob()
|
|
{
|
|
return mSeekJob;
|
|
}
|
|
|
|
bool
|
|
SeekTask::Exists() const
|
|
{
|
|
return mSeekJob.Exists();
|
|
}
|
|
|
|
RefPtr<SeekTask::SeekTaskPromise>
|
|
SeekTask::Seek(const media::TimeUnit& aDuration)
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
// Do the seek.
|
|
mSeekRequest.Begin(mReader->Seek(mSeekJob.mTarget, aDuration)
|
|
->Then(OwnerThread(), __func__, this,
|
|
&SeekTask::OnSeekResolved, &SeekTask::OnSeekRejected));
|
|
|
|
return mSeekTaskPromise.Ensure(__func__);
|
|
}
|
|
|
|
bool
|
|
SeekTask::IsVideoDecoding() const
|
|
{
|
|
AssertOwnerThread();
|
|
return HasVideo() && !mIsVideoQueueFinished;
|
|
}
|
|
|
|
bool
|
|
SeekTask::IsAudioDecoding() const
|
|
{
|
|
AssertOwnerThread();
|
|
return HasAudio() && !mIsAudioQueueFinished;
|
|
}
|
|
|
|
nsresult
|
|
SeekTask::EnsureAudioDecodeTaskQueued()
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
SAMPLE_LOG("EnsureAudioDecodeTaskQueued isDecoding=%d status=%s",
|
|
IsAudioDecoding(), AudioRequestStatus());
|
|
|
|
if (!IsAudioDecoding() ||
|
|
mReader->IsRequestingAudioData() ||
|
|
mAudioWaitRequest.Exists() ||
|
|
mSeekRequest.Exists()) {
|
|
return NS_OK;
|
|
}
|
|
|
|
RequestAudioData();
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
SeekTask::EnsureVideoDecodeTaskQueued()
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
SAMPLE_LOG("EnsureVideoDecodeTaskQueued isDecoding=%d status=%s",
|
|
IsVideoDecoding(), VideoRequestStatus());
|
|
|
|
if (!IsVideoDecoding() ||
|
|
mReader->IsRequestingVideoData() ||
|
|
mVideoWaitRequest.Exists() ||
|
|
mSeekRequest.Exists()) {
|
|
return NS_OK;
|
|
}
|
|
|
|
RequestVideoData();
|
|
return NS_OK;
|
|
}
|
|
|
|
const char*
|
|
SeekTask::AudioRequestStatus()
|
|
{
|
|
AssertOwnerThread();
|
|
if (mReader->IsRequestingAudioData()) {
|
|
MOZ_DIAGNOSTIC_ASSERT(!mAudioWaitRequest.Exists());
|
|
return "pending";
|
|
} else if (mAudioWaitRequest.Exists()) {
|
|
return "waiting";
|
|
}
|
|
return "idle";
|
|
}
|
|
|
|
const char*
|
|
SeekTask::VideoRequestStatus()
|
|
{
|
|
AssertOwnerThread();
|
|
if (mReader->IsRequestingVideoData()) {
|
|
MOZ_DIAGNOSTIC_ASSERT(!mVideoWaitRequest.Exists());
|
|
return "pending";
|
|
} else if (mVideoWaitRequest.Exists()) {
|
|
return "waiting";
|
|
}
|
|
return "idle";
|
|
}
|
|
|
|
void
|
|
SeekTask::RequestAudioData()
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
SAMPLE_LOG("Queueing audio task - queued=%i, decoder-queued=%o",
|
|
!!mSeekedAudioData, mReader->SizeOfAudioQueueInFrames());
|
|
|
|
mReader->RequestAudioData();
|
|
}
|
|
|
|
void
|
|
SeekTask::RequestVideoData()
|
|
{
|
|
AssertOwnerThread();
|
|
//These two variables are not used in the SEEKING state.
|
|
const bool skipToNextKeyFrame = false;
|
|
const media::TimeUnit currentTime = media::TimeUnit::FromMicroseconds(0);
|
|
|
|
SAMPLE_LOG("Queueing video task - queued=%i, decoder-queued=%o, skip=%i, time=%lld",
|
|
!!mSeekedVideoData, mReader->SizeOfVideoQueueInFrames(), skipToNextKeyFrame,
|
|
currentTime.ToMicroseconds());
|
|
|
|
mReader->RequestVideoData(skipToNextKeyFrame, currentTime);
|
|
}
|
|
|
|
nsresult
|
|
SeekTask::DropAudioUpToSeekTarget(MediaData* aSample)
|
|
{
|
|
AssertOwnerThread();
|
|
RefPtr<AudioData> audio(aSample->As<AudioData>());
|
|
MOZ_ASSERT(audio && mSeekJob.Exists() && mSeekJob.mTarget.IsAccurate());
|
|
|
|
CheckedInt64 sampleDuration = FramesToUsecs(audio->mFrames, mAudioRate);
|
|
if (!sampleDuration.isValid()) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
if (audio->mTime + sampleDuration.value() <= mSeekJob.mTarget.GetTime().ToMicroseconds()) {
|
|
// Our seek target lies after the frames in this AudioData. Don't
|
|
// push it onto the audio queue, and keep decoding forwards.
|
|
return NS_OK;
|
|
}
|
|
|
|
if (audio->mTime > mSeekJob.mTarget.GetTime().ToMicroseconds()) {
|
|
// The seek target doesn't lie in the audio block just after the last
|
|
// audio frames we've seen which were before the seek target. This
|
|
// could have been the first audio data we've seen after seek, i.e. the
|
|
// seek terminated after the seek target in the audio stream. Just
|
|
// abort the audio decode-to-target, the state machine will play
|
|
// silence to cover the gap. Typically this happens in poorly muxed
|
|
// files.
|
|
DECODER_WARN("Audio not synced after seek, maybe a poorly muxed file?");
|
|
mSeekedAudioData = audio;
|
|
return NS_OK;
|
|
}
|
|
|
|
// The seek target lies somewhere in this AudioData's frames, strip off
|
|
// any frames which lie before the seek target, so we'll begin playback
|
|
// exactly at the seek target.
|
|
NS_ASSERTION(mSeekJob.mTarget.GetTime().ToMicroseconds() >= audio->mTime,
|
|
"Target must at or be after data start.");
|
|
NS_ASSERTION(mSeekJob.mTarget.GetTime().ToMicroseconds() < audio->mTime + sampleDuration.value(),
|
|
"Data must end after target.");
|
|
|
|
CheckedInt64 framesToPrune =
|
|
UsecsToFrames(mSeekJob.mTarget.GetTime().ToMicroseconds() - audio->mTime, mAudioRate);
|
|
if (!framesToPrune.isValid()) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
if (framesToPrune.value() > audio->mFrames) {
|
|
// We've messed up somehow. Don't try to trim frames, the |frames|
|
|
// variable below will overflow.
|
|
DECODER_WARN("Can't prune more frames that we have!");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
uint32_t frames = audio->mFrames - static_cast<uint32_t>(framesToPrune.value());
|
|
uint32_t channels = audio->mChannels;
|
|
AlignedAudioBuffer audioData(frames * channels);
|
|
if (!audioData) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
memcpy(audioData.get(),
|
|
audio->mAudioData.get() + (framesToPrune.value() * channels),
|
|
frames * channels * sizeof(AudioDataValue));
|
|
CheckedInt64 duration = FramesToUsecs(frames, mAudioRate);
|
|
if (!duration.isValid()) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
RefPtr<AudioData> data(new AudioData(audio->mOffset,
|
|
mSeekJob.mTarget.GetTime().ToMicroseconds(),
|
|
duration.value(),
|
|
frames,
|
|
Move(audioData),
|
|
channels,
|
|
audio->mRate));
|
|
MOZ_ASSERT(!mSeekedAudioData, "Should be the 1st sample after seeking");
|
|
mSeekedAudioData = data;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
SeekTask::DropVideoUpToSeekTarget(MediaData* aSample)
|
|
{
|
|
AssertOwnerThread();
|
|
RefPtr<VideoData> video(aSample->As<VideoData>());
|
|
MOZ_ASSERT(video);
|
|
DECODER_LOG("DropVideoUpToSeekTarget() frame [%lld, %lld]",
|
|
video->mTime, video->GetEndTime());
|
|
MOZ_ASSERT(mSeekJob.Exists());
|
|
const int64_t target = mSeekJob.mTarget.GetTime().ToMicroseconds();
|
|
|
|
// If the frame end time is less than the seek target, we won't want
|
|
// to display this frame after the seek, so discard it.
|
|
if (target >= video->GetEndTime()) {
|
|
DECODER_LOG("DropVideoUpToSeekTarget() pop video frame [%lld, %lld] target=%lld",
|
|
video->mTime, video->GetEndTime(), target);
|
|
mFirstVideoFrameAfterSeek = video;
|
|
} else {
|
|
if (target >= video->mTime && video->GetEndTime() >= target) {
|
|
// The seek target lies inside this frame's time slice. Adjust the frame's
|
|
// start time to match the seek target. We do this by replacing the
|
|
// first frame with a shallow copy which has the new timestamp.
|
|
RefPtr<VideoData> temp = VideoData::ShallowCopyUpdateTimestamp(video.get(), target);
|
|
video = temp;
|
|
}
|
|
mFirstVideoFrameAfterSeek = nullptr;
|
|
|
|
DECODER_LOG("DropVideoUpToSeekTarget() found video frame [%lld, %lld] containing target=%lld",
|
|
video->mTime, video->GetEndTime(), target);
|
|
|
|
MOZ_ASSERT(!mSeekedVideoData, "Should be the 1st sample after seeking");
|
|
mSeekedVideoData = video;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
bool
|
|
SeekTask::IsAudioSeekComplete()
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
SAMPLE_LOG("IsAudioSeekComplete() curTarVal=%d mAudDis=%d aqFin=%d aqSz=%d",
|
|
mSeekJob.Exists(), mDropAudioUntilNextDiscontinuity, mIsAudioQueueFinished, !!mSeekedAudioData);
|
|
return
|
|
!HasAudio() ||
|
|
mSeekJob.mTarget.IsVideoOnly() ||
|
|
(Exists() && !mDropAudioUntilNextDiscontinuity &&
|
|
(mIsAudioQueueFinished || mSeekedAudioData));
|
|
}
|
|
|
|
bool
|
|
SeekTask::IsVideoSeekComplete()
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
SAMPLE_LOG("IsVideoSeekComplete() curTarVal=%d mVidDis=%d vqFin=%d vqSz=%d",
|
|
mSeekJob.Exists(), mDropVideoUntilNextDiscontinuity, mIsVideoQueueFinished, !!mSeekedVideoData);
|
|
|
|
return
|
|
!HasVideo() ||
|
|
(Exists() && !mDropVideoUntilNextDiscontinuity &&
|
|
(mIsVideoQueueFinished || mSeekedVideoData));
|
|
}
|
|
|
|
void
|
|
SeekTask::CheckIfSeekComplete()
|
|
{
|
|
AssertOwnerThread();
|
|
|
|
const bool videoSeekComplete = IsVideoSeekComplete();
|
|
if (HasVideo() && !videoSeekComplete) {
|
|
// We haven't reached the target. Ensure we have requested another sample.
|
|
if (NS_FAILED(EnsureVideoDecodeTaskQueued())) {
|
|
DECODER_WARN("Failed to request video during seek");
|
|
RejectIfExist(__func__);
|
|
}
|
|
}
|
|
|
|
const bool audioSeekComplete = IsAudioSeekComplete();
|
|
if (HasAudio() && !audioSeekComplete) {
|
|
// We haven't reached the target. Ensure we have requested another sample.
|
|
if (NS_FAILED(EnsureAudioDecodeTaskQueued())) {
|
|
DECODER_WARN("Failed to request audio during seek");
|
|
RejectIfExist(__func__);
|
|
}
|
|
}
|
|
|
|
SAMPLE_LOG("CheckIfSeekComplete() audioSeekComplete=%d videoSeekComplete=%d",
|
|
audioSeekComplete, videoSeekComplete);
|
|
|
|
if (audioSeekComplete && videoSeekComplete) {
|
|
Resolve(__func__); // Call to MDSM::SeekCompleted();
|
|
}
|
|
}
|
|
|
|
void
|
|
SeekTask::OnSeekResolved(media::TimeUnit)
|
|
{
|
|
AssertOwnerThread();
|
|
mSeekRequest.Complete();
|
|
// We must decode the first samples of active streams, so we can determine
|
|
// the new stream time. So dispatch tasks to do that.
|
|
EnsureVideoDecodeTaskQueued();
|
|
if (!mSeekJob.mTarget.IsVideoOnly()) {
|
|
EnsureAudioDecodeTaskQueued();
|
|
}
|
|
}
|
|
|
|
void
|
|
SeekTask::OnSeekRejected(nsresult aResult)
|
|
{
|
|
AssertOwnerThread();
|
|
mSeekRequest.Complete();
|
|
MOZ_ASSERT(NS_FAILED(aResult), "Cancels should also disconnect mSeekRequest");
|
|
RejectIfExist(__func__);
|
|
}
|
|
|
|
void
|
|
SeekTask::OnAudioDecoded(MediaData* aAudioSample)
|
|
{
|
|
AssertOwnerThread();
|
|
RefPtr<MediaData> audio(aAudioSample);
|
|
MOZ_ASSERT(audio);
|
|
|
|
// The MDSM::mDecodedAudioEndTime will be updated once the whole SeekTask is
|
|
// resolved.
|
|
|
|
SAMPLE_LOG("OnAudioDecoded [%lld,%lld] disc=%d",
|
|
(audio ? audio->mTime : -1),
|
|
(audio ? audio->GetEndTime() : -1),
|
|
(audio ? audio->mDiscontinuity : 0));
|
|
|
|
if (!Exists()) {
|
|
// We've received a sample from a previous decode. Discard it.
|
|
return;
|
|
}
|
|
|
|
if (audio->mDiscontinuity) {
|
|
mDropAudioUntilNextDiscontinuity = false;
|
|
}
|
|
|
|
if (!mDropAudioUntilNextDiscontinuity) {
|
|
// We must be after the discontinuity; we're receiving samples
|
|
// at or after the seek target.
|
|
if (mSeekJob.mTarget.IsFast() &&
|
|
mSeekJob.mTarget.GetTime().ToMicroseconds() > mCurrentTimeBeforeSeek &&
|
|
audio->mTime < mCurrentTimeBeforeSeek) {
|
|
// We are doing a fastSeek, but we ended up *before* the previous
|
|
// playback position. This is surprising UX, so switch to an accurate
|
|
// seek and decode to the seek target. This is not conformant to the
|
|
// spec, fastSeek should always be fast, but until we get the time to
|
|
// change all Readers to seek to the keyframe after the currentTime
|
|
// in this case, we'll just decode forward. Bug 1026330.
|
|
mSeekJob.mTarget.SetType(SeekTarget::Accurate);
|
|
}
|
|
if (mSeekJob.mTarget.IsFast()) {
|
|
// Non-precise seek; we can stop the seek at the first sample.
|
|
mSeekedAudioData = audio;
|
|
} else {
|
|
// We're doing an accurate seek. We must discard
|
|
// MediaData up to the one containing exact seek target.
|
|
if (NS_FAILED(DropAudioUpToSeekTarget(audio.get()))) {
|
|
RejectIfExist(__func__);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
CheckIfSeekComplete();
|
|
}
|
|
|
|
void
|
|
SeekTask::OnAudioNotDecoded(MediaDecoderReader::NotDecodedReason aReason)
|
|
{
|
|
AssertOwnerThread();
|
|
SAMPLE_LOG("OnAduioNotDecoded (aReason=%u)", aReason);
|
|
|
|
if (aReason == MediaDecoderReader::DECODE_ERROR) {
|
|
// If this is a decode error, delegate to the generic error path.
|
|
RejectIfExist(__func__);
|
|
return;
|
|
}
|
|
|
|
// If the decoder is waiting for data, we tell it to call us back when the
|
|
// data arrives.
|
|
if (aReason == MediaDecoderReader::WAITING_FOR_DATA) {
|
|
MOZ_ASSERT(mReader->IsWaitForDataSupported(),
|
|
"Readers that send WAITING_FOR_DATA need to implement WaitForData");
|
|
RefPtr<SeekTask> self = this;
|
|
mAudioWaitRequest.Begin(mReader->WaitForData(MediaData::AUDIO_DATA)
|
|
->Then(OwnerThread(), __func__,
|
|
[self] (MediaData::Type aType) -> void {
|
|
self->mAudioWaitRequest.Complete();
|
|
self->EnsureAudioDecodeTaskQueued();
|
|
},
|
|
[self] (WaitForDataRejectValue aRejection) -> void {
|
|
self->mAudioWaitRequest.Complete();
|
|
}));
|
|
|
|
// We are out of data to decode and will enter buffering mode soon.
|
|
// We want to play the frames we have already decoded, so we stop pre-rolling
|
|
// and ensure that loadeddata is fired as required.
|
|
mNeedToStopPrerollingAudio = true;
|
|
return;
|
|
}
|
|
|
|
if (aReason == MediaDecoderReader::CANCELED) {
|
|
EnsureAudioDecodeTaskQueued();
|
|
return;
|
|
}
|
|
|
|
if (aReason == MediaDecoderReader::END_OF_STREAM) {
|
|
mIsAudioQueueFinished = true;
|
|
mDropAudioUntilNextDiscontinuity = false; // To make IsAudioSeekComplete() return TRUE.
|
|
CheckIfSeekComplete();
|
|
}
|
|
}
|
|
|
|
void
|
|
SeekTask::OnVideoDecoded(MediaData* aVideoSample)
|
|
{
|
|
AssertOwnerThread();
|
|
RefPtr<MediaData> video(aVideoSample);
|
|
MOZ_ASSERT(video);
|
|
|
|
// The MDSM::mDecodedVideoEndTime will be updated once the whole SeekTask is
|
|
// resolved.
|
|
|
|
SAMPLE_LOG("OnVideoDecoded [%lld,%lld] disc=%d",
|
|
(video ? video->mTime : -1),
|
|
(video ? video->GetEndTime() : -1),
|
|
(video ? video->mDiscontinuity : 0));
|
|
|
|
if (!Exists()) {
|
|
// We've received a sample from a previous decode. Discard it.
|
|
return;
|
|
}
|
|
|
|
if (mDropVideoUntilNextDiscontinuity) {
|
|
if (video->mDiscontinuity) {
|
|
mDropVideoUntilNextDiscontinuity = false;
|
|
}
|
|
}
|
|
|
|
if (!mDropVideoUntilNextDiscontinuity) {
|
|
// We must be after the discontinuity; we're receiving samples
|
|
// at or after the seek target.
|
|
if (mSeekJob.mTarget.IsFast() &&
|
|
mSeekJob.mTarget.GetTime().ToMicroseconds() > mCurrentTimeBeforeSeek &&
|
|
video->mTime < mCurrentTimeBeforeSeek) {
|
|
// We are doing a fastSeek, but we ended up *before* the previous
|
|
// playback position. This is surprising UX, so switch to an accurate
|
|
// seek and decode to the seek target. This is not conformant to the
|
|
// spec, fastSeek should always be fast, but until we get the time to
|
|
// change all Readers to seek to the keyframe after the currentTime
|
|
// in this case, we'll just decode forward. Bug 1026330.
|
|
mSeekJob.mTarget.SetType(SeekTarget::Accurate);
|
|
}
|
|
if (mSeekJob.mTarget.IsFast()) {
|
|
// Non-precise seek. We can stop the seek at the first sample.
|
|
mSeekedVideoData = video;
|
|
} else {
|
|
// We're doing an accurate seek. We still need to discard
|
|
// MediaData up to the one containing exact seek target.
|
|
if (NS_FAILED(DropVideoUpToSeekTarget(video.get()))) {
|
|
RejectIfExist(__func__);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
CheckIfSeekComplete();
|
|
}
|
|
|
|
void
|
|
SeekTask::OnVideoNotDecoded(MediaDecoderReader::NotDecodedReason aReason)
|
|
{
|
|
AssertOwnerThread();
|
|
SAMPLE_LOG("OnVideoNotDecoded (aReason=%u)", aReason);
|
|
|
|
if (aReason == MediaDecoderReader::DECODE_ERROR) {
|
|
// If this is a decode error, delegate to the generic error path.
|
|
RejectIfExist(__func__);
|
|
return;
|
|
}
|
|
|
|
// If the decoder is waiting for data, we tell it to call us back when the
|
|
// data arrives.
|
|
if (aReason == MediaDecoderReader::WAITING_FOR_DATA) {
|
|
MOZ_ASSERT(mReader->IsWaitForDataSupported(),
|
|
"Readers that send WAITING_FOR_DATA need to implement WaitForData");
|
|
RefPtr<SeekTask> self = this;
|
|
mVideoWaitRequest.Begin(mReader->WaitForData(MediaData::VIDEO_DATA)
|
|
->Then(OwnerThread(), __func__,
|
|
[self] (MediaData::Type aType) -> void {
|
|
self->mVideoWaitRequest.Complete();
|
|
self->EnsureVideoDecodeTaskQueued();
|
|
},
|
|
[self] (WaitForDataRejectValue aRejection) -> void {
|
|
self->mVideoWaitRequest.Complete();
|
|
}));
|
|
|
|
// We are out of data to decode and will enter buffering mode soon.
|
|
// We want to play the frames we have already decoded, so we stop pre-rolling
|
|
// and ensure that loadeddata is fired as required.
|
|
mNeedToStopPrerollingVideo = true;
|
|
return;
|
|
}
|
|
|
|
if (aReason == MediaDecoderReader::CANCELED) {
|
|
EnsureVideoDecodeTaskQueued();
|
|
return;
|
|
}
|
|
|
|
if (aReason == MediaDecoderReader::END_OF_STREAM) {
|
|
|
|
if (Exists() && mFirstVideoFrameAfterSeek) {
|
|
// Null sample. Hit end of stream. If we have decoded a frame,
|
|
// insert it into the queue so that we have something to display.
|
|
// We make sure to do this before invoking VideoQueue().Finish()
|
|
// below.
|
|
mSeekedVideoData = mFirstVideoFrameAfterSeek;
|
|
mFirstVideoFrameAfterSeek = nullptr;
|
|
}
|
|
|
|
mIsVideoQueueFinished = true;
|
|
mDropVideoUntilNextDiscontinuity = false; // To make IsVideoSeekComplete() return TRUE.
|
|
CheckIfSeekComplete();
|
|
}
|
|
}
|
|
|
|
void
|
|
SeekTask::SetMediaDecoderReaderWrapperCallback()
|
|
{
|
|
mAudioCallbackID =
|
|
mReader->SetAudioCallback(this, &SeekTask::OnAudioDecoded,
|
|
&SeekTask::OnAudioNotDecoded);
|
|
|
|
mVideoCallbackID =
|
|
mReader->SetVideoCallback(this, &SeekTask::OnVideoDecoded,
|
|
&SeekTask::OnVideoNotDecoded);
|
|
|
|
DECODER_LOG("SeekTask set audio callbacks: mAudioCallbackID = %d\n", (int)mAudioCallbackID);
|
|
DECODER_LOG("SeekTask set video callbacks: mVideoCallbackID = %d\n", (int)mAudioCallbackID);
|
|
}
|
|
|
|
void
|
|
SeekTask::CancelMediaDecoderReaderWrapperCallback()
|
|
{
|
|
DECODER_LOG("SeekTask cancel audio callbacks: mVideoCallbackID = %d\n", (int)mAudioCallbackID);
|
|
mReader->CancelAudioCallback(mAudioCallbackID);
|
|
|
|
DECODER_LOG("SeekTask cancel video callbacks: mVideoCallbackID = %d\n", (int)mVideoCallbackID);
|
|
mReader->CancelVideoCallback(mVideoCallbackID);
|
|
}
|
|
} // namespace mozilla
|