Index: media/mojo/services/mojo_video_decoder_service.cc |
diff --git a/media/mojo/services/mojo_video_decoder_service.cc b/media/mojo/services/mojo_video_decoder_service.cc |
index 8ec218a0ecf9bced3ee81a38b2f28e948b85bdf5..54772cf4be43c87cd93f9ed2bf03fedcc1435cdc 100644 |
--- a/media/mojo/services/mojo_video_decoder_service.cc |
+++ b/media/mojo/services/mojo_video_decoder_service.cc |
@@ -31,15 +31,16 @@ MojoVideoDecoderService::~MojoVideoDecoderService() {} |
void MojoVideoDecoderService::Construct( |
mojom::VideoDecoderClientAssociatedPtrInfo client, |
- mojo::ScopedDataPipeConsumerHandle decoder_buffer_pipe) { |
- DVLOG(1) << __FUNCTION__; |
+ mojo::ScopedDataPipeConsumerHandle decoder_buffer_pipe, |
+ mojom::CommandBufferIdPtr command_buffer_id) { |
+ DVLOG(1) << __func__; |
+ // TODO(sandersd): Enter an error state. |
if (decoder_) |
return; |
- // TODO(sandersd): Provide callback for requesting a GpuCommandBufferStub. |
decoder_ = mojo_media_client_->CreateVideoDecoder( |
- base::ThreadTaskRunnerHandle::Get()); |
+ base::ThreadTaskRunnerHandle::Get(), std::move(command_buffer_id)); |
client_.Bind(std::move(client)); |
@@ -50,7 +51,7 @@ void MojoVideoDecoderService::Construct( |
void MojoVideoDecoderService::Initialize(mojom::VideoDecoderConfigPtr config, |
bool low_delay, |
const InitializeCallback& callback) { |
- DVLOG(1) << __FUNCTION__; |
+ DVLOG(1) << __func__; |
if (!decoder_) { |
callback.Run(false, false, 1); |
@@ -66,7 +67,7 @@ void MojoVideoDecoderService::Initialize(mojom::VideoDecoderConfigPtr config, |
void MojoVideoDecoderService::Decode(mojom::DecoderBufferPtr buffer, |
const DecodeCallback& callback) { |
- DVLOG(2) << __FUNCTION__; |
+ DVLOG(2) << __func__; |
if (!decoder_) { |
callback.Run(DecodeStatus::DECODE_ERROR); |
@@ -79,7 +80,7 @@ void MojoVideoDecoderService::Decode(mojom::DecoderBufferPtr buffer, |
} |
void MojoVideoDecoderService::Reset(const ResetCallback& callback) { |
- DVLOG(1) << __FUNCTION__; |
+ DVLOG(1) << __func__; |
if (!decoder_) { |
callback.Run(); |
@@ -93,7 +94,7 @@ void MojoVideoDecoderService::Reset(const ResetCallback& callback) { |
void MojoVideoDecoderService::OnDecoderInitialized( |
const InitializeCallback& callback, |
bool success) { |
- DVLOG(1) << __FUNCTION__; |
+ DVLOG(1) << __func__; |
DCHECK(decoder_); |
callback.Run(success, decoder_->NeedsBitstreamConversion(), |
decoder_->GetMaxDecodeRequests()); |
@@ -116,20 +117,20 @@ void MojoVideoDecoderService::OnDecoderRead( |
void MojoVideoDecoderService::OnDecoderDecoded(const DecodeCallback& callback, |
DecodeStatus status) { |
- DVLOG(2) << __FUNCTION__; |
+ DVLOG(2) << __func__; |
DCHECK(decoder_); |
DCHECK(decoder_->CanReadWithoutStalling()); |
callback.Run(status); |
} |
void MojoVideoDecoderService::OnDecoderReset(const ResetCallback& callback) { |
- DVLOG(1) << __FUNCTION__; |
+ DVLOG(1) << __func__; |
callback.Run(); |
} |
void MojoVideoDecoderService::OnDecoderOutput( |
const scoped_refptr<VideoFrame>& frame) { |
- DVLOG(2) << __FUNCTION__; |
+ DVLOG(2) << __func__; |
DCHECK(client_); |
client_->OnVideoFrameDecoded(mojom::VideoFrame::From(frame)); |
} |