Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 600c054a63fd5257aa6a4aa674072bd1dddb3e66..03787dea3acabb063b85b42931086dfd390888de 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -15812,6 +15812,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="Media.VideoFormat" enum="VideoFormat">
+  <obsolete>
+    Replaced by Media.VideoFramePixelFormat 05/2015.
+  </obsolete>
   <owner>mcasas@chromium.org</owner>
   <summary>Pixel format used in HTML5 video. Emitted on video load.</summary>
 </histogram>
@@ -15823,6 +15826,11 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="Media.VideoFramePixelFormat" enum="VideoFramePixelFormat">
+  <owner>mcasas@chromium.org</owner>
+  <summary>Pixel format used in HTML5 video. Emitted on video load.</summary>
+</histogram>
+
 <histogram name="Media.VideoPixelFormat" enum="VideoPixelFormat">
   <obsolete>
     Replaced by Media.VideoFormat 05/2015.
@@ -66558,6 +66566,9 @@ To add a new entry, add it with any value and run test to compute valid value.
 </enum>
 
 <enum name="VideoFormat" type="int">
+  <obsolete>
+    Deprecated as of 05/2015. Substituted by VideoFramePixelFormat.
+  </obsolete>
   <int value="0" label="UNKNOWN"/>
   <int value="1" label="YV12"/>
   <int value="2" label="I420"/>
@@ -66576,6 +66587,18 @@ To add a new entry, add it with any value and run test to compute valid value.
   <int value="2" label="HD Rec 709"/>
 </enum>
 
+<enum name="VideoFramePixelFormat" type="int">
+  <int value="0" label="UNKNOWN"/>
+  <int value="1" label="YV12"/>
+  <int value="2" label="I420"/>
+  <int value="3" label="YV16"/>
+  <int value="4" label="YV12A"/>
+  <int value="5" label="YV24"/>
+  <int value="6" label="NV12 (Mac only)"/>
+  <int value="7" label="ARGB"/>
+  <int value="8" label="xRGB"/>
+</enum>
+
 <enum name="VideoPixelFormat" type="int">
   <obsolete>
     Deprecated as of 05/2015. Substituted by VideoFormat.