mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +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)
622 lines
19 KiB
C++
622 lines
19 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 "MediaOmxReader.h"
|
|
|
|
#include "MediaDecoderStateMachine.h"
|
|
#include "mozilla/TimeStamp.h"
|
|
#include "MediaResource.h"
|
|
#include "VideoUtils.h"
|
|
#include "MediaOmxDecoder.h"
|
|
#include "AbstractMediaDecoder.h"
|
|
#include "AudioChannelService.h"
|
|
#include "OmxDecoder.h"
|
|
#include "MPAPI.h"
|
|
#include "gfx2DGlue.h"
|
|
#include "MediaStreamSource.h"
|
|
|
|
#define MAX_DROPPED_FRAMES 25
|
|
// Try not to spend more than this much time in a single call to DecodeVideoFrame.
|
|
#define MAX_VIDEO_DECODE_SECONDS 0.1
|
|
|
|
using namespace mozilla::gfx;
|
|
using namespace mozilla::media;
|
|
using namespace android;
|
|
|
|
namespace mozilla {
|
|
|
|
extern LazyLogModule gMediaDecoderLog;
|
|
#define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
|
|
|
|
class MediaOmxReader::ProcessCachedDataTask : public Runnable
|
|
{
|
|
public:
|
|
ProcessCachedDataTask(MediaOmxReader* aOmxReader, int64_t aOffset)
|
|
: mOmxReader(aOmxReader),
|
|
mOffset(aOffset)
|
|
{ }
|
|
|
|
NS_IMETHOD Run() override
|
|
{
|
|
MOZ_ASSERT(!NS_IsMainThread());
|
|
MOZ_ASSERT(mOmxReader.get());
|
|
mOmxReader->ProcessCachedData(mOffset);
|
|
return NS_OK;
|
|
}
|
|
|
|
private:
|
|
RefPtr<MediaOmxReader> mOmxReader;
|
|
int64_t mOffset;
|
|
};
|
|
|
|
// When loading an MP3 stream from a file, we need to parse the file's
|
|
// content to find its duration. Reading files of 100 MiB or more can
|
|
// delay the player app noticably, so the file is read and decoded in
|
|
// smaller chunks.
|
|
//
|
|
// We first read on the decode thread, but parsing must be done on the
|
|
// main thread. After we read the file's initial MiBs in the decode
|
|
// thread, an instance of this class is scheduled to the main thread for
|
|
// parsing the MP3 stream. The decode thread waits until it has finished.
|
|
//
|
|
// If there is more data available from the file, the runnable dispatches
|
|
// a task to the IO thread for retrieving the next chunk of data, and
|
|
// the IO task dispatches a runnable to the main thread for parsing the
|
|
// data. This goes on until all of the MP3 file has been parsed.
|
|
|
|
class MediaOmxReader::NotifyDataArrivedRunnable : public Runnable
|
|
{
|
|
public:
|
|
NotifyDataArrivedRunnable(MediaOmxReader* aOmxReader,
|
|
uint64_t aLength,
|
|
int64_t aOffset, uint64_t aFullLength)
|
|
: mOmxReader(aOmxReader),
|
|
mLength(aLength),
|
|
mOffset(aOffset),
|
|
mFullLength(aFullLength)
|
|
{
|
|
MOZ_ASSERT(mOmxReader.get());
|
|
}
|
|
|
|
NS_IMETHOD Run()
|
|
{
|
|
MOZ_ASSERT(mOmxReader->OnTaskQueue());
|
|
NotifyDataArrived();
|
|
return NS_OK;
|
|
}
|
|
|
|
private:
|
|
void NotifyDataArrived()
|
|
{
|
|
if (mOmxReader->IsShutdown()) {
|
|
return;
|
|
}
|
|
|
|
while (mLength) {
|
|
uint32_t length = std::min<uint64_t>(mLength, UINT32_MAX);
|
|
mOmxReader->NotifyDataArrived();
|
|
mLength -= length;
|
|
mOffset += length;
|
|
}
|
|
|
|
if (static_cast<uint64_t>(mOffset) < mFullLength) {
|
|
// We cannot read data in the main thread because it
|
|
// might block for too long. Instead we post an IO task
|
|
// to the IO thread if there is more data available.
|
|
RefPtr<Runnable> task = new ProcessCachedDataTask(mOmxReader.get(), mOffset);
|
|
XRE_GetIOMessageLoop()->PostTask(task.forget());
|
|
}
|
|
}
|
|
|
|
RefPtr<MediaOmxReader> mOmxReader;
|
|
uint64_t mLength;
|
|
int64_t mOffset;
|
|
uint64_t mFullLength;
|
|
};
|
|
|
|
MediaOmxReader::MediaOmxReader(AbstractMediaDecoder *aDecoder)
|
|
: MediaOmxCommonReader(aDecoder)
|
|
, mShutdownMutex("MediaOmxReader.Shutdown")
|
|
, mHasVideo(false)
|
|
, mHasAudio(false)
|
|
, mVideoSeekTimeUs(-1)
|
|
, mAudioSeekTimeUs(-1)
|
|
, mLastParserDuration(-1)
|
|
, mSkipCount(0)
|
|
, mIsShutdown(false)
|
|
, mMP3FrameParser(-1)
|
|
{
|
|
mAudioChannel = dom::AudioChannelService::GetDefaultAudioChannel();
|
|
}
|
|
|
|
MediaOmxReader::~MediaOmxReader()
|
|
{
|
|
}
|
|
|
|
already_AddRefed<AbstractMediaDecoder>
|
|
MediaOmxReader::SafeGetDecoder() {
|
|
RefPtr<AbstractMediaDecoder> decoder;
|
|
MutexAutoLock lock(mShutdownMutex);
|
|
if (!mIsShutdown) {
|
|
decoder = mDecoder;
|
|
}
|
|
return decoder.forget();
|
|
}
|
|
|
|
void MediaOmxReader::ReleaseDecoder()
|
|
{
|
|
if (mOmxDecoder.get()) {
|
|
mOmxDecoder->ReleaseDecoder();
|
|
}
|
|
mOmxDecoder.clear();
|
|
}
|
|
|
|
RefPtr<ShutdownPromise>
|
|
MediaOmxReader::Shutdown()
|
|
{
|
|
{
|
|
MutexAutoLock lock(mShutdownMutex);
|
|
mIsShutdown = true;
|
|
}
|
|
|
|
RefPtr<ShutdownPromise> p = MediaDecoderReader::Shutdown();
|
|
|
|
// Wait for the superclass to finish tearing things down before releasing
|
|
// the decoder on the main thread.
|
|
p->Then(AbstractThread::MainThread(), __func__, this, &MediaOmxReader::ReleaseDecoder, &MediaOmxReader::ReleaseDecoder);
|
|
|
|
return p;
|
|
}
|
|
|
|
void MediaOmxReader::ReleaseMediaResources()
|
|
{
|
|
mMediaResourceRequest.DisconnectIfExists();
|
|
mMetadataPromise.RejectIfExists(ReadMetadataFailureReason::METADATA_ERROR, __func__);
|
|
|
|
ResetDecode(AUDIO_VIDEO);
|
|
// Before freeing a video codec, all video buffers needed to be released
|
|
// even from graphics pipeline.
|
|
VideoFrameContainer* container = mDecoder->GetVideoFrameContainer();
|
|
if (container) {
|
|
container->ClearCurrentFrame();
|
|
}
|
|
if (mOmxDecoder.get()) {
|
|
mOmxDecoder->ReleaseMediaResources();
|
|
}
|
|
}
|
|
|
|
nsresult MediaOmxReader::InitOmxDecoder()
|
|
{
|
|
if (!mOmxDecoder.get()) {
|
|
//register sniffers, if they are not registered in this process.
|
|
DataSource::RegisterDefaultSniffers();
|
|
|
|
sp<DataSource> dataSource = new MediaStreamSource(mDecoder->GetResource());
|
|
dataSource->initCheck();
|
|
|
|
mExtractor = MediaExtractor::Create(dataSource);
|
|
if (!mExtractor.get()) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
mOmxDecoder = new OmxDecoder(mDecoder, OwnerThread());
|
|
if (!mOmxDecoder->Init(mExtractor)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
mStreamSource = static_cast<MediaStreamSource*>(dataSource.get());
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
RefPtr<MediaDecoderReader::MetadataPromise>
|
|
MediaOmxReader::AsyncReadMetadata()
|
|
{
|
|
MOZ_ASSERT(OnTaskQueue());
|
|
EnsureActive();
|
|
|
|
// Initialize the internal OMX Decoder.
|
|
nsresult rv = InitOmxDecoder();
|
|
if (NS_FAILED(rv)) {
|
|
return MediaDecoderReader::MetadataPromise::CreateAndReject(
|
|
ReadMetadataFailureReason::METADATA_ERROR, __func__);
|
|
}
|
|
|
|
bool isMP3 = mDecoder->GetResource()->GetContentType().EqualsASCII(AUDIO_MP3);
|
|
if (isMP3) {
|
|
// When read sdcard's file on b2g platform at constructor,
|
|
// the mDecoder->GetResource()->GetLength() would return -1.
|
|
// Delay set the total duration on this function.
|
|
mMP3FrameParser.SetLength(mDecoder->GetResource()->GetLength());
|
|
ProcessCachedData(0);
|
|
}
|
|
|
|
RefPtr<MediaDecoderReader::MetadataPromise> p = mMetadataPromise.Ensure(__func__);
|
|
|
|
RefPtr<MediaOmxReader> self = this;
|
|
mMediaResourceRequest.Begin(mOmxDecoder->AllocateMediaResources()
|
|
->Then(OwnerThread(), __func__,
|
|
[self] (bool) -> void {
|
|
self->mMediaResourceRequest.Complete();
|
|
self->HandleResourceAllocated();
|
|
}, [self] (bool) -> void {
|
|
self->mMediaResourceRequest.Complete();
|
|
self->mMetadataPromise.Reject(ReadMetadataFailureReason::METADATA_ERROR, __func__);
|
|
}));
|
|
|
|
return p;
|
|
}
|
|
|
|
void MediaOmxReader::HandleResourceAllocated()
|
|
{
|
|
EnsureActive();
|
|
|
|
// After resources are available, set the metadata.
|
|
if (!mOmxDecoder->EnsureMetadata()) {
|
|
mMetadataPromise.Reject(ReadMetadataFailureReason::METADATA_ERROR, __func__);
|
|
return;
|
|
}
|
|
|
|
bool isMP3 = mDecoder->GetResource()->GetContentType().EqualsASCII(AUDIO_MP3);
|
|
if (isMP3 && mMP3FrameParser.IsMP3()) {
|
|
// Check if the MP3 frame parser found a duration.
|
|
mLastParserDuration = mMP3FrameParser.GetDuration();
|
|
}
|
|
|
|
if (mLastParserDuration >= 0) {
|
|
// Prefer the parser duration if we have it.
|
|
mInfo.mMetadataDuration = Some(TimeUnit::FromMicroseconds(mLastParserDuration));
|
|
} else {
|
|
// MP3 parser failed to find a duration.
|
|
// Set the total duration (the max of the audio and video track).
|
|
int64_t durationUs;
|
|
mOmxDecoder->GetDuration(&durationUs);
|
|
if (durationUs) {
|
|
mInfo.mMetadataDuration = Some(TimeUnit::FromMicroseconds(durationUs));
|
|
}
|
|
}
|
|
|
|
if (mOmxDecoder->HasVideo()) {
|
|
int32_t displayWidth, displayHeight, width, height;
|
|
mOmxDecoder->GetVideoParameters(&displayWidth, &displayHeight,
|
|
&width, &height);
|
|
nsIntRect pictureRect(0, 0, width, height);
|
|
|
|
// Validate the container-reported frame and pictureRect sizes. This ensures
|
|
// that our video frame creation code doesn't overflow.
|
|
nsIntSize displaySize(displayWidth, displayHeight);
|
|
nsIntSize frameSize(width, height);
|
|
if (!IsValidVideoRegion(frameSize, pictureRect, displaySize)) {
|
|
mMetadataPromise.Reject(ReadMetadataFailureReason::METADATA_ERROR, __func__);
|
|
return;
|
|
}
|
|
|
|
// Video track's frame sizes will not overflow. Activate the video track.
|
|
mHasVideo = true;
|
|
mInfo.mVideo.mDisplay = displaySize;
|
|
mPicture = pictureRect;
|
|
mInitialFrame = frameSize;
|
|
VideoFrameContainer* container = mDecoder->GetVideoFrameContainer();
|
|
if (container) {
|
|
container->ClearCurrentFrame(IntSize(displaySize.width, displaySize.height));
|
|
}
|
|
}
|
|
|
|
if (mOmxDecoder->HasAudio()) {
|
|
int32_t numChannels, sampleRate;
|
|
mOmxDecoder->GetAudioParameters(&numChannels, &sampleRate);
|
|
mHasAudio = true;
|
|
mInfo.mAudio.mChannels = numChannels;
|
|
mInfo.mAudio.mRate = sampleRate;
|
|
}
|
|
|
|
mInfo.mMediaSeekable = mExtractor->flags() & MediaExtractor::CAN_SEEK;
|
|
|
|
RefPtr<MetadataHolder> metadata = new MetadataHolder();
|
|
metadata->mInfo = mInfo;
|
|
metadata->mTags = nullptr;
|
|
|
|
#ifdef MOZ_AUDIO_OFFLOAD
|
|
CheckAudioOffload();
|
|
#endif
|
|
|
|
mMetadataPromise.Resolve(metadata, __func__);
|
|
}
|
|
|
|
bool MediaOmxReader::DecodeVideoFrame(bool &aKeyframeSkip,
|
|
int64_t aTimeThreshold)
|
|
{
|
|
MOZ_ASSERT(OnTaskQueue());
|
|
EnsureActive();
|
|
|
|
// Record number of frames decoded and parsed. Automatically update the
|
|
// stats counters using the AutoNotifyDecoded stack-based class.
|
|
AbstractMediaDecoder::AutoNotifyDecoded a(mDecoder);
|
|
|
|
bool doSeek = mVideoSeekTimeUs != -1;
|
|
if (doSeek) {
|
|
aTimeThreshold = mVideoSeekTimeUs;
|
|
}
|
|
|
|
TimeStamp start = TimeStamp::Now();
|
|
|
|
// Read next frame. Don't let this loop run for too long.
|
|
while ((TimeStamp::Now() - start) < TimeDuration::FromSeconds(MAX_VIDEO_DECODE_SECONDS)) {
|
|
MPAPI::VideoFrame frame;
|
|
frame.mGraphicBuffer = nullptr;
|
|
frame.mShouldSkip = false;
|
|
if (!mOmxDecoder->ReadVideo(&frame, aTimeThreshold, aKeyframeSkip, doSeek)) {
|
|
return false;
|
|
}
|
|
doSeek = false;
|
|
mVideoSeekTimeUs = -1;
|
|
|
|
// Ignore empty buffer which stagefright media read will sporadically return
|
|
if (frame.mSize == 0 && !frame.mGraphicBuffer) {
|
|
continue;
|
|
}
|
|
|
|
a.mParsed++;
|
|
if (frame.mShouldSkip && mSkipCount < MAX_DROPPED_FRAMES) {
|
|
mSkipCount++;
|
|
continue;
|
|
}
|
|
|
|
mSkipCount = 0;
|
|
|
|
aKeyframeSkip = false;
|
|
|
|
IntRect picture = mPicture;
|
|
if (frame.Y.mWidth != mInitialFrame.width ||
|
|
frame.Y.mHeight != mInitialFrame.height) {
|
|
|
|
// Frame size is different from what the container reports. This is legal,
|
|
// and we will preserve the ratio of the crop rectangle as it
|
|
// was reported relative to the picture size reported by the container.
|
|
picture.x = (mPicture.x * frame.Y.mWidth) / mInitialFrame.width;
|
|
picture.y = (mPicture.y * frame.Y.mHeight) / mInitialFrame.height;
|
|
picture.width = (frame.Y.mWidth * mPicture.width) / mInitialFrame.width;
|
|
picture.height = (frame.Y.mHeight * mPicture.height) / mInitialFrame.height;
|
|
}
|
|
|
|
// This is the approximate byte position in the stream.
|
|
int64_t pos = mStreamSource ? mStreamSource->Tell() : 0;
|
|
|
|
RefPtr<VideoData> v;
|
|
if (!frame.mGraphicBuffer) {
|
|
|
|
VideoData::YCbCrBuffer b;
|
|
b.mPlanes[0].mData = static_cast<uint8_t *>(frame.Y.mData);
|
|
b.mPlanes[0].mStride = frame.Y.mStride;
|
|
b.mPlanes[0].mHeight = frame.Y.mHeight;
|
|
b.mPlanes[0].mWidth = frame.Y.mWidth;
|
|
b.mPlanes[0].mOffset = frame.Y.mOffset;
|
|
b.mPlanes[0].mSkip = frame.Y.mSkip;
|
|
|
|
b.mPlanes[1].mData = static_cast<uint8_t *>(frame.Cb.mData);
|
|
b.mPlanes[1].mStride = frame.Cb.mStride;
|
|
b.mPlanes[1].mHeight = frame.Cb.mHeight;
|
|
b.mPlanes[1].mWidth = frame.Cb.mWidth;
|
|
b.mPlanes[1].mOffset = frame.Cb.mOffset;
|
|
b.mPlanes[1].mSkip = frame.Cb.mSkip;
|
|
|
|
b.mPlanes[2].mData = static_cast<uint8_t *>(frame.Cr.mData);
|
|
b.mPlanes[2].mStride = frame.Cr.mStride;
|
|
b.mPlanes[2].mHeight = frame.Cr.mHeight;
|
|
b.mPlanes[2].mWidth = frame.Cr.mWidth;
|
|
b.mPlanes[2].mOffset = frame.Cr.mOffset;
|
|
b.mPlanes[2].mSkip = frame.Cr.mSkip;
|
|
|
|
v = VideoData::Create(mInfo.mVideo,
|
|
mDecoder->GetImageContainer(),
|
|
pos,
|
|
frame.mTimeUs,
|
|
1, // We don't know the duration.
|
|
b,
|
|
frame.mKeyFrame,
|
|
-1,
|
|
picture);
|
|
} else {
|
|
v = VideoData::Create(mInfo.mVideo,
|
|
mDecoder->GetImageContainer(),
|
|
pos,
|
|
frame.mTimeUs,
|
|
1, // We don't know the duration.
|
|
frame.mGraphicBuffer,
|
|
frame.mKeyFrame,
|
|
-1,
|
|
picture);
|
|
}
|
|
|
|
if (!v) {
|
|
NS_WARNING("Unable to create VideoData");
|
|
return false;
|
|
}
|
|
|
|
a.mDecoded++;
|
|
NS_ASSERTION(a.mDecoded <= a.mParsed, "Expect to decode fewer frames than parsed in OMX decoder...");
|
|
|
|
mVideoQueue.Push(v);
|
|
|
|
break;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void MediaOmxReader::NotifyDataArrivedInternal()
|
|
{
|
|
MOZ_ASSERT(OnTaskQueue());
|
|
RefPtr<AbstractMediaDecoder> decoder = SafeGetDecoder();
|
|
if (!decoder) { // reader has shut down
|
|
return;
|
|
}
|
|
if (HasVideo()) {
|
|
return;
|
|
}
|
|
if (!mMP3FrameParser.NeedsData()) {
|
|
return;
|
|
}
|
|
|
|
AutoPinned<MediaResource> resource(mDecoder->GetResource());
|
|
MediaByteRangeSet byteRanges;
|
|
nsresult rv = resource->GetCachedRanges(byteRanges);
|
|
|
|
if (NS_FAILED(rv)) {
|
|
return;
|
|
}
|
|
|
|
if (byteRanges == mLastCachedRanges) {
|
|
return;
|
|
}
|
|
MediaByteRangeSet intervals = byteRanges - mLastCachedRanges;
|
|
mLastCachedRanges = byteRanges;
|
|
|
|
for (const auto& interval : intervals) {
|
|
RefPtr<MediaByteBuffer> bytes =
|
|
resource->MediaReadAt(interval.mStart, interval.Length());
|
|
NS_ENSURE_TRUE_VOID(bytes);
|
|
mMP3FrameParser.Parse(bytes->Elements(), interval.Length(), interval.mStart);
|
|
if (!mMP3FrameParser.IsMP3()) {
|
|
return;
|
|
}
|
|
}
|
|
int64_t duration = mMP3FrameParser.GetDuration();
|
|
if (duration != mLastParserDuration) {
|
|
mLastParserDuration = duration;
|
|
decoder->DispatchUpdateEstimatedMediaDuration(mLastParserDuration);
|
|
}
|
|
}
|
|
|
|
bool MediaOmxReader::DecodeAudioData()
|
|
{
|
|
MOZ_ASSERT(OnTaskQueue());
|
|
EnsureActive();
|
|
|
|
// This is the approximate byte position in the stream.
|
|
int64_t pos = mStreamSource ? mStreamSource->Tell() : 0;
|
|
|
|
// Read next frame
|
|
MPAPI::AudioFrame source;
|
|
if (!mOmxDecoder->ReadAudio(&source, mAudioSeekTimeUs)) {
|
|
return false;
|
|
}
|
|
mAudioSeekTimeUs = -1;
|
|
|
|
// Ignore empty buffer which stagefright media read will sporadically return
|
|
if (source.mSize == 0) {
|
|
return true;
|
|
}
|
|
|
|
uint32_t frames = source.mSize / (source.mAudioChannels *
|
|
sizeof(AudioDataValue));
|
|
|
|
typedef AudioCompactor::NativeCopy OmxCopy;
|
|
return mAudioCompactor.Push(pos,
|
|
source.mTimeUs,
|
|
source.mAudioSampleRate,
|
|
frames,
|
|
source.mAudioChannels,
|
|
OmxCopy(static_cast<uint8_t *>(source.mData),
|
|
source.mSize,
|
|
source.mAudioChannels));
|
|
}
|
|
|
|
RefPtr<MediaDecoderReader::SeekPromise>
|
|
MediaOmxReader::Seek(SeekTarget aTarget, int64_t aEndTime)
|
|
{
|
|
MOZ_ASSERT(OnTaskQueue());
|
|
EnsureActive();
|
|
RefPtr<SeekPromise> p = mSeekPromise.Ensure(__func__);
|
|
|
|
if (mHasAudio && mHasVideo) {
|
|
// The OMXDecoder seeks/demuxes audio and video streams separately. So if
|
|
// we seek both audio and video to aTarget, the audio stream can typically
|
|
// seek closer to the seek target, since typically every audio block is
|
|
// a sync point, whereas for video there are only keyframes once every few
|
|
// seconds. So if we have both audio and video, we must seek the video
|
|
// stream to the preceeding keyframe first, get the stream time, and then
|
|
// seek the audio stream to match the video stream's time. Otherwise, the
|
|
// audio and video streams won't be in sync after the seek.
|
|
mVideoSeekTimeUs = aTarget.GetTime().ToMicroseconds();
|
|
|
|
RefPtr<MediaOmxReader> self = this;
|
|
mSeekRequest.Begin(DecodeToFirstVideoData()->Then(OwnerThread(), __func__, [self] (MediaData* v) {
|
|
self->mSeekRequest.Complete();
|
|
self->mAudioSeekTimeUs = v->mTime;
|
|
self->mSeekPromise.Resolve(media::TimeUnit::FromMicroseconds(self->mAudioSeekTimeUs), __func__);
|
|
}, [self, aTarget] () {
|
|
self->mSeekRequest.Complete();
|
|
self->mAudioSeekTimeUs = aTarget.GetTime().ToMicroseconds();
|
|
self->mSeekPromise.Resolve(aTarget.GetTime(), __func__);
|
|
}));
|
|
} else {
|
|
mAudioSeekTimeUs = mVideoSeekTimeUs = aTarget.GetTime().ToMicroseconds();
|
|
mSeekPromise.Resolve(aTarget.GetTime(), __func__);
|
|
}
|
|
|
|
return p;
|
|
}
|
|
|
|
void MediaOmxReader::SetIdle() {
|
|
if (!mOmxDecoder.get()) {
|
|
return;
|
|
}
|
|
mOmxDecoder->Pause();
|
|
}
|
|
|
|
void MediaOmxReader::EnsureActive() {
|
|
if (!mOmxDecoder.get()) {
|
|
return;
|
|
}
|
|
DebugOnly<nsresult> result = mOmxDecoder->Play();
|
|
NS_ASSERTION(result == NS_OK, "OmxDecoder should be in play state to continue decoding");
|
|
}
|
|
|
|
int64_t MediaOmxReader::ProcessCachedData(int64_t aOffset)
|
|
{
|
|
// Could run on decoder thread or IO thread.
|
|
RefPtr<AbstractMediaDecoder> decoder = SafeGetDecoder();
|
|
if (!decoder) { // reader has shut down
|
|
return -1;
|
|
}
|
|
// We read data in chunks of 32 KiB. We can reduce this
|
|
// value if media, such as sdcards, is too slow.
|
|
// Because of SD card's slowness, need to keep sReadSize to small size.
|
|
// See Bug 914870.
|
|
static const int64_t sReadSize = 32 * 1024;
|
|
|
|
NS_ASSERTION(!NS_IsMainThread(), "Should not be on main thread.");
|
|
|
|
MOZ_ASSERT(decoder->GetResource());
|
|
int64_t resourceLength = decoder->GetResource()->GetCachedDataEnd(0);
|
|
NS_ENSURE_TRUE(resourceLength >= 0, -1);
|
|
|
|
if (aOffset >= resourceLength) {
|
|
return 0; // Cache is empty, nothing to do
|
|
}
|
|
|
|
int64_t bufferLength = std::min<int64_t>(resourceLength-aOffset, sReadSize);
|
|
RefPtr<NotifyDataArrivedRunnable> runnable(
|
|
new NotifyDataArrivedRunnable(this, bufferLength, aOffset, resourceLength));
|
|
|
|
if (OnTaskQueue()) {
|
|
runnable->Run();
|
|
} else {
|
|
OwnerThread()->Dispatch(runnable.forget());
|
|
}
|
|
|
|
return resourceLength - aOffset - bufferLength;
|
|
}
|
|
|
|
android::sp<android::MediaSource> MediaOmxReader::GetAudioOffloadTrack()
|
|
{
|
|
if (!mOmxDecoder.get()) {
|
|
return nullptr;
|
|
}
|
|
return mOmxDecoder->GetAudioOffloadTrack();
|
|
}
|
|
|
|
} // namespace mozilla
|