зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1272232. Part 5 - remove use of FlushableTaskQueue. r=jya.
MozReview-Commit-ID: F3gzwztV03k --HG-- extra : source : 1c5b4511ae0031c3b3b1bb13ef6f076fa5690683
This commit is contained in:
Родитель
b2c3232dd1
Коммит
bd544fa97d
|
@ -51,9 +51,9 @@ static uint32_t ComputeMaxRefFrames(const MediaByteBuffer* aExtraData)
|
||||||
}
|
}
|
||||||
|
|
||||||
AppleVDADecoder::AppleVDADecoder(const VideoInfo& aConfig,
|
AppleVDADecoder::AppleVDADecoder(const VideoInfo& aConfig,
|
||||||
FlushableTaskQueue* aVideoTaskQueue,
|
TaskQueue* aTaskQueue,
|
||||||
MediaDataDecoderCallback* aCallback,
|
MediaDataDecoderCallback* aCallback,
|
||||||
layers::ImageContainer* aImageContainer)
|
layers::ImageContainer* aImageContainer)
|
||||||
: mExtraData(aConfig.mExtraData)
|
: mExtraData(aConfig.mExtraData)
|
||||||
, mCallback(aCallback)
|
, mCallback(aCallback)
|
||||||
, mPictureWidth(aConfig.mImage.width)
|
, mPictureWidth(aConfig.mImage.width)
|
||||||
|
@ -61,7 +61,7 @@ AppleVDADecoder::AppleVDADecoder(const VideoInfo& aConfig,
|
||||||
, mDisplayWidth(aConfig.mDisplay.width)
|
, mDisplayWidth(aConfig.mDisplay.width)
|
||||||
, mDisplayHeight(aConfig.mDisplay.height)
|
, mDisplayHeight(aConfig.mDisplay.height)
|
||||||
, mQueuedSamples(0)
|
, mQueuedSamples(0)
|
||||||
, mTaskQueue(aVideoTaskQueue)
|
, mTaskQueue(aTaskQueue)
|
||||||
, mDecoder(nullptr)
|
, mDecoder(nullptr)
|
||||||
, mMaxRefFrames(ComputeMaxRefFrames(aConfig.mExtraData))
|
, mMaxRefFrames(ComputeMaxRefFrames(aConfig.mExtraData))
|
||||||
, mImageContainer(aImageContainer)
|
, mImageContainer(aImageContainer)
|
||||||
|
@ -671,7 +671,7 @@ AppleVDADecoder::CreateOutputConfiguration()
|
||||||
already_AddRefed<AppleVDADecoder>
|
already_AddRefed<AppleVDADecoder>
|
||||||
AppleVDADecoder::CreateVDADecoder(
|
AppleVDADecoder::CreateVDADecoder(
|
||||||
const VideoInfo& aConfig,
|
const VideoInfo& aConfig,
|
||||||
FlushableTaskQueue* aVideoTaskQueue,
|
TaskQueue* aTaskQueue,
|
||||||
MediaDataDecoderCallback* aCallback,
|
MediaDataDecoderCallback* aCallback,
|
||||||
layers::ImageContainer* aImageContainer)
|
layers::ImageContainer* aImageContainer)
|
||||||
{
|
{
|
||||||
|
@ -681,7 +681,7 @@ AppleVDADecoder::CreateVDADecoder(
|
||||||
}
|
}
|
||||||
|
|
||||||
RefPtr<AppleVDADecoder> decoder =
|
RefPtr<AppleVDADecoder> decoder =
|
||||||
new AppleVDADecoder(aConfig, aVideoTaskQueue, aCallback, aImageContainer);
|
new AppleVDADecoder(aConfig, aTaskQueue, aCallback, aImageContainer);
|
||||||
|
|
||||||
if (NS_FAILED(decoder->InitializeSession())) {
|
if (NS_FAILED(decoder->InitializeSession())) {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
|
|
||||||
class FlushableTaskQueue;
|
class TaskQueue;
|
||||||
class MediaDataDecoderCallback;
|
class MediaDataDecoderCallback;
|
||||||
namespace layers {
|
namespace layers {
|
||||||
class ImageContainer;
|
class ImageContainer;
|
||||||
|
@ -62,7 +62,7 @@ public:
|
||||||
// not supported by current configuration.
|
// not supported by current configuration.
|
||||||
static already_AddRefed<AppleVDADecoder> CreateVDADecoder(
|
static already_AddRefed<AppleVDADecoder> CreateVDADecoder(
|
||||||
const VideoInfo& aConfig,
|
const VideoInfo& aConfig,
|
||||||
FlushableTaskQueue* aVideoTaskQueue,
|
TaskQueue* aTaskQueue,
|
||||||
MediaDataDecoderCallback* aCallback,
|
MediaDataDecoderCallback* aCallback,
|
||||||
layers::ImageContainer* aImageContainer);
|
layers::ImageContainer* aImageContainer);
|
||||||
|
|
||||||
|
@ -89,7 +89,7 @@ private:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
AppleVDADecoder(const VideoInfo& aConfig,
|
AppleVDADecoder(const VideoInfo& aConfig,
|
||||||
FlushableTaskQueue* aVideoTaskQueue,
|
TaskQueue* aTaskQueue,
|
||||||
MediaDataDecoderCallback* aCallback,
|
MediaDataDecoderCallback* aCallback,
|
||||||
layers::ImageContainer* aImageContainer);
|
layers::ImageContainer* aImageContainer);
|
||||||
virtual ~AppleVDADecoder();
|
virtual ~AppleVDADecoder();
|
||||||
|
@ -122,7 +122,7 @@ private:
|
||||||
virtual void ProcessDrain();
|
virtual void ProcessDrain();
|
||||||
virtual void ProcessShutdown();
|
virtual void ProcessShutdown();
|
||||||
|
|
||||||
const RefPtr<FlushableTaskQueue> mTaskQueue;
|
const RefPtr<TaskQueue> mTaskQueue;
|
||||||
VDADecoder mDecoder;
|
VDADecoder mDecoder;
|
||||||
const uint32_t mMaxRefFrames;
|
const uint32_t mMaxRefFrames;
|
||||||
const RefPtr<layers::ImageContainer> mImageContainer;
|
const RefPtr<layers::ImageContainer> mImageContainer;
|
||||||
|
|
|
@ -26,10 +26,10 @@ extern mozilla::LogModule* GetPDMLog();
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
|
|
||||||
AppleVTDecoder::AppleVTDecoder(const VideoInfo& aConfig,
|
AppleVTDecoder::AppleVTDecoder(const VideoInfo& aConfig,
|
||||||
FlushableTaskQueue* aVideoTaskQueue,
|
TaskQueue* aTaskQueue,
|
||||||
MediaDataDecoderCallback* aCallback,
|
MediaDataDecoderCallback* aCallback,
|
||||||
layers::ImageContainer* aImageContainer)
|
layers::ImageContainer* aImageContainer)
|
||||||
: AppleVDADecoder(aConfig, aVideoTaskQueue, aCallback, aImageContainer)
|
: AppleVDADecoder(aConfig, aTaskQueue, aCallback, aImageContainer)
|
||||||
, mFormat(nullptr)
|
, mFormat(nullptr)
|
||||||
, mSession(nullptr)
|
, mSession(nullptr)
|
||||||
, mIsHardwareAccelerated(false)
|
, mIsHardwareAccelerated(false)
|
||||||
|
|
|
@ -16,7 +16,7 @@ namespace mozilla {
|
||||||
class AppleVTDecoder : public AppleVDADecoder {
|
class AppleVTDecoder : public AppleVDADecoder {
|
||||||
public:
|
public:
|
||||||
AppleVTDecoder(const VideoInfo& aConfig,
|
AppleVTDecoder(const VideoInfo& aConfig,
|
||||||
FlushableTaskQueue* aVideoTaskQueue,
|
TaskQueue* aTaskQueue,
|
||||||
MediaDataDecoderCallback* aCallback,
|
MediaDataDecoderCallback* aCallback,
|
||||||
layers::ImageContainer* aImageContainer);
|
layers::ImageContainer* aImageContainer);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче