mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:11:03 +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)
343 lines
11 KiB
C++
343 lines
11 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 <CoreFoundation/CFString.h>
|
|
|
|
#include "AppleCMLinker.h"
|
|
#include "AppleDecoderModule.h"
|
|
#include "AppleUtils.h"
|
|
#include "AppleVTDecoder.h"
|
|
#include "AppleVTLinker.h"
|
|
#include "mp4_demuxer/H264.h"
|
|
#include "MediaData.h"
|
|
#include "mozilla/ArrayUtils.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "mozilla/Logging.h"
|
|
#include "VideoUtils.h"
|
|
#include "gfxPlatform.h"
|
|
|
|
#define LOG(...) MOZ_LOG(sPDMLog, mozilla::LogLevel::Debug, (__VA_ARGS__))
|
|
|
|
namespace mozilla {
|
|
|
|
AppleVTDecoder::AppleVTDecoder(const VideoInfo& aConfig,
|
|
TaskQueue* aTaskQueue,
|
|
MediaDataDecoderCallback* aCallback,
|
|
layers::ImageContainer* aImageContainer)
|
|
: AppleVDADecoder(aConfig, aTaskQueue, aCallback, aImageContainer)
|
|
, mFormat(nullptr)
|
|
, mSession(nullptr)
|
|
, mIsHardwareAccelerated(false)
|
|
{
|
|
MOZ_COUNT_CTOR(AppleVTDecoder);
|
|
// TODO: Verify aConfig.mime_type.
|
|
LOG("Creating AppleVTDecoder for %dx%d h.264 video",
|
|
mDisplayWidth,
|
|
mDisplayHeight
|
|
);
|
|
}
|
|
|
|
AppleVTDecoder::~AppleVTDecoder()
|
|
{
|
|
MOZ_COUNT_DTOR(AppleVTDecoder);
|
|
}
|
|
|
|
RefPtr<MediaDataDecoder::InitPromise>
|
|
AppleVTDecoder::Init()
|
|
{
|
|
nsresult rv = InitializeSession();
|
|
|
|
if (NS_SUCCEEDED(rv)) {
|
|
return InitPromise::CreateAndResolve(TrackType::kVideoTrack, __func__);
|
|
}
|
|
|
|
return InitPromise::CreateAndReject(DecoderFailureReason::INIT_ERROR, __func__);
|
|
}
|
|
|
|
void
|
|
AppleVTDecoder::ProcessShutdown()
|
|
{
|
|
if (mSession) {
|
|
LOG("%s: cleaning up session %p", __func__, mSession);
|
|
VTDecompressionSessionInvalidate(mSession);
|
|
CFRelease(mSession);
|
|
mSession = nullptr;
|
|
}
|
|
if (mFormat) {
|
|
LOG("%s: releasing format %p", __func__, mFormat);
|
|
CFRelease(mFormat);
|
|
mFormat = nullptr;
|
|
}
|
|
}
|
|
|
|
void
|
|
AppleVTDecoder::ProcessFlush()
|
|
{
|
|
AssertOnTaskQueueThread();
|
|
nsresult rv = WaitForAsynchronousFrames();
|
|
if (NS_FAILED(rv)) {
|
|
LOG("AppleVTDecoder::Flush failed waiting for platform decoder "
|
|
"with error:%d.", rv);
|
|
}
|
|
ClearReorderedFrames();
|
|
}
|
|
|
|
void
|
|
AppleVTDecoder::ProcessDrain()
|
|
{
|
|
AssertOnTaskQueueThread();
|
|
nsresult rv = WaitForAsynchronousFrames();
|
|
if (NS_FAILED(rv)) {
|
|
LOG("AppleVTDecoder::Drain failed waiting for platform decoder "
|
|
"with error:%d.", rv);
|
|
}
|
|
DrainReorderedFrames();
|
|
mCallback->DrainComplete();
|
|
}
|
|
|
|
//
|
|
// Implementation details.
|
|
//
|
|
|
|
// Callback passed to the VideoToolbox decoder for returning data.
|
|
// This needs to be static because the API takes a C-style pair of
|
|
// function and userdata pointers. This validates parameters and
|
|
// forwards the decoded image back to an object method.
|
|
static void
|
|
PlatformCallback(void* decompressionOutputRefCon,
|
|
void* sourceFrameRefCon,
|
|
OSStatus status,
|
|
VTDecodeInfoFlags flags,
|
|
CVImageBufferRef image,
|
|
CMTime presentationTimeStamp,
|
|
CMTime presentationDuration)
|
|
{
|
|
LOG("AppleVideoDecoder %s status %d flags %d", __func__, status, flags);
|
|
|
|
AppleVTDecoder* decoder =
|
|
static_cast<AppleVTDecoder*>(decompressionOutputRefCon);
|
|
nsAutoPtr<AppleVTDecoder::AppleFrameRef> frameRef(
|
|
static_cast<AppleVTDecoder::AppleFrameRef*>(sourceFrameRefCon));
|
|
|
|
// Validate our arguments.
|
|
if (status != noErr || !image) {
|
|
NS_WARNING("VideoToolbox decoder returned no data");
|
|
image = nullptr;
|
|
} else if (flags & kVTDecodeInfo_FrameDropped) {
|
|
NS_WARNING(" ...frame tagged as dropped...");
|
|
} else {
|
|
MOZ_ASSERT(CFGetTypeID(image) == CVPixelBufferGetTypeID(),
|
|
"VideoToolbox returned an unexpected image type");
|
|
}
|
|
decoder->OutputFrame(image, *frameRef);
|
|
}
|
|
|
|
nsresult
|
|
AppleVTDecoder::WaitForAsynchronousFrames()
|
|
{
|
|
OSStatus rv = VTDecompressionSessionWaitForAsynchronousFrames(mSession);
|
|
if (rv != noErr) {
|
|
LOG("AppleVTDecoder: Error %d waiting for asynchronous frames", rv);
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
// Helper to fill in a timestamp structure.
|
|
static CMSampleTimingInfo
|
|
TimingInfoFromSample(MediaRawData* aSample)
|
|
{
|
|
CMSampleTimingInfo timestamp;
|
|
|
|
timestamp.duration = CMTimeMake(aSample->mDuration, USECS_PER_S);
|
|
timestamp.presentationTimeStamp =
|
|
CMTimeMake(aSample->mTime, USECS_PER_S);
|
|
timestamp.decodeTimeStamp =
|
|
CMTimeMake(aSample->mTimecode, USECS_PER_S);
|
|
|
|
return timestamp;
|
|
}
|
|
|
|
nsresult
|
|
AppleVTDecoder::DoDecode(MediaRawData* aSample)
|
|
{
|
|
AssertOnTaskQueueThread();
|
|
|
|
// For some reason this gives me a double-free error with stagefright.
|
|
AutoCFRelease<CMBlockBufferRef> block = nullptr;
|
|
AutoCFRelease<CMSampleBufferRef> sample = nullptr;
|
|
VTDecodeInfoFlags infoFlags;
|
|
OSStatus rv;
|
|
|
|
// FIXME: This copies the sample data. I think we can provide
|
|
// a custom block source which reuses the aSample buffer.
|
|
// But note that there may be a problem keeping the samples
|
|
// alive over multiple frames.
|
|
rv = CMBlockBufferCreateWithMemoryBlock(kCFAllocatorDefault, // Struct allocator.
|
|
const_cast<uint8_t*>(aSample->Data()),
|
|
aSample->Size(),
|
|
kCFAllocatorNull, // Block allocator.
|
|
NULL, // Block source.
|
|
0, // Data offset.
|
|
aSample->Size(),
|
|
false,
|
|
block.receive());
|
|
if (rv != noErr) {
|
|
NS_ERROR("Couldn't create CMBlockBuffer");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
CMSampleTimingInfo timestamp = TimingInfoFromSample(aSample);
|
|
rv = CMSampleBufferCreate(kCFAllocatorDefault, block, true, 0, 0, mFormat, 1, 1, ×tamp, 0, NULL, sample.receive());
|
|
if (rv != noErr) {
|
|
NS_ERROR("Couldn't create CMSampleBuffer");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
mQueuedSamples++;
|
|
|
|
VTDecodeFrameFlags decodeFlags =
|
|
kVTDecodeFrame_EnableAsynchronousDecompression;
|
|
rv = VTDecompressionSessionDecodeFrame(mSession,
|
|
sample,
|
|
decodeFlags,
|
|
CreateAppleFrameRef(aSample),
|
|
&infoFlags);
|
|
if (rv != noErr && !(infoFlags & kVTDecodeInfo_FrameDropped)) {
|
|
LOG("AppleVTDecoder: Error %d VTDecompressionSessionDecodeFrame", rv);
|
|
NS_WARNING("Couldn't pass frame to decoder");
|
|
mCallback->Error(MediaDataDecoderError::DECODE_ERROR);
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
AppleVTDecoder::InitializeSession()
|
|
{
|
|
OSStatus rv;
|
|
|
|
AutoCFRelease<CFDictionaryRef> extensions = CreateDecoderExtensions();
|
|
|
|
rv = CMVideoFormatDescriptionCreate(kCFAllocatorDefault,
|
|
kCMVideoCodecType_H264,
|
|
mPictureWidth,
|
|
mPictureHeight,
|
|
extensions,
|
|
&mFormat);
|
|
if (rv != noErr) {
|
|
NS_ERROR("Couldn't create format description!");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
// Contruct video decoder selection spec.
|
|
AutoCFRelease<CFDictionaryRef> spec = CreateDecoderSpecification();
|
|
|
|
// Contruct output configuration.
|
|
AutoCFRelease<CFDictionaryRef> outputConfiguration =
|
|
CreateOutputConfiguration();
|
|
|
|
VTDecompressionOutputCallbackRecord cb = { PlatformCallback, this };
|
|
rv = VTDecompressionSessionCreate(kCFAllocatorDefault,
|
|
mFormat,
|
|
spec, // Video decoder selection.
|
|
outputConfiguration, // Output video format.
|
|
&cb,
|
|
&mSession);
|
|
|
|
if (rv != noErr) {
|
|
NS_ERROR("Couldn't create decompression session!");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
if (AppleVTLinker::skPropUsingHWAccel) {
|
|
CFBooleanRef isUsingHW = nullptr;
|
|
rv = VTSessionCopyProperty(mSession,
|
|
AppleVTLinker::skPropUsingHWAccel,
|
|
kCFAllocatorDefault,
|
|
&isUsingHW);
|
|
if (rv != noErr) {
|
|
LOG("AppleVTDecoder: system doesn't support hardware acceleration");
|
|
}
|
|
mIsHardwareAccelerated = rv == noErr && isUsingHW == kCFBooleanTrue;
|
|
LOG("AppleVTDecoder: %s hardware accelerated decoding",
|
|
mIsHardwareAccelerated ? "using" : "not using");
|
|
} else {
|
|
LOG("AppleVTDecoder: couldn't determine hardware acceleration status.");
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
CFDictionaryRef
|
|
AppleVTDecoder::CreateDecoderExtensions()
|
|
{
|
|
AutoCFRelease<CFDataRef> avc_data =
|
|
CFDataCreate(kCFAllocatorDefault,
|
|
mExtraData->Elements(),
|
|
mExtraData->Length());
|
|
|
|
const void* atomsKey[] = { CFSTR("avcC") };
|
|
const void* atomsValue[] = { avc_data };
|
|
static_assert(ArrayLength(atomsKey) == ArrayLength(atomsValue),
|
|
"Non matching keys/values array size");
|
|
|
|
AutoCFRelease<CFDictionaryRef> atoms =
|
|
CFDictionaryCreate(kCFAllocatorDefault,
|
|
atomsKey,
|
|
atomsValue,
|
|
ArrayLength(atomsKey),
|
|
&kCFTypeDictionaryKeyCallBacks,
|
|
&kCFTypeDictionaryValueCallBacks);
|
|
|
|
const void* extensionKeys[] =
|
|
{ kCVImageBufferChromaLocationBottomFieldKey,
|
|
kCVImageBufferChromaLocationTopFieldKey,
|
|
AppleCMLinker::skPropExtensionAtoms };
|
|
|
|
const void* extensionValues[] =
|
|
{ kCVImageBufferChromaLocation_Left,
|
|
kCVImageBufferChromaLocation_Left,
|
|
atoms };
|
|
static_assert(ArrayLength(extensionKeys) == ArrayLength(extensionValues),
|
|
"Non matching keys/values array size");
|
|
|
|
return CFDictionaryCreate(kCFAllocatorDefault,
|
|
extensionKeys,
|
|
extensionValues,
|
|
ArrayLength(extensionKeys),
|
|
&kCFTypeDictionaryKeyCallBacks,
|
|
&kCFTypeDictionaryValueCallBacks);
|
|
}
|
|
|
|
CFDictionaryRef
|
|
AppleVTDecoder::CreateDecoderSpecification()
|
|
{
|
|
if (!AppleVTLinker::skPropEnableHWAccel) {
|
|
return nullptr;
|
|
}
|
|
|
|
const void* specKeys[] = { AppleVTLinker::skPropEnableHWAccel };
|
|
const void* specValues[1];
|
|
if (AppleDecoderModule::sCanUseHardwareVideoDecoder) {
|
|
specValues[0] = kCFBooleanTrue;
|
|
} else {
|
|
// This GPU is blacklisted for hardware decoding.
|
|
specValues[0] = kCFBooleanFalse;
|
|
}
|
|
static_assert(ArrayLength(specKeys) == ArrayLength(specValues),
|
|
"Non matching keys/values array size");
|
|
|
|
return CFDictionaryCreate(kCFAllocatorDefault,
|
|
specKeys,
|
|
specValues,
|
|
ArrayLength(specKeys),
|
|
&kCFTypeDictionaryKeyCallBacks,
|
|
&kCFTypeDictionaryValueCallBacks);
|
|
}
|
|
|
|
} // namespace mozilla
|