Reland: Video Capture: extract storage info from pixel format in VideoCaptureFormat.

content/browser/media/media_internals_unittest.cc

 // Copyright (c) 2011 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 "content/browser/media/media_internals.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/run_loop.h"
@@ skipping 134 matching lines @@
 TEST_F(MediaInternalsVideoCaptureDeviceTest,
        VideoCaptureFormatStringIsInExpectedFormat) {
   // Since media internals will send video capture capabilities to JavaScript in
   // an expected format and there are no public methods for accessing the
   // resolutions, frame rates or pixel formats, this test checks that the format
   // has not changed. If the test fails because of the changed format, it should
   // be updated at the same time as the media internals JS files.
   const float kFrameRate = 30.0f;
   const gfx::Size kFrameSize(1280, 720);
   const media::VideoPixelFormat kPixelFormat = media::PIXEL_FORMAT_I420;
-  const media::VideoCaptureFormat capture_format(
-      kFrameSize, kFrameRate, kPixelFormat);
-  const std::string expected_string =
-      base::StringPrintf("resolution: %s, fps: %.3f, pixel format: %s",
-                         kFrameSize.ToString().c_str(),
-                         kFrameRate,
-                         media::VideoCaptureFormat::PixelFormatToString(
-                              kPixelFormat).c_str());
+  const media::VideoPixelStorage kPixelStorage = media::PIXEL_STORAGE_CPU;
+  const media::VideoCaptureFormat capture_format(kFrameSize, kFrameRate,
+                                                 kPixelFormat, kPixelStorage);
+  const std::string expected_string = base::StringPrintf(
+      "(%s)@%.3ffps, pixel format: %s storage: %s.",
+      kFrameSize.ToString().c_str(), kFrameRate,
+      media::VideoCaptureFormat::PixelFormatToString(kPixelFormat).c_str(),
+      media::VideoCaptureFormat::PixelStorageToString(kPixelStorage).c_str());
   EXPECT_EQ(expected_string, capture_format.ToString());
 }
 
 TEST_F(MediaInternalsVideoCaptureDeviceTest,
        NotifyVideoCaptureDeviceCapabilitiesEnumerated) {
   const int kWidth = 1280;
   const int kHeight = 720;
   const float kFrameRate = 30.0f;
   const media::VideoPixelFormat kPixelFormat = media::PIXEL_FORMAT_I420;
   const media::VideoCaptureFormat format_hd({kWidth, kHeight},
@@ skipping 126 matching lines @@
   ExpectStatus("closed");
 }
 
 INSTANTIATE_TEST_CASE_P(
     MediaInternalsAudioLogTest, MediaInternalsAudioLogTest, testing::Values(
         media::AudioLogFactory::AUDIO_INPUT_CONTROLLER,
         media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER,
         media::AudioLogFactory::AUDIO_OUTPUT_STREAM));
 
 }  // namespace content