| Index: content/common/gpu/media/android_video_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/android_video_decode_accelerator.h b/content/common/gpu/media/android_video_decode_accelerator.h
|
| index ea4f6e8641b6246e27c8270d93093f1cbc2195be..b98ab4a41c224613aaff62222a23e8b8a7c7998d 100644
|
| --- a/content/common/gpu/media/android_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/android_video_decode_accelerator.h
|
| @@ -19,6 +19,7 @@
|
| #include "content/common/content_export.h"
|
| #include "content/common/gpu/media/avda_state_provider.h"
|
| #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
|
| +#include "gpu/command_buffer/service/gpu_preferences.h"
|
| #include "media/base/android/media_drm_bridge.h"
|
| #include "media/base/android/sdk_media_codec_bridge.h"
|
| #include "media/base/media_keys.h"
|
| @@ -110,6 +111,7 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator
|
|
|
| AndroidVideoDecodeAccelerator(
|
| const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder,
|
| + const gpu::GpuPreferences& gpu_preferences,
|
| const base::Callback<bool(void)>& make_context_current);
|
|
|
| ~AndroidVideoDecodeAccelerator() override;
|
| @@ -135,7 +137,8 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator
|
| void PostError(const ::tracked_objects::Location& from_here,
|
| media::VideoDecodeAccelerator::Error error) override;
|
|
|
| - static media::VideoDecodeAccelerator::Capabilities GetCapabilities();
|
| + static media::VideoDecodeAccelerator::Capabilities GetCapabilities(
|
| + const gpu::GpuPreferences& gpu_preferences);
|
|
|
| // Notifies about SurfaceTexture::OnFrameAvailable. This can happen on any
|
| // thread at any time!
|
| @@ -227,9 +230,6 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator
|
| // ones.
|
| void DismissPictureBuffers();
|
|
|
| - // Return true if and only if we should use deferred rendering.
|
| - static bool UseDeferredRenderingStrategy();
|
| -
|
| // Used to DCHECK that we are called on the correct thread.
|
| base::ThreadChecker thread_checker_;
|
|
|
|
|