Improve logging output for DecoderBuffer and VideoFrame

media/base/decoder_buffer.cc

 // Copyright (c) 2012 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/base/decoder_buffer.h"
 
+#include "base/strings/string_number_conversions.h"
+
 namespace media {
 
 // Allocates a block of memory which is padded for use with the SIMD
 // optimizations used by FFmpeg.
 static uint8_t* AllocateFFmpegSafeBlock(int size) {
   uint8_t* const block = reinterpret_cast<uint8_t*>(base::AlignedAlloc(
       size + DecoderBuffer::kPaddingSize, DecoderBuffer::kAlignmentSize));
   memset(block + size, 0, DecoderBuffer::kPaddingSize);
   return block;
 }
@@ skipping 65 matching lines @@
   return make_scoped_refptr(new DecoderBuffer(NULL, 0, NULL, 0));
 }
 
 std::string DecoderBuffer::AsHumanReadableString() {
   if (end_of_stream()) {
     return "end of stream";
   }
 
   std::ostringstream s;
   s << "timestamp: " << timestamp_.InMicroseconds()
-    << " duration: " << duration_.InMicroseconds()
-    << " size: " << size_
-    << " side_data_size: " << side_data_size_
+    << " duration: " << duration_.InMicroseconds() << " size: " << size_
+    << " data: ";
+  if (size_ == 0 || !data_)
+    s << "<null>";
+  else if (size_ < 17)
+    s << base::HexEncode(data_.get(), size_);
+  else {
+    s << base::HexEncode(data_.get(), 8) << "..."
+      << base::HexEncode(data_.get() + size_ - 8, 8);

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

I still don't see a general use case for dumping the binary data. Note that
AsHumanReadableString() is a generic function and can be used in a lot of
places, most of which won't be interested in the binary data. 

When in the rare cases where we are actually interested, we can always manually
dump the binary data.

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

Done.

+  }
+  s << " side_data_size: " << side_data_size_
     << " is_key_frame: " << is_key_frame_
-    << " encrypted: " << (decrypt_config_ != NULL)
-    << " discard_padding (ms): (" << discard_padding_.first.InMilliseconds()
-    << ", " << discard_padding_.second.InMilliseconds() << ")";
+    << " encrypted: " << (decrypt_config_ != NULL) << " discard_padding (ms): ("
+    << discard_padding_.first.InMilliseconds() << ", "
+    << discard_padding_.second.InMilliseconds() << ")";
 
   if (decrypt_config_)
     s << " decrypt:" << (*decrypt_config_);
 
   return s.str();
 }
 
 void DecoderBuffer::set_timestamp(base::TimeDelta timestamp) {
   DCHECK(!end_of_stream());
   timestamp_ = timestamp;
 }
 
 void DecoderBuffer::CopySideDataFrom(const uint8_t* side_data,
                                      int side_data_size) {
   if (side_data_size > 0) {
     side_data_size_ = side_data_size;
     side_data_.reset(AllocateFFmpegSafeBlock(side_data_size_));
     memcpy(side_data_.get(), side_data, side_data_size_);
   } else {
     side_data_.reset();
     side_data_size_ = 0;
   }
 }
 
 }  // namespace media