forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is a WIP. Basic playback works, though EOS is ignored. There is quite a bit of thread-hopping, since the accelerator / decoder is run on the GPU main thread rather than the mojo thread. This will be eliminated in a later CL. Resource cleanup is of the "and the process will exit anyway" variety. It's based heavily on D3D11VideoDecodeAccelerator. Re-uses the H264 Accelerated Video Decoder for D3D11. The accelerator was written with the VDA in mind, so the VideoDecoder jumps through some minor hoops to use it also. It is intended that this will replace the VDA as soon as it reaches parity with it, and the accelerator can be modified for easier use with the VideoDecoder. Set "enable_d3d11_video_decoder=true" in gn config. This will enable the decoder, and: - enable MojoVideoDecoder - enable mojo CDM - set the media mojo host to be the GPU process. Also incorporates fixes to the d3d11_h264_accelerator from: https://chromium-review.googlesource.com/c/chromium/src/+/661237 by rkuroiwa@ . Bug: Change-Id: Ie5f2b651895bc812e5e6bba7c5eb302f2702a1b6 Reviewed-on: https://chromium-review.googlesource.com/693284 Commit-Queue: Frank Liberato <liberato@chromium.org> Reviewed-by: Dan Sanders <sandersd@chromium.org> Cr-Commit-Position: refs/heads/master@{#509615}
- Loading branch information
1 parent
0c68556
commit 33eeaea
Showing
10 changed files
with
866 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| // Copyright 2017 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #include "media/gpu/windows/d3d11_video_decoder.h" | ||
|
|
||
| #include "base/bind.h" | ||
| #include "base/callback.h" | ||
| #include "media/base/bind_to_current_loop.h" | ||
| #include "media/base/decoder_buffer.h" | ||
| #include "media/base/video_codecs.h" | ||
| #include "media/base/video_decoder_config.h" | ||
| #include "media/base/video_frame.h" | ||
|
|
||
| namespace { | ||
|
|
||
| // Check |weak_ptr| and run |cb| with |args| if it's non-null. | ||
| template <typename T, typename... Args> | ||
| void CallbackOnProperThread(base::WeakPtr<T> weak_ptr, | ||
| base::Callback<void(Args...)> cb, | ||
| Args... args) { | ||
| if (weak_ptr.get()) | ||
| cb.Run(args...); | ||
| } | ||
|
|
||
| // Given a callback, |cb|, return another callback that will call |cb| after | ||
| // switching to the thread that BindToCurrent.... is called on. We will check | ||
| // |weak_ptr| on the current thread. This is different than just calling | ||
| // BindToCurrentLoop because we'll check the weak ptr. If |cb| is some method | ||
| // of |T|, then one can use BindToCurrentLoop directly. However, in our case, | ||
| // we have some unrelated callback that we'd like to call only if we haven't | ||
| // been destroyed yet. I suppose this could also just be a method: | ||
| // template<CB, ...> D3D11VideoDecoder::CallSomeCallback(CB, ...) that's bound | ||
| // via BindToCurrentLoop directly. | ||
| template <typename T, typename... Args> | ||
| base::Callback<void(Args...)> BindToCurrentThreadIfWeakPtr( | ||
| base::WeakPtr<T> weak_ptr, | ||
| base::Callback<void(Args...)> cb) { | ||
| return media::BindToCurrentLoop( | ||
| base::Bind(&CallbackOnProperThread<T, Args...>, weak_ptr, cb)); | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| namespace media { | ||
|
|
||
| D3D11VideoDecoder::D3D11VideoDecoder( | ||
| scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner, | ||
| base::Callback<gpu::GpuCommandBufferStub*()> get_stub_cb, | ||
| OutputWithReleaseMailboxCB output_cb) | ||
| : impl_task_runner_(std::move(gpu_task_runner)), weak_factory_(this) { | ||
| // We create |impl_| on the wrong thread, but we never use it here. | ||
| // Note that the output callback will hop to our thread, post the video | ||
| // frame, and along with a callback that will hop back to the impl thread | ||
| // when it's released. | ||
| impl_ = base::MakeUnique<D3D11VideoDecoderImpl>( | ||
| get_stub_cb, media::BindToCurrentLoop(base::Bind( | ||
| &D3D11VideoDecoder::OutputWithThreadHoppingRelease, | ||
| weak_factory_.GetWeakPtr(), std::move(output_cb)))); | ||
| impl_weak_ = impl_->GetWeakPtr(); | ||
| } | ||
|
|
||
| D3D11VideoDecoder::~D3D11VideoDecoder() { | ||
| // Post destruction to the main thread. When this executes, it will also | ||
| // cancel pending callbacks into |impl_| via |impl_weak_|. Callbacks out | ||
| // from |impl_| will be cancelled by |weak_factory_| when we return. | ||
| impl_task_runner_->DeleteSoon(FROM_HERE, std::move(impl_)); | ||
| } | ||
|
|
||
| std::string D3D11VideoDecoder::GetDisplayName() const { | ||
| return "D3D11VideoDecoder"; | ||
| } | ||
|
|
||
| void D3D11VideoDecoder::Initialize(const VideoDecoderConfig& config, | ||
| bool low_delay, | ||
| CdmContext* cdm_context, | ||
| const InitCB& init_cb, | ||
| const OutputCB& output_cb) { | ||
| bool is_h264 = config.profile() >= H264PROFILE_MIN && | ||
| config.profile() <= H264PROFILE_MAX; | ||
| if (!is_h264) { | ||
| init_cb.Run(false); | ||
| return; | ||
| } | ||
|
|
||
| // Bind our own init / output cb that hop to this thread, so we don't call the | ||
| // originals on some other thread. | ||
| // TODO(liberato): what's the lifetime of |cdm_context|? | ||
| impl_task_runner_->PostTask( | ||
| FROM_HERE, | ||
| base::BindOnce( | ||
| &VideoDecoder::Initialize, impl_weak_, config, low_delay, cdm_context, | ||
| BindToCurrentThreadIfWeakPtr(weak_factory_.GetWeakPtr(), init_cb), | ||
| BindToCurrentThreadIfWeakPtr(weak_factory_.GetWeakPtr(), output_cb))); | ||
| } | ||
|
|
||
| void D3D11VideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer, | ||
| const DecodeCB& decode_cb) { | ||
| impl_task_runner_->PostTask( | ||
| FROM_HERE, base::BindOnce(&VideoDecoder::Decode, impl_weak_, buffer, | ||
| BindToCurrentThreadIfWeakPtr( | ||
| weak_factory_.GetWeakPtr(), decode_cb))); | ||
| } | ||
|
|
||
| void D3D11VideoDecoder::Reset(const base::Closure& closure) { | ||
| impl_task_runner_->PostTask( | ||
| FROM_HERE, base::BindOnce(&VideoDecoder::Reset, impl_weak_, | ||
| BindToCurrentThreadIfWeakPtr( | ||
| weak_factory_.GetWeakPtr(), closure))); | ||
| } | ||
|
|
||
| bool D3D11VideoDecoder::NeedsBitstreamConversion() const { | ||
| // Wrong thread, but it's okay. | ||
| return impl_->NeedsBitstreamConversion(); | ||
| } | ||
|
|
||
| bool D3D11VideoDecoder::CanReadWithoutStalling() const { | ||
| // Wrong thread, but it's okay. | ||
| return impl_->CanReadWithoutStalling(); | ||
| } | ||
|
|
||
| int D3D11VideoDecoder::GetMaxDecodeRequests() const { | ||
| // Wrong thread, but it's okay. | ||
| return impl_->GetMaxDecodeRequests(); | ||
| } | ||
|
|
||
| void D3D11VideoDecoder::OutputWithThreadHoppingRelease( | ||
| OutputWithReleaseMailboxCB output_cb, | ||
| VideoFrame::ReleaseMailboxCB impl_thread_cb, | ||
| const scoped_refptr<VideoFrame>& video_frame) { | ||
| // Called on our thread to output a video frame. Modify the release cb so | ||
| // that it jumps back to the impl thread. | ||
| output_cb.Run( | ||
| base::Bind(&D3D11VideoDecoder::OnMailboxReleased, | ||
| weak_factory_.GetWeakPtr(), std::move(impl_thread_cb)), | ||
| video_frame); | ||
| } | ||
|
|
||
| void D3D11VideoDecoder::OnMailboxReleased( | ||
| VideoFrame::ReleaseMailboxCB impl_thread_cb, | ||
| const gpu::SyncToken& token) { | ||
| impl_task_runner_->PostTask(FROM_HERE, base::Bind(impl_thread_cb, token)); | ||
| } | ||
|
|
||
| } // namespace media |
Oops, something went wrong.