Improve logging output for DecoderBuffer and VideoFrame

media/cdm/cdm_adapter.cc

 // Copyright 2015 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/cdm/cdm_adapter.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 643 matching lines @@
 
 void CdmAdapter::DecryptAndDecodeVideo(
     const scoped_refptr<DecoderBuffer>& encrypted,
     const VideoDecodeCB& video_decode_cb) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   cdm::InputBuffer input_buffer;
   std::vector<cdm::SubsampleEntry> subsamples;
   scoped_ptr<VideoFrameImpl> video_frame(new VideoFrameImpl());
 
+  DVLOG(5) << __FUNCTION__

[xhwang, 2016/01/05 17:29:11]

Move this to the beginning of this function?

Also, DVLOG(3) should be good here, if we don't log the binary data (see comment
above).

[jrummell, 2016/01/12 20:00:36]

Done.

+           << " encrypted: " << encrypted->AsHumanReadableString();
   ToCdmInputBuffer(encrypted, &subsamples, &input_buffer);
   cdm::Status status =
       cdm_->DecryptAndDecodeFrame(input_buffer, video_frame.get());
 
   if (status != cdm::kSuccess) {
     DVLOG(1) << __FUNCTION__ << " failed with cdm::Error " << status;
     video_decode_cb.Run(ToMediaDecryptorStatus(status), nullptr);
     return;
   }
 
   uint8_t* frame_data = video_frame->FrameBuffer()->Data();
   gfx::Size frame_size(video_frame->Size().width, video_frame->Size().height);
   scoped_refptr<VideoFrame> decoded_frame = VideoFrame::WrapExternalYuvData(
       PIXEL_FORMAT_YV12, frame_size, gfx::Rect(frame_size), natural_size_,
       video_frame->Stride(VideoFrameImpl::kYPlane),
       video_frame->Stride(VideoFrameImpl::kUPlane),
       video_frame->Stride(VideoFrameImpl::kVPlane),
       frame_data + video_frame->PlaneOffset(VideoFrameImpl::kYPlane),
       frame_data + video_frame->PlaneOffset(VideoFrameImpl::kUPlane),
       frame_data + video_frame->PlaneOffset(VideoFrameImpl::kVPlane),
       base::TimeDelta::FromMicroseconds(video_frame->Timestamp()));
+  DVLOG(5) << __FUNCTION__
+           << " decoded_frame: " << decoded_frame->AsHumanReadableString();

[xhwang, 2016/01/05 17:29:11]

We have only 5 cases of DVLOG(5) in the entire code base, which makes me feel we
shouldn't use DVLOG(5) for logs that are less useful. In this particular case,
this log is only useful when we have bugs in converting VideoFrames. After we
fix the bug, we probably never need this log anymore. So instead of having a
DVLOG(5) here, maybe we should only add it temporarily during debug when we need
it? 

[jrummell, 2016/01/12 20:00:36]

Done.

   video_decode_cb.Run(Decryptor::kSuccess, decoded_frame);
 }
 
 void CdmAdapter::ResetDecoder(StreamType stream_type) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   cdm_->ResetDecoder(ToCdmStreamType(stream_type));
 }
 
 void CdmAdapter::DeinitializeDecoder(StreamType stream_type) {
   DCHECK(task_runner_->BelongsToCurrentThread());
@@ skipping 252 matching lines @@
     result_frames->push_back(frame);
 
     data += frame_size;
     bytes_left -= frame_size;
   } while (bytes_left > 0);
 
   return true;
 }
 
 }  // namespace media