diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 16:23:34 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:37:21 +0000 |
| commit | 38a9a29f4f9436cace7f0e7abf9c586057df8a4e (patch) | |
| tree | c4e8c458dc595bc0ddb435708fa2229edfd00bd4 /chromium/media/gpu/windows/d3d11_h264_accelerator.cc | |
| parent | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (diff) | |
| download | qtwebengine-chromium-38a9a29f4f9436cace7f0e7abf9c586057df8a4e.tar.gz | |
BASELINE: Update Chromium to 73.0.3683.37
Change-Id: I08c9af2948b645f671e5d933aca1f7a90ea372f2
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/media/gpu/windows/d3d11_h264_accelerator.cc')
| -rw-r--r-- | chromium/media/gpu/windows/d3d11_h264_accelerator.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chromium/media/gpu/windows/d3d11_h264_accelerator.cc b/chromium/media/gpu/windows/d3d11_h264_accelerator.cc index ecc7a52482a..edbfb902edf 100644 --- a/chromium/media/gpu/windows/d3d11_h264_accelerator.cc +++ b/chromium/media/gpu/windows/d3d11_h264_accelerator.cc @@ -73,7 +73,12 @@ D3D11H264Accelerator::D3D11H264Accelerator( cdm_proxy_context_(cdm_proxy_context), video_decoder_(video_decoder), video_device_(video_device), - video_context_(std::move(video_context)) {} + video_context_(std::move(video_context)) { + DCHECK(client); + DCHECK(media_log_); + // |cdm_proxy_context_| is non-null for encrypted content but can be null for + // clear content. +} D3D11H264Accelerator::~D3D11H264Accelerator() {} @@ -100,6 +105,7 @@ Status D3D11H264Accelerator::SubmitFrameMetadata( // D3D11_VIDEO_DECODER_BEGIN_FRAME_CRYPTO_SESSION is a pointer (to a GUID). base::Optional<CdmProxyContext::D3D11DecryptContext> decrypt_context; if (is_encrypted) { + DCHECK(cdm_proxy_context_) << "No CdmProxyContext but picture is encrypted"; decrypt_context = cdm_proxy_context_->GetD3D11DecryptContext( CdmProxy::KeyType::kDecryptAndDecode, pic->decrypt_config()->key_id()); if (!decrypt_context) { @@ -559,10 +565,8 @@ void D3D11H264Accelerator::RecordFailure(const std::string& reason, hr_string = ": " + logging::SystemErrorCodeToString(hr); DLOG(ERROR) << reason << hr_string; - if (media_log_) { - media_log_->AddEvent(media_log_->CreateStringEvent( - MediaLogEvent::MEDIA_ERROR_LOG_ENTRY, "error", hr_string + reason)); - } + media_log_->AddEvent(media_log_->CreateStringEvent( + MediaLogEvent::MEDIA_ERROR_LOG_ENTRY, "error", hr_string + reason)); } } // namespace media |