VideoCapture: Sort VideoPixelFormat in order of preference

Review URL: https://codereview.chromium.org/660493002

Cr-Commit-Position: refs/heads/master@{#300315}

content/browser/renderer_host/media/video_capture_controller.cc

@@ -636,9 +636,6 @@ void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(
                                buffer_format.frame_size.height());
     UMA_HISTOGRAM_COUNTS("Media.VideoCapture.FrameRate",
                          buffer_format.frame_rate);
-    UMA_HISTOGRAM_ENUMERATION("Media.VideoCapture.PixelFormat",
-                              buffer_format.pixel_format,
-                              media::PIXEL_FORMAT_MAX);
     has_received_frames_ = true;
   }
 

media/video/capture/video_capture_types.cc

@@ -27,7 +27,7 @@ bool VideoCaptureFormat::IsValid() const {
          (frame_size.GetArea() < media::limits::kMaxCanvas) &&
          (frame_rate >= 0.0f) &&
          (frame_rate < media::limits::kMaxFramesPerSecond) &&
-         (pixel_format >= PIXEL_FORMAT_UNKNOWN) &&
+         (pixel_format >= 0) &&
          (pixel_format < PIXEL_FORMAT_MAX);
 }
 

media/video/capture/video_capture_types.h

@@ -16,18 +16,18 @@ namespace media {
 // shared with device manager.
 typedef int VideoCaptureSessionId;
 
-// Color formats from camera.
+// Color formats from camera. This list is sorted in order of preference.
 enum VideoPixelFormat {
-  PIXEL_FORMAT_UNKNOWN,  // Color format not set.
   PIXEL_FORMAT_I420,
-  PIXEL_FORMAT_YUY2,
+  PIXEL_FORMAT_YV12,
+  PIXEL_FORMAT_NV21,
   PIXEL_FORMAT_UYVY,
+  PIXEL_FORMAT_YUY2,
   PIXEL_FORMAT_RGB24,
   PIXEL_FORMAT_ARGB,
   PIXEL_FORMAT_MJPEG,
-  PIXEL_FORMAT_NV21,
-  PIXEL_FORMAT_YV12,
   PIXEL_FORMAT_TEXTURE,  // Capture format as a GL texture.
+  PIXEL_FORMAT_UNKNOWN,  // Color format not set.
   PIXEL_FORMAT_MAX,
 };
 

tools/metrics/histograms/histograms.xml

@@ -12361,6 +12361,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="Media.VideoCapture.PixelFormat" enum="CapturePixelFormat">
+  <obsolete>
+    Deprecated 10/2014 in Issue 660493002.
+  </obsolete>
   <owner>mcasas@chromium.org</owner>
   <summary>
     Pixel format provided by a Video Capture Device. The collection is made in
@@ -39977,6 +39980,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="6" label="MJPEG"/>
   <int value="7" label="NV21"/>
   <int value="8" label="YV12"/>
+  <int value="9" label="TEXTURE"/>
 </enum>
 
 <enum name="CaptureStartupResult" type="int">