summaryrefslogtreecommitdiff
path: root/chromium/media/gpu/chromeos/video_decoder_pipeline.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/gpu/chromeos/video_decoder_pipeline.h')
-rw-r--r--chromium/media/gpu/chromeos/video_decoder_pipeline.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/chromium/media/gpu/chromeos/video_decoder_pipeline.h b/chromium/media/gpu/chromeos/video_decoder_pipeline.h
index 2435f8abf21..750154095ad 100644
--- a/chromium/media/gpu/chromeos/video_decoder_pipeline.h
+++ b/chromium/media/gpu/chromeos/video_decoder_pipeline.h
@@ -1,4 +1,4 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
+// Copyright 2019 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,6 +12,7 @@
#include "base/sequence_checker.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
+#include "gpu/config/gpu_driver_bug_workarounds.h"
#include "media/base/cdm_context.h"
#include "media/base/supported_video_decoder_config.h"
#include "media/base/video_decoder.h"
@@ -34,10 +35,6 @@ namespace base {
class SequencedTaskRunner;
}
-namespace gpu {
-class GpuDriverBugWorkarounds;
-}
-
namespace media {
class DmabufVideoFramePool;
@@ -142,6 +139,7 @@ class MEDIA_GPU_EXPORT VideoDecoderPipeline : public VideoDecoder,
// Creates a VideoDecoderPipeline instance that allocates VideoFrames from
// |frame_pool| and converts the decoded VideoFrames using |frame_converter|.
static std::unique_ptr<VideoDecoder> Create(
+ const gpu::GpuDriverBugWorkarounds& workarounds,
scoped_refptr<base::SequencedTaskRunner> client_task_runner,
std::unique_ptr<DmabufVideoFramePool> frame_pool,
std::unique_ptr<VideoFrameConverter> frame_converter,
@@ -191,6 +189,7 @@ class MEDIA_GPU_EXPORT VideoDecoderPipeline : public VideoDecoder,
#endif
VideoDecoderPipeline(
+ const gpu::GpuDriverBugWorkarounds& workarounds,
scoped_refptr<base::SequencedTaskRunner> client_task_runner,
std::unique_ptr<DmabufVideoFramePool> frame_pool,
std::unique_ptr<VideoFrameConverter> frame_converter,
@@ -239,6 +238,11 @@ class MEDIA_GPU_EXPORT VideoDecoderPipeline : public VideoDecoder,
DecodeCB decode_callback);
#endif // BUILDFLAG(IS_CHROMEOS)
+ // Used to figure out the supported configurations in Initialize().
+ const gpu::GpuDriverBugWorkarounds gpu_workarounds_;
+
+ SupportedVideoDecoderConfigs supported_configs_for_testing_;
+
// The client task runner and its sequence checker. All public methods should
// run on this task runner.
const scoped_refptr<base::SequencedTaskRunner> client_task_runner_;