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)
314 lines
8.5 KiB
C++
314 lines
8.5 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 "GMPVideoDecoder.h"
|
|
#include "GMPVideoHost.h"
|
|
#include "mozilla/EndianUtils.h"
|
|
#include "prsystem.h"
|
|
#include "MediaData.h"
|
|
#include "GMPDecoderModule.h"
|
|
|
|
namespace mozilla {
|
|
|
|
#if defined(DEBUG)
|
|
extern bool IsOnGMPThread();
|
|
#endif
|
|
|
|
void
|
|
VideoCallbackAdapter::Decoded(GMPVideoi420Frame* aDecodedFrame)
|
|
{
|
|
GMPUniquePtr<GMPVideoi420Frame> decodedFrame(aDecodedFrame);
|
|
|
|
MOZ_ASSERT(IsOnGMPThread());
|
|
|
|
VideoData::YCbCrBuffer b;
|
|
for (int i = 0; i < kGMPNumOfPlanes; ++i) {
|
|
b.mPlanes[i].mData = decodedFrame->Buffer(GMPPlaneType(i));
|
|
b.mPlanes[i].mStride = decodedFrame->Stride(GMPPlaneType(i));
|
|
if (i == kGMPYPlane) {
|
|
b.mPlanes[i].mWidth = decodedFrame->Width();
|
|
b.mPlanes[i].mHeight = decodedFrame->Height();
|
|
} else {
|
|
b.mPlanes[i].mWidth = (decodedFrame->Width() + 1) / 2;
|
|
b.mPlanes[i].mHeight = (decodedFrame->Height() + 1) / 2;
|
|
}
|
|
b.mPlanes[i].mOffset = 0;
|
|
b.mPlanes[i].mSkip = 0;
|
|
}
|
|
|
|
gfx::IntRect pictureRegion(0, 0, decodedFrame->Width(), decodedFrame->Height());
|
|
RefPtr<VideoData> v = VideoData::Create(mVideoInfo,
|
|
mImageContainer,
|
|
mLastStreamOffset,
|
|
decodedFrame->Timestamp(),
|
|
decodedFrame->Duration(),
|
|
b,
|
|
false,
|
|
-1,
|
|
pictureRegion);
|
|
if (v) {
|
|
mCallback->Output(v);
|
|
} else {
|
|
mCallback->Error(MediaDataDecoderError::FATAL_ERROR);
|
|
}
|
|
}
|
|
|
|
void
|
|
VideoCallbackAdapter::ReceivedDecodedReferenceFrame(const uint64_t aPictureId)
|
|
{
|
|
MOZ_ASSERT(IsOnGMPThread());
|
|
}
|
|
|
|
void
|
|
VideoCallbackAdapter::ReceivedDecodedFrame(const uint64_t aPictureId)
|
|
{
|
|
MOZ_ASSERT(IsOnGMPThread());
|
|
}
|
|
|
|
void
|
|
VideoCallbackAdapter::InputDataExhausted()
|
|
{
|
|
MOZ_ASSERT(IsOnGMPThread());
|
|
mCallback->InputExhausted();
|
|
}
|
|
|
|
void
|
|
VideoCallbackAdapter::DrainComplete()
|
|
{
|
|
MOZ_ASSERT(IsOnGMPThread());
|
|
mCallback->DrainComplete();
|
|
}
|
|
|
|
void
|
|
VideoCallbackAdapter::ResetComplete()
|
|
{
|
|
MOZ_ASSERT(IsOnGMPThread());
|
|
mCallback->FlushComplete();
|
|
}
|
|
|
|
void
|
|
VideoCallbackAdapter::Error(GMPErr aErr)
|
|
{
|
|
MOZ_ASSERT(IsOnGMPThread());
|
|
mCallback->Error(MediaDataDecoderError::FATAL_ERROR);
|
|
}
|
|
|
|
void
|
|
VideoCallbackAdapter::Terminated()
|
|
{
|
|
// Note that this *may* be called from the proxy thread also.
|
|
NS_WARNING("H.264 GMP decoder terminated.");
|
|
mCallback->Error(MediaDataDecoderError::FATAL_ERROR);
|
|
}
|
|
|
|
void
|
|
GMPVideoDecoder::InitTags(nsTArray<nsCString>& aTags)
|
|
{
|
|
aTags.AppendElement(NS_LITERAL_CSTRING("h264"));
|
|
const Maybe<nsCString> gmp(
|
|
GMPDecoderModule::PreferredGMP(NS_LITERAL_CSTRING("video/avc")));
|
|
if (gmp.isSome()) {
|
|
aTags.AppendElement(gmp.value());
|
|
}
|
|
}
|
|
|
|
nsCString
|
|
GMPVideoDecoder::GetNodeId()
|
|
{
|
|
return SHARED_GMP_DECODING_NODE_ID;
|
|
}
|
|
|
|
GMPUniquePtr<GMPVideoEncodedFrame>
|
|
GMPVideoDecoder::CreateFrame(MediaRawData* aSample)
|
|
{
|
|
GMPVideoFrame* ftmp = nullptr;
|
|
GMPErr err = mHost->CreateFrame(kGMPEncodedVideoFrame, &ftmp);
|
|
if (GMP_FAILED(err)) {
|
|
mCallback->Error(MediaDataDecoderError::FATAL_ERROR);
|
|
return nullptr;
|
|
}
|
|
|
|
GMPUniquePtr<GMPVideoEncodedFrame> frame(static_cast<GMPVideoEncodedFrame*>(ftmp));
|
|
err = frame->CreateEmptyFrame(aSample->Size());
|
|
if (GMP_FAILED(err)) {
|
|
mCallback->Error(MediaDataDecoderError::FATAL_ERROR);
|
|
return nullptr;
|
|
}
|
|
|
|
memcpy(frame->Buffer(), aSample->Data(), frame->Size());
|
|
|
|
// Convert 4-byte NAL unit lengths to host-endian 4-byte buffer lengths to
|
|
// suit the GMP API.
|
|
if (mConvertNALUnitLengths) {
|
|
const int kNALLengthSize = 4;
|
|
uint8_t* buf = frame->Buffer();
|
|
while (buf < frame->Buffer() + frame->Size() - kNALLengthSize) {
|
|
uint32_t length = BigEndian::readUint32(buf) + kNALLengthSize;
|
|
*reinterpret_cast<uint32_t *>(buf) = length;
|
|
buf += length;
|
|
}
|
|
}
|
|
|
|
frame->SetBufferType(GMP_BufferLength32);
|
|
|
|
frame->SetEncodedWidth(mConfig.mDisplay.width);
|
|
frame->SetEncodedHeight(mConfig.mDisplay.height);
|
|
frame->SetTimeStamp(aSample->mTime);
|
|
frame->SetCompleteFrame(true);
|
|
frame->SetDuration(aSample->mDuration);
|
|
frame->SetFrameType(aSample->mKeyframe ? kGMPKeyFrame : kGMPDeltaFrame);
|
|
|
|
return frame;
|
|
}
|
|
|
|
void
|
|
GMPVideoDecoder::GMPInitDone(GMPVideoDecoderProxy* aGMP, GMPVideoHost* aHost)
|
|
{
|
|
MOZ_ASSERT(IsOnGMPThread());
|
|
|
|
if (!aGMP) {
|
|
mInitPromise.RejectIfExists(MediaDataDecoder::DecoderFailureReason::INIT_ERROR, __func__);
|
|
return;
|
|
}
|
|
MOZ_ASSERT(aHost);
|
|
|
|
if (mInitPromise.IsEmpty()) {
|
|
// GMP must have been shutdown while we were waiting for Init operation
|
|
// to complete.
|
|
aGMP->Close();
|
|
return;
|
|
}
|
|
|
|
GMPVideoCodec codec;
|
|
memset(&codec, 0, sizeof(codec));
|
|
|
|
codec.mGMPApiVersion = kGMPVersion33;
|
|
|
|
codec.mCodecType = kGMPVideoCodecH264;
|
|
codec.mWidth = mConfig.mImage.width;
|
|
codec.mHeight = mConfig.mImage.height;
|
|
|
|
nsTArray<uint8_t> codecSpecific;
|
|
codecSpecific.AppendElement(0); // mPacketizationMode.
|
|
codecSpecific.AppendElements(mConfig.mExtraData->Elements(),
|
|
mConfig.mExtraData->Length());
|
|
|
|
nsresult rv = aGMP->InitDecode(codec,
|
|
codecSpecific,
|
|
mAdapter,
|
|
PR_GetNumberOfProcessors());
|
|
if (NS_FAILED(rv)) {
|
|
aGMP->Close();
|
|
mInitPromise.Reject(MediaDataDecoder::DecoderFailureReason::INIT_ERROR, __func__);
|
|
return;
|
|
}
|
|
|
|
mGMP = aGMP;
|
|
mHost = aHost;
|
|
|
|
// GMP implementations have interpreted the meaning of GMP_BufferLength32
|
|
// differently. The OpenH264 GMP expects GMP_BufferLength32 to behave as
|
|
// specified in the GMP API, where each buffer is prefixed by a 32-bit
|
|
// host-endian buffer length that includes the size of the buffer length
|
|
// field. Other existing GMPs currently expect GMP_BufferLength32 (when
|
|
// combined with kGMPVideoCodecH264) to mean "like AVCC but restricted to
|
|
// 4-byte NAL lengths" (i.e. buffer lengths are specified in big-endian
|
|
// and do not include the length of the buffer length field.
|
|
mConvertNALUnitLengths = mGMP->GetDisplayName().EqualsLiteral("gmpopenh264");
|
|
|
|
mInitPromise.Resolve(TrackInfo::kVideoTrack, __func__);
|
|
}
|
|
|
|
RefPtr<MediaDataDecoder::InitPromise>
|
|
GMPVideoDecoder::Init()
|
|
{
|
|
MOZ_ASSERT(IsOnGMPThread());
|
|
|
|
mMPS = do_GetService("@mozilla.org/gecko-media-plugin-service;1");
|
|
MOZ_ASSERT(mMPS);
|
|
|
|
RefPtr<InitPromise> promise(mInitPromise.Ensure(__func__));
|
|
|
|
nsTArray<nsCString> tags;
|
|
InitTags(tags);
|
|
UniquePtr<GetGMPVideoDecoderCallback> callback(new GMPInitDoneCallback(this));
|
|
if (NS_FAILED(mMPS->GetGMPVideoDecoder(&tags, GetNodeId(), Move(callback)))) {
|
|
mInitPromise.Reject(MediaDataDecoder::DecoderFailureReason::INIT_ERROR, __func__);
|
|
}
|
|
|
|
return promise;
|
|
}
|
|
|
|
nsresult
|
|
GMPVideoDecoder::Input(MediaRawData* aSample)
|
|
{
|
|
MOZ_ASSERT(IsOnGMPThread());
|
|
|
|
RefPtr<MediaRawData> sample(aSample);
|
|
if (!mGMP) {
|
|
mCallback->Error(MediaDataDecoderError::FATAL_ERROR);
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
mAdapter->SetLastStreamOffset(sample->mOffset);
|
|
|
|
GMPUniquePtr<GMPVideoEncodedFrame> frame = CreateFrame(sample);
|
|
if (!frame) {
|
|
mCallback->Error(MediaDataDecoderError::FATAL_ERROR);
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
nsTArray<uint8_t> info; // No codec specific per-frame info to pass.
|
|
nsresult rv = mGMP->Decode(Move(frame), false, info, 0);
|
|
if (NS_FAILED(rv)) {
|
|
mCallback->Error(MediaDataDecoderError::DECODE_ERROR);
|
|
return rv;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
GMPVideoDecoder::Flush()
|
|
{
|
|
MOZ_ASSERT(IsOnGMPThread());
|
|
|
|
if (!mGMP || NS_FAILED(mGMP->Reset())) {
|
|
// Abort the flush.
|
|
mCallback->FlushComplete();
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
GMPVideoDecoder::Drain()
|
|
{
|
|
MOZ_ASSERT(IsOnGMPThread());
|
|
|
|
if (!mGMP || NS_FAILED(mGMP->Drain())) {
|
|
mCallback->DrainComplete();
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
GMPVideoDecoder::Shutdown()
|
|
{
|
|
mInitPromise.RejectIfExists(MediaDataDecoder::DecoderFailureReason::CANCELED, __func__);
|
|
// Note that this *may* be called from the proxy thread also.
|
|
if (!mGMP) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
// Note this unblocks flush and drain operations waiting for callbacks.
|
|
mGMP->Close();
|
|
mGMP = nullptr;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
} // namespace mozilla
|