MediaLog: Log selected audio/video decoder name.

media/filters/decoder_stream.cc

 // Copyright 2014 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/filters/decoder_stream.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/location.h"
@@ skipping 24 matching lines @@
 
 template <>
 const char* GetTraceString<DemuxerStream::AUDIO>() {
   return "DecoderStream<AUDIO>::Decode";
 }
 
 template <DemuxerStream::Type StreamType>
 DecoderStream<StreamType>::DecoderStream(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     ScopedVector<Decoder> decoders,
-    const SetDecryptorReadyCB& set_decryptor_ready_cb)
+    const SetDecryptorReadyCB& set_decryptor_ready_cb,
+    const scoped_refptr<MediaLog>& media_log)
     : task_runner_(task_runner),
+      media_log_(media_log),
       state_(STATE_UNINITIALIZED),
       stream_(NULL),
       low_delay_(false),
       decoder_selector_(
           new DecoderSelector<StreamType>(task_runner,
                                           decoders.Pass(),
                                           set_decryptor_ready_cb)),
       active_splice_(false),
       decoding_eos_(false),
       pending_decode_requests_(0),
@@ skipping 172 matching lines @@
   if (!selected_decoder) {
     state_ = STATE_UNINITIALIZED;
     base::ResetAndReturn(&init_cb_).Run(false);
     return;
   }
 
   state_ = STATE_NORMAL;
   decoder_ = selected_decoder.Pass();
   decrypting_demuxer_stream_ = decrypting_demuxer_stream.Pass();
 
+  if (decrypting_demuxer_stream_)
+    media_log_->SetStringProperty("decrypting_demuxer_stream", "yes");

[DaleCurtis, 2014/09/08 18:41:39]

Always set w/ yes/no ?

[xhwang, 2014/09/08 20:12:10]

Changed to binary property.

+
+  if (StreamType == DemuxerStream::VIDEO)
+    media_log_->SetStringProperty("video_decoder", decoder_->GetDisplayName());
+  else if (StreamType == DemuxerStream::AUDIO)
+    media_log_->SetStringProperty("audio_decoder", decoder_->GetDisplayName());
+  else
+    NOTREACHED();

[DaleCurtis, 2014/09/08 18:41:39]

I take it TEXT type streams never reach this point?

[xhwang, 2014/09/08 20:12:10]

Using ToString() now so the check is moved to compile time.

+
   if (StreamTraits::NeedsBitstreamConversion(decoder_.get()))
     stream_->EnableBitstreamConverter();
   base::ResetAndReturn(&init_cb_).Run(true);
 }
 
 template <DemuxerStream::Type StreamType>
 void DecoderStream<StreamType>::SatisfyRead(
     Status status,
     const scoped_refptr<Output>& output) {
   DCHECK(!read_cb_.is_null());
@@ skipping 292 matching lines @@
   }
 
   // The resetting process will be continued in OnDecoderReinitialized().
   ReinitializeDecoder();
 }
 
 template class DecoderStream<DemuxerStream::VIDEO>;
 template class DecoderStream<DemuxerStream::AUDIO>;
 
 }  // namespace media