mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-31 14:15:30 +00:00
b12df215bb
Implement HTMLMediaElement.fastSeek(), basically by changing all the MediaDecoderReader::Seek() overrides to not call MediaDecoderReader::DecodeToTarget(), and have MediaDecoderReader::DecodeSeek() call DecodeToTarget() if we're doing an accurate (non-fast) seek. Update gizmo.mp4 to have a keyframe every second, instead of only 1 keyframe at the start of stream. This makes the unit test I added more useful for mp4... I pushed most of the seek target clamping logic in MediaDecoder up into HTMLMediaElement, so that we're clamping in fewer places. Note MediaDecoderStateMachine::Seek() still sanity checks the seek target. We have to update the currentTime/MediaDecoder playback position after a seek completes now, rather than assuming the seek always got it exactly right. Removed those pesky assertions about seek target lying in the first frame after seek, since actually sometimes the media doesn't have samples for all streams after a seek (either due to the media being encoded like that, or because of a bug in the platform's decoder, not entirely sure). Green: https://tbpl.mozilla.org/?tree=Try&rev=b028258565e2 * * * Bug 778077 - Fix up MediaOMXReader fastseek to ensure audio stream stays in sync with video stream. r=cajbir
175 lines
6.1 KiB
C++
175 lines
6.1 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/. */
|
|
|
|
#ifndef VideoUtils_h
|
|
#define VideoUtils_h
|
|
|
|
#include "mozilla/Attributes.h"
|
|
#include "mozilla/ReentrantMonitor.h"
|
|
#include "mozilla/CheckedInt.h"
|
|
|
|
#if !(defined(XP_WIN) || defined(XP_MACOSX) || defined(LINUX)) || \
|
|
defined(MOZ_ASAN)
|
|
// For MEDIA_THREAD_STACK_SIZE
|
|
#include "nsIThreadManager.h"
|
|
#endif
|
|
#include "nsThreadUtils.h"
|
|
#include "prtime.h"
|
|
#include "AudioSampleFormat.h"
|
|
|
|
using mozilla::CheckedInt64;
|
|
using mozilla::CheckedUint64;
|
|
using mozilla::CheckedInt32;
|
|
using mozilla::CheckedUint32;
|
|
|
|
struct nsIntSize;
|
|
struct nsIntRect;
|
|
|
|
// This file contains stuff we'd rather put elsewhere, but which is
|
|
// dependent on other changes which we don't want to wait for. We plan to
|
|
// remove this file in the near future.
|
|
|
|
|
|
// This belongs in xpcom/monitor/Monitor.h, once we've made
|
|
// mozilla::Monitor non-reentrant.
|
|
namespace mozilla {
|
|
|
|
/**
|
|
* ReentrantMonitorConditionallyEnter
|
|
*
|
|
* Enters the supplied monitor only if the conditional value |aEnter| is true.
|
|
* E.g. Used to allow unmonitored read access on the decode thread,
|
|
* and monitored access on all other threads.
|
|
*/
|
|
class MOZ_STACK_CLASS ReentrantMonitorConditionallyEnter
|
|
{
|
|
public:
|
|
ReentrantMonitorConditionallyEnter(bool aEnter,
|
|
ReentrantMonitor &aReentrantMonitor) :
|
|
mReentrantMonitor(nullptr)
|
|
{
|
|
MOZ_COUNT_CTOR(ReentrantMonitorConditionallyEnter);
|
|
if (aEnter) {
|
|
mReentrantMonitor = &aReentrantMonitor;
|
|
NS_ASSERTION(mReentrantMonitor, "null monitor");
|
|
mReentrantMonitor->Enter();
|
|
}
|
|
}
|
|
~ReentrantMonitorConditionallyEnter(void)
|
|
{
|
|
if (mReentrantMonitor) {
|
|
mReentrantMonitor->Exit();
|
|
}
|
|
MOZ_COUNT_DTOR(ReentrantMonitorConditionallyEnter);
|
|
}
|
|
private:
|
|
// Restrict to constructor and destructor defined above.
|
|
ReentrantMonitorConditionallyEnter();
|
|
ReentrantMonitorConditionallyEnter(const ReentrantMonitorConditionallyEnter&);
|
|
ReentrantMonitorConditionallyEnter& operator =(const ReentrantMonitorConditionallyEnter&);
|
|
static void* operator new(size_t) CPP_THROW_NEW;
|
|
static void operator delete(void*);
|
|
|
|
ReentrantMonitor* mReentrantMonitor;
|
|
};
|
|
|
|
// Shuts down a thread asynchronously.
|
|
class ShutdownThreadEvent : public nsRunnable
|
|
{
|
|
public:
|
|
ShutdownThreadEvent(nsIThread* aThread) : mThread(aThread) {}
|
|
~ShutdownThreadEvent() {}
|
|
NS_IMETHOD Run() MOZ_OVERRIDE {
|
|
mThread->Shutdown();
|
|
mThread = nullptr;
|
|
return NS_OK;
|
|
}
|
|
private:
|
|
nsCOMPtr<nsIThread> mThread;
|
|
};
|
|
|
|
class MediaResource;
|
|
|
|
namespace dom {
|
|
class TimeRanges;
|
|
}
|
|
|
|
// Estimates the buffered ranges of a MediaResource using a simple
|
|
// (byteOffset/length)*duration method. Probably inaccurate, but won't
|
|
// do file I/O, and can be used when we don't have detailed knowledge
|
|
// of the byte->time mapping of a resource. aDurationUsecs is the duration
|
|
// of the media in microseconds. Estimated buffered ranges are stored in
|
|
// aOutBuffered. Ranges are 0-normalized, i.e. in the range of (0,duration].
|
|
void GetEstimatedBufferedTimeRanges(mozilla::MediaResource* aStream,
|
|
int64_t aDurationUsecs,
|
|
mozilla::dom::TimeRanges* aOutBuffered);
|
|
|
|
// Converts from number of audio frames (aFrames) to microseconds, given
|
|
// the specified audio rate (aRate). Stores result in aOutUsecs. Returns true
|
|
// if the operation succeeded, or false if there was an integer overflow
|
|
// while calulating the conversion.
|
|
CheckedInt64 FramesToUsecs(int64_t aFrames, uint32_t aRate);
|
|
|
|
// Converts from microseconds (aUsecs) to number of audio frames, given the
|
|
// specified audio rate (aRate). Stores the result in aOutFrames. Returns
|
|
// true if the operation succeeded, or false if there was an integer
|
|
// overflow while calulating the conversion.
|
|
CheckedInt64 UsecsToFrames(int64_t aUsecs, uint32_t aRate);
|
|
|
|
// Number of microseconds per second. 1e6.
|
|
static const int64_t USECS_PER_S = 1000000;
|
|
|
|
// Number of microseconds per millisecond.
|
|
static const int64_t USECS_PER_MS = 1000;
|
|
|
|
// Converts seconds to milliseconds.
|
|
#define MS_TO_SECONDS(s) ((double)(s) / (PR_MSEC_PER_SEC))
|
|
|
|
// Converts from seconds to microseconds. Returns failure if the resulting
|
|
// integer is too big to fit in an int64_t.
|
|
nsresult SecondsToUsecs(double aSeconds, int64_t& aOutUsecs);
|
|
|
|
// The maximum height and width of the video. Used for
|
|
// sanitizing the memory allocation of the RGB buffer.
|
|
// The maximum resolution we anticipate encountering in the
|
|
// wild is 2160p - 3840x2160 pixels.
|
|
static const int32_t MAX_VIDEO_WIDTH = 4000;
|
|
static const int32_t MAX_VIDEO_HEIGHT = 3000;
|
|
|
|
// Scales the display rect aDisplay by aspect ratio aAspectRatio.
|
|
// Note that aDisplay must be validated by IsValidVideoRegion()
|
|
// before being used!
|
|
void ScaleDisplayByAspectRatio(nsIntSize& aDisplay, float aAspectRatio);
|
|
|
|
// The amount of virtual memory reserved for thread stacks.
|
|
#if (defined(XP_WIN) || defined(XP_MACOSX) || defined(LINUX)) && \
|
|
!defined(MOZ_ASAN)
|
|
#define MEDIA_THREAD_STACK_SIZE (128 * 1024)
|
|
#else
|
|
// All other platforms use their system defaults.
|
|
#define MEDIA_THREAD_STACK_SIZE nsIThreadManager::DEFAULT_STACK_SIZE
|
|
#endif
|
|
|
|
// Downmix multichannel Audio samples to Stereo.
|
|
// Input are the buffer contains multichannel data,
|
|
// the number of channels and the number of frames.
|
|
int DownmixAudioToStereo(mozilla::AudioDataValue* buffer,
|
|
int channels,
|
|
uint32_t frames);
|
|
|
|
bool IsVideoContentType(const nsCString& aContentType);
|
|
|
|
// Returns true if it's safe to use aPicture as the picture to be
|
|
// extracted inside a frame of size aFrame, and scaled up to and displayed
|
|
// at a size of aDisplay. You should validate the frame, picture, and
|
|
// display regions before using them to display video frames.
|
|
bool IsValidVideoRegion(const nsIntSize& aFrame, const nsIntRect& aPicture,
|
|
const nsIntSize& aDisplay);
|
|
|
|
} // end namespace mozilla
|
|
|
|
#endif
|