diff options
Diffstat (limited to 'chromium/media/gpu/windows/d3d11_h264_accelerator.h')
| -rw-r--r-- | chromium/media/gpu/windows/d3d11_h264_accelerator.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/media/gpu/windows/d3d11_h264_accelerator.h b/chromium/media/gpu/windows/d3d11_h264_accelerator.h index 59198167366..1bc69533ce1 100644 --- a/chromium/media/gpu/windows/d3d11_h264_accelerator.h +++ b/chromium/media/gpu/windows/d3d11_h264_accelerator.h @@ -13,7 +13,7 @@ #include <vector> #include "gpu/command_buffer/service/texture_manager.h" -#include "media/base/status_codes.h" +#include "media/base/status.h" #include "media/base/video_frame.h" #include "media/base/win/mf_helpers.h" #include "media/gpu/h264_decoder.h" @@ -39,6 +39,10 @@ class D3D11H264Accelerator : public H264Decoder::H264Accelerator { MediaLog* media_log, ComD3D11VideoDevice video_device, std::unique_ptr<VideoContextWrapper> video_context); + + D3D11H264Accelerator(const D3D11H264Accelerator&) = delete; + D3D11H264Accelerator& operator=(const D3D11H264Accelerator&) = delete; + ~D3D11H264Accelerator() override; // H264Decoder::H264Accelerator implementation. @@ -89,6 +93,7 @@ class D3D11H264Accelerator : public H264Decoder::H264Accelerator { void RecordFailure(const std::string& reason, StatusCode code, HRESULT hr = S_OK) const; + void RecordFailure(media::Status error) const; D3D11VideoDecoderClient* client_; MediaLog* media_log_ = nullptr; @@ -117,8 +122,6 @@ class D3D11H264Accelerator : public H264Decoder::H264Accelerator { std::vector<D3D11_VIDEO_DECODER_SUB_SAMPLE_MAPPING_BLOCK> subsamples_; // IV for the current frame. std::vector<uint8_t> frame_iv_; - - DISALLOW_COPY_AND_ASSIGN(D3D11H264Accelerator); }; } // namespace media |