Commit 82ed7e91 authored by Ted Meyer's avatar Ted Meyer Committed by Commit Bot

Support VP9 Hardware Acceleration using D3D11

Completes:
 - D3D11VP9Accelerator::SubmitDecode
 - D3D11VP9Accelerator::OutputPicture
 - D3D11VP9Accelerator::CreateVP9Picture

Which are the three methods required to successfully implement a
VP9Accelerator class.

Bug: 881922
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I6af7ebb07b53febf4797c1849a976b1ce8424df1
Reviewed-on: https://chromium-review.googlesource.com/c/1244664
Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Reviewed-by: default avatarFrank Liberato <liberato@chromium.org>
Reviewed-by: default avatarRintaro Kuroiwa <rkuroiwa@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596089}
parent ba126983
...@@ -106,7 +106,9 @@ void D3D11VideoDecoder::InitializeAcceleratedDecoder( ...@@ -106,7 +106,9 @@ void D3D11VideoDecoder::InitializeAcceleratedDecoder(
Microsoft::WRL::ComPtr<ID3D11VideoDecoder> video_decoder) { Microsoft::WRL::ComPtr<ID3D11VideoDecoder> video_decoder) {
if (isVP9(config)) { if (isVP9(config)) {
accelerated_video_decoder_ = accelerated_video_decoder_ =
std::make_unique<VP9Decoder>(std::make_unique<D3D11VP9Accelerator>()); std::make_unique<VP9Decoder>(std::make_unique<D3D11VP9Accelerator>(
this, media_log_.get(), video_decoder, video_device_,
video_context_));
return; return;
} }
......
This diff is collapsed.
...@@ -5,17 +5,30 @@ ...@@ -5,17 +5,30 @@
#ifndef MEDIA_GPU_WINDOWS_D3D11_VP9_ACCELERATOR_H_ #ifndef MEDIA_GPU_WINDOWS_D3D11_VP9_ACCELERATOR_H_
#define MEDIA_GPU_WINDOWS_D3D11_VP9_ACCELERATOR_H_ #define MEDIA_GPU_WINDOWS_D3D11_VP9_ACCELERATOR_H_
#include <d3d11_1.h>
#include <d3d9.h>
#include <windows.h>
#include <wrl/client.h>
#include "media/base/media_log.h"
#include "media/gpu/vp9_decoder.h" #include "media/gpu/vp9_decoder.h"
#include "media/gpu/windows/d3d11_video_decoder_client.h"
#include "media/gpu/windows/d3d11_vp9_picture.h"
namespace media { namespace media {
class D3D11VP9Accelerator : public VP9Decoder::VP9Accelerator { class D3D11VP9Accelerator : public VP9Decoder::VP9Accelerator {
public: public:
D3D11VP9Accelerator(); D3D11VP9Accelerator(D3D11VideoDecoderClient* client,
MediaLog* media_log,
Microsoft::WRL::ComPtr<ID3D11VideoDecoder> video_decoder,
Microsoft::WRL::ComPtr<ID3D11VideoDevice> video_device,
Microsoft::WRL::ComPtr<ID3D11VideoContext> video_context);
~D3D11VP9Accelerator() override; ~D3D11VP9Accelerator() override;
scoped_refptr<VP9Picture> CreateVP9Picture() override; scoped_refptr<VP9Picture> CreateVP9Picture() override;
// TODO(crbug/890054): Use constref instead of scoped_refptr.
bool SubmitDecode( bool SubmitDecode(
const scoped_refptr<VP9Picture>& picture, const scoped_refptr<VP9Picture>& picture,
const Vp9SegmentationParams& segmentation_params, const Vp9SegmentationParams& segmentation_params,
...@@ -31,6 +44,36 @@ class D3D11VP9Accelerator : public VP9Decoder::VP9Accelerator { ...@@ -31,6 +44,36 @@ class D3D11VP9Accelerator : public VP9Decoder::VP9Accelerator {
Vp9FrameContext* frame_context) override; Vp9FrameContext* frame_context) override;
private: private:
// Helper methods for SubmitDecode
bool BeginFrame(D3D11VP9Picture* pic);
// TODO(crbug/890054): Use constref instead of scoped_refptr.
void CopyFrameParams(const scoped_refptr<D3D11VP9Picture>& pic,
DXVA_PicParams_VP9* pic_params);
void CopyReferenceFrames(
const scoped_refptr<D3D11VP9Picture>& pic,
DXVA_PicParams_VP9* pic_params,
const std::vector<scoped_refptr<VP9Picture>>& reference_pictures);
void CopyFrameRefs(DXVA_PicParams_VP9* pic_params,
const scoped_refptr<D3D11VP9Picture>& picture);
void CopyLoopFilterParams(DXVA_PicParams_VP9* pic_params,
const Vp9LoopFilterParams& loop_filter_params);
void CopyQuantParams(DXVA_PicParams_VP9* pic_params,
const scoped_refptr<D3D11VP9Picture>& pic);
void CopySegmentationParams(DXVA_PicParams_VP9* pic_params,
const Vp9SegmentationParams& segmentation_params);
void CopyHeaderSizeAndID(DXVA_PicParams_VP9* pic_params,
const scoped_refptr<D3D11VP9Picture>& pic);
bool SubmitDecoderBuffer(const DXVA_PicParams_VP9& pic_params,
const scoped_refptr<D3D11VP9Picture>& pic);
D3D11VideoDecoderClient* client_;
MediaLog* const media_log_;
UINT status_feedback_;
Microsoft::WRL::ComPtr<ID3D11VideoDecoder> video_decoder_;
Microsoft::WRL::ComPtr<ID3D11VideoDevice> video_device_;
Microsoft::WRL::ComPtr<ID3D11VideoContext> video_context_;
DISALLOW_COPY_AND_ASSIGN(D3D11VP9Accelerator); DISALLOW_COPY_AND_ASSIGN(D3D11VP9Accelerator);
}; };
......
...@@ -17,6 +17,10 @@ class D3D11VP9Picture : public VP9Picture { ...@@ -17,6 +17,10 @@ class D3D11VP9Picture : public VP9Picture {
public: public:
explicit D3D11VP9Picture(D3D11PictureBuffer* picture_buffer); explicit D3D11VP9Picture(D3D11PictureBuffer* picture_buffer);
D3D11PictureBuffer* picture_buffer() const { return picture_buffer_; };
size_t level() const { return level_; };
protected: protected:
~D3D11VP9Picture() override; ~D3D11VP9Picture() override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment