Commit 7004a859 authored by Raymond Toy's avatar Raymond Toy Committed by Commit Bot

[Code Health] Convert PipelineStatusCB to PipelineStatusCallback

Convert more places including:
filters/decrypting_demuxer_stream
filters/decoder_selector

Also needed to pass a TimeDelta object by value to fix a presubmit error
about passing Time objects.

Bug: 1007799
Change-Id: I8f9b363a8a28dcbdae566e20d9cf73ca0820c768
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2092168
Commit-Queue: Raymond Toy <rtoy@chromium.org>
Reviewed-by: default avatarChrome Cunningham <chcunningham@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748989}
parent 61fcdce3
This diff is collapsed.
...@@ -198,7 +198,7 @@ void DecoderSelector<StreamType>::InitializeDecryptingDemuxerStream() { ...@@ -198,7 +198,7 @@ void DecoderSelector<StreamType>::InitializeDecryptingDemuxerStream() {
decrypting_demuxer_stream_->Initialize( decrypting_demuxer_stream_->Initialize(
stream_, cdm_context_, stream_, cdm_context_,
base::BindRepeating( base::BindOnce(
&DecoderSelector<StreamType>::OnDecryptingDemuxerStreamInitializeDone, &DecoderSelector<StreamType>::OnDecryptingDemuxerStreamInitializeDone,
weak_this_factory_.GetWeakPtr())); weak_this_factory_.GetWeakPtr()));
} }
......
...@@ -39,7 +39,7 @@ std::string DecryptingDemuxerStream::GetDisplayName() const { ...@@ -39,7 +39,7 @@ std::string DecryptingDemuxerStream::GetDisplayName() const {
void DecryptingDemuxerStream::Initialize(DemuxerStream* stream, void DecryptingDemuxerStream::Initialize(DemuxerStream* stream,
CdmContext* cdm_context, CdmContext* cdm_context,
const PipelineStatusCB& status_cb) { PipelineStatusCallback status_cb) {
DVLOG(2) << __func__; DVLOG(2) << __func__;
DCHECK(task_runner_->BelongsToCurrentThread()); DCHECK(task_runner_->BelongsToCurrentThread());
DCHECK_EQ(state_, kUninitialized) << state_; DCHECK_EQ(state_, kUninitialized) << state_;
...@@ -49,7 +49,7 @@ void DecryptingDemuxerStream::Initialize(DemuxerStream* stream, ...@@ -49,7 +49,7 @@ void DecryptingDemuxerStream::Initialize(DemuxerStream* stream,
weak_this_ = weak_factory_.GetWeakPtr(); weak_this_ = weak_factory_.GetWeakPtr();
demuxer_stream_ = stream; demuxer_stream_ = stream;
init_cb_ = BindToCurrentLoop(status_cb); init_cb_ = BindToCurrentLoop(std::move(status_cb));
InitializeDecoderConfig(); InitializeDecoderConfig();
......
...@@ -43,7 +43,7 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream { ...@@ -43,7 +43,7 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
// |stream| must be encrypted and |cdm_context| must be non-null. // |stream| must be encrypted and |cdm_context| must be non-null.
void Initialize(DemuxerStream* stream, void Initialize(DemuxerStream* stream,
CdmContext* cdm_context, CdmContext* cdm_context,
const PipelineStatusCB& status_cb); PipelineStatusCallback status_cb);
// Cancels all pending operations and fires all pending callbacks. If in // Cancels all pending operations and fires all pending callbacks. If in
// kPendingDemuxerRead or kPendingDecrypt state, waits for the pending // kPendingDemuxerRead or kPendingDecrypt state, waits for the pending
...@@ -149,7 +149,7 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream { ...@@ -149,7 +149,7 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
State state_ = kUninitialized; State state_ = kUninitialized;
PipelineStatusCB init_cb_; PipelineStatusCallback init_cb_;
ReadCB read_cb_; ReadCB read_cb_;
base::OnceClosure reset_cb_; base::OnceClosure reset_cb_;
......
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