media: Output modifier as hex.

Modifier is most meaningful as a hex
value as it is a bitfield.

BUG=none
TEST=none

Change-Id: I9cc35aa773b5360a2ffa8f3584e554b351263247
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363721
Commit-Queue: Fritz Koenig <frkoenig@chromium.org>
Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Auto-Submit: Fritz Koenig <frkoenig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800849}

media/base/video_frame_layout.cc

@@ -172,7 +172,7 @@ std::ostream& operator<<(std::ostream& ostream,
           << VectorToString(layout.planes())
           << ", is_multi_planar: " << layout.is_multi_planar()
           << ", buffer_addr_align: " << layout.buffer_addr_align()
-          << ", modifier: " << layout.modifier() << ")";
+          << ", modifier: 0x" << std::hex << layout.modifier() << ")";
   return ostream;
 }
 

media/base/video_frame_layout_unittest.cc

@@ -35,6 +35,12 @@ std::vector<ColorPlaneLayout> CreatePlanes(const std::vector<int32_t>& strides,
   return planes;
 }
 
+static std::string ModifierToHexString(uint64_t modifier) {
+  std::stringstream stream;
+  stream << "0x" << std::hex << modifier;
+  return stream.str();
+}
+
 }  // namespace
 
 TEST(VideoFrameLayout, CreateI420) {
@@ -208,7 +214,7 @@ TEST(VideoFrameLayout, ToStringWithPlanes) {
   std::ostringstream ostream;
   ostream << *layout;
   const std::string kNoModifier =
-      std::to_string(gfx::NativePixmapHandle::kNoModifier);
+      ModifierToHexString(gfx::NativePixmapHandle::kNoModifier);
   EXPECT_EQ(ostream.str(),
             "VideoFrameLayout(format: PIXEL_FORMAT_I420, coded_size: 320x180, "
             "planes (stride, offset, size): [(384, 0, 0), (192, 0, 0), "
@@ -229,7 +235,7 @@ TEST(VideoFrameLayout, ToStringMultiPlanar) {
   std::ostringstream ostream;
   ostream << *layout;
   const std::string kNoModifier =
-      std::to_string(gfx::NativePixmapHandle::kNoModifier);
+      ModifierToHexString(gfx::NativePixmapHandle::kNoModifier);
   EXPECT_EQ(ostream.str(),
             "VideoFrameLayout(format: PIXEL_FORMAT_NV12, coded_size: 320x180, "
             "planes (stride, offset, size): [(384, 0, 100), (192, 100, 100)], "
@@ -246,7 +252,7 @@ TEST(VideoFrameLayout, ToString) {
   std::ostringstream ostream;
   ostream << *layout;
   const std::string kNoModifier =
-      std::to_string(gfx::NativePixmapHandle::kNoModifier);
+      ModifierToHexString(gfx::NativePixmapHandle::kNoModifier);
   EXPECT_EQ(ostream.str(),
             "VideoFrameLayout(format: PIXEL_FORMAT_NV12, coded_size: 320x180, "
             "planes (stride, offset, size): [(0, 0, 0), (0, 0, 0)], "

media/gpu/v4l2/v4l2_device_unittest.cc

@@ -66,6 +66,12 @@ v4l2_format V4L2FormatVideoOutputMplane(uint32_t width,
   return format;
 }
 
+static std::string ModifierToHexString(uint64_t modifier) {
+  std::stringstream stream;
+  stream << "0x" << std::hex << modifier;
+  return stream.str();
+}
+
 }  // namespace
 
 namespace media {
@@ -86,7 +92,7 @@ TEST(V4L2DeviceTest, V4L2FormatToVideoFrameLayoutNV12) {
   std::ostringstream ostream;
   ostream << *layout;
   const std::string kNoModifierStr =
-      std::to_string(gfx::NativePixmapHandle::kNoModifier);
+      ModifierToHexString(gfx::NativePixmapHandle::kNoModifier);
   EXPECT_EQ(
       ostream.str(),
       "VideoFrameLayout(format: PIXEL_FORMAT_NV12, coded_size: 300x180, "
@@ -111,7 +117,7 @@ TEST(V4L2DeviceTest, V4L2FormatToVideoFrameLayoutNV12M) {
   std::ostringstream ostream;
   ostream << *layout;
   const std::string kNoModifierStr =
-      std::to_string(gfx::NativePixmapHandle::kNoModifier);
+      ModifierToHexString(gfx::NativePixmapHandle::kNoModifier);
   EXPECT_EQ(
       ostream.str(),
       "VideoFrameLayout(format: PIXEL_FORMAT_NV12, coded_size: 300x180, "
@@ -135,7 +141,7 @@ TEST(V4L2DeviceTest, V4L2FormatToVideoFrameLayoutYUV420) {
   std::ostringstream ostream;
   ostream << *layout;
   const std::string kNoModifierStr =
-      std::to_string(gfx::NativePixmapHandle::kNoModifier);
+      ModifierToHexString(gfx::NativePixmapHandle::kNoModifier);
   EXPECT_EQ(ostream.str(),
             "VideoFrameLayout(format: PIXEL_FORMAT_I420, coded_size: 300x180, "
             "planes (stride, offset, size): [(320, 0, 86400), (160, 57600, "