| Index: media/mojo/services/mojo_demuxer_stream_adapter.cc
|
| diff --git a/media/mojo/services/mojo_demuxer_stream_adapter.cc b/media/mojo/services/mojo_demuxer_stream_adapter.cc
|
| index 649e2d35e92c1ba8222fcdaa768200d15cf9f02b..58ec1d19b1c806be09f4fea738baddec5b46ad8f 100644
|
| --- a/media/mojo/services/mojo_demuxer_stream_adapter.cc
|
| +++ b/media/mojo/services/mojo_demuxer_stream_adapter.cc
|
| @@ -24,17 +24,17 @@ MojoDemuxerStreamAdapter::MojoDemuxerStreamAdapter(
|
| stream_ready_cb_(stream_ready_cb),
|
| type_(UNKNOWN),
|
| weak_factory_(this) {
|
| - DVLOG(1) << __FUNCTION__;
|
| + DVLOG(1) << __func__;
|
| demuxer_stream_->Initialize(base::Bind(
|
| &MojoDemuxerStreamAdapter::OnStreamReady, weak_factory_.GetWeakPtr()));
|
| }
|
|
|
| MojoDemuxerStreamAdapter::~MojoDemuxerStreamAdapter() {
|
| - DVLOG(1) << __FUNCTION__;
|
| + DVLOG(1) << __func__;
|
| }
|
|
|
| void MojoDemuxerStreamAdapter::Read(const ReadCB& read_cb) {
|
| - DVLOG(3) << __FUNCTION__;
|
| + DVLOG(3) << __func__;
|
| // We shouldn't be holding on to a previous callback if a new Read() came in.
|
| DCHECK(read_cb_.is_null());
|
|
|
| @@ -90,7 +90,7 @@ void MojoDemuxerStreamAdapter::OnStreamReady(
|
| mojo::ScopedDataPipeConsumerHandle consumer_handle,
|
| mojom::AudioDecoderConfigPtr audio_config,
|
| mojom::VideoDecoderConfigPtr video_config) {
|
| - DVLOG(1) << __FUNCTION__;
|
| + DVLOG(1) << __func__;
|
| DCHECK_EQ(UNKNOWN, type_);
|
| DCHECK(consumer_handle.is_valid());
|
|
|
| @@ -109,7 +109,7 @@ void MojoDemuxerStreamAdapter::OnBufferReady(
|
| mojom::DecoderBufferPtr buffer,
|
| mojom::AudioDecoderConfigPtr audio_config,
|
| mojom::VideoDecoderConfigPtr video_config) {
|
| - DVLOG(3) << __FUNCTION__;
|
| + DVLOG(3) << __func__;
|
| DCHECK(!read_cb_.is_null());
|
| DCHECK_NE(type_, UNKNOWN);
|
|
|
|
|