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(3) << __FUNCTION__
+           << " encrypted: " << encrypted->AsHumanReadableString();

[xhwang, 2015/12/18 23:07:43]

I like AsHumanReadableString(). But I don't feel we should enable it here by
default. It will generate too much noise that could hide real useful logs...

[jrummell, 2015/12/22 01:30:43]

Changed to DVLOG(5), so you only see it if you enable everything.

   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(3) << __FUNCTION__
+           << " decoded_frame: " << decoded_frame->AsHumanReadableString();

[xhwang, 2015/12/18 23:07:44]

ditto

   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