Add UMA stats for audio/video containers.

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 6c10f8d5fa1af7ce725b5802f79ed1251d803db6..d92c14a1c8e8e40ba290bc15f0dfc41ddcedc53f 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -998,6 +998,13 @@ other types of suffix sets.
   <summary>Audio codec used in HTML5 media.</summary>
 </histogram>
 
+<histogram name="Media.DetectedContainer" enum="FFmpegContainers">
+  <summary>
+    Container used for HTML5 media. Names with a * are guesses as FFmpeg was not
+    configured to handle that format.
+  </summary>
+</histogram>
+
 <histogram name="Media.DetectedVideoCodec" enum="FFmpegCodecs">
   <summary>Video codec used in HTML5 media.</summary>
 </histogram>
@@ -8828,6 +8835,455 @@ other types of suffix sets.
   <int value="1950507339" label="TAK"/>
 </enum>
 
+<enum name="FFmpegContainers" type="int">
+  <int value="0" label="UNKNOWN"/>
+  <int value="1" label="UNKNOWN*"/>
+  <int value="2" label="4XM"/>
+  <int value="3" label="4XM*"/>
+  <int value="4" label="AAC"/>
+  <int value="5" label="AAC*"/>
+  <int value="6" label="AC3"/>
+  <int value="7" label="AC3*"/>
+  <int value="8" label="EAC3"/>
+  <int value="9" label="EAC3*"/>
+  <int value="10" label="ACT"/>
+  <int value="11" label="ACT*"/>
+  <int value="12" label="ADX"/>
+  <int value="13" label="ADX*"/>
+  <int value="14" label="AEA"/>
+  <int value="15" label="AEA*"/>
+  <int value="16" label="AFC"/>
+  <int value="17" label="AFC*"/>
+  <int value="18" label="AIFF"/>
+  <int value="19" label="AIFF*"/>
+  <int value="20" label="AMR"/>
+  <int value="21" label="AMR*"/>
+  <int value="22" label="ANM"/>
+  <int value="23" label="ANM*"/>
+  <int value="24" label="APC"/>
+  <int value="25" label="APC*"/>
+  <int value="26" label="APE"/>
+  <int value="27" label="APE*"/>
+  <int value="28" label="AQTITLE"/>
+  <int value="29" label="AQTITLE*"/>
+  <int value="30" label="ASF"/>
+  <int value="31" label="ASF*"/>
+  <int value="32" label="ASS"/>
+  <int value="33" label="ASS*"/>
+  <int value="34" label="AST"/>
+  <int value="35" label="AST*"/>
+  <int value="36" label="AU"/>
+  <int value="37" label="AU*"/>
+  <int value="38" label="AVI"/>
+  <int value="39" label="AVI*"/>
+  <int value="40" label="AVISYNTH"/>
+  <int value="41" label="AVISYNTH*"/>
+  <int value="42" label="AVR"/>
+  <int value="43" label="AVR*"/>
+  <int value="44" label="AVS"/>
+  <int value="45" label="AVS*"/>
+  <int value="46" label="BETHSOFTVID"/>
+  <int value="47" label="BETHSOFTVID*"/>
+  <int value="48" label="BFI"/>
+  <int value="49" label="BFI*"/>
+  <int value="50" label="BINK"/>
+  <int value="51" label="BINK*"/>
+  <int value="52" label="BIN"/>
+  <int value="53" label="BIN*"/>
+  <int value="54" label="XBIN"/>
+  <int value="55" label="XBIN*"/>
+  <int value="56" label="ADF"/>
+  <int value="57" label="ADF*"/>
+  <int value="58" label="IDF"/>
+  <int value="59" label="IDF*"/>
+  <int value="60" label="BIT"/>
+  <int value="61" label="BIT*"/>
+  <int value="62" label="BMV"/>
+  <int value="63" label="BMV*"/>
+  <int value="64" label="BRSTM"/>
+  <int value="65" label="BRSTM*"/>
+  <int value="66" label="C93"/>
+  <int value="67" label="C93*"/>
+  <int value="68" label="CAF"/>
+  <int value="69" label="CAF*"/>
+  <int value="70" label="CDG"/>
+  <int value="71" label="CDG*"/>
+  <int value="72" label="CDXL"/>
+  <int value="73" label="CDXL*"/>
+  <int value="74" label="CONCAT"/>
+  <int value="75" label="CONCAT*"/>
+  <int value="76" label="DAUD"/>
+  <int value="77" label="DAUD*"/>
+  <int value="78" label="DFA"/>
+  <int value="79" label="DFA*"/>
+  <int value="80" label="DSICIN"/>
+  <int value="81" label="DSICIN*"/>
+  <int value="82" label="DTS"/>
+  <int value="83" label="DTS*"/>
+  <int value="84" label="DTSHD"/>
+  <int value="85" label="DTSHD*"/>
+  <int value="86" label="DV"/>
+  <int value="87" label="DV*"/>
+  <int value="88" label="DXA"/>
+  <int value="89" label="DXA*"/>
+  <int value="90" label="EA_CDATA"/>
+  <int value="91" label="EA_CDATA*"/>
+  <int value="92" label="EA"/>
+  <int value="93" label="EA*"/>
+  <int value="94" label="EPAF"/>
+  <int value="95" label="EPAF*"/>
+  <int value="96" label="FFM"/>
+  <int value="97" label="FFM*"/>
+  <int value="98" label="FFMETADATA"/>
+  <int value="99" label="FFMETADATA*"/>
+  <int value="100" label="FILMSTRIP"/>
+  <int value="101" label="FILMSTRIP*"/>
+  <int value="102" label="FLAC"/>
+  <int value="103" label="FLAC*"/>
+  <int value="104" label="FLIC"/>
+  <int value="105" label="FLIC*"/>
+  <int value="106" label="FLV"/>
+  <int value="107" label="FLV*"/>
+  <int value="108" label="FRM"/>
+  <int value="109" label="FRM*"/>
+  <int value="110" label="G722"/>
+  <int value="111" label="G722*"/>
+  <int value="112" label="G723_1"/>
+  <int value="113" label="G723_1*"/>
+  <int value="114" label="G729"/>
+  <int value="115" label="G729*"/>
+  <int value="116" label="GIF"/>
+  <int value="117" label="GIF*"/>
+  <int value="118" label="GSM"/>
+  <int value="119" label="GSM*"/>
+  <int value="120" label="GXF"/>
+  <int value="121" label="GXF*"/>
+  <int value="122" label="HLS"/>
+  <int value="123" label="HLS*"/>
+  <int value="124" label="ICO"/>
+  <int value="125" label="ICO*"/>
+  <int value="126" label="IDCIN"/>
+  <int value="127" label="IDCIN*"/>
+  <int value="128" label="ROQ"/>
+  <int value="129" label="ROQ*"/>
+  <int value="130" label="IFF"/>
+  <int value="131" label="IFF*"/>
+  <int value="132" label="ILBC"/>
+  <int value="133" label="ILBC*"/>
+  <int value="134" label="IMAGE2"/>
+  <int value="135" label="IMAGE2*"/>
+  <int value="136" label="IMAGE2PIPE"/>
+  <int value="137" label="IMAGE2PIPE*"/>
+  <int value="138" label="INGENIENT"/>
+  <int value="139" label="INGENIENT*"/>
+  <int value="140" label="IPMOVIE"/>
+  <int value="141" label="IPMOVIE*"/>
+  <int value="142" label="IRCAM"/>
+  <int value="143" label="IRCAM*"/>
+  <int value="144" label="ISS"/>
+  <int value="145" label="ISS*"/>
+  <int value="146" label="IV8"/>
+  <int value="147" label="IV8*"/>
+  <int value="148" label="IVF"/>
+  <int value="149" label="IVF*"/>
+  <int value="150" label="JACOSUB"/>
+  <int value="151" label="JACOSUB*"/>
+  <int value="152" label="JV"/>
+  <int value="153" label="JV*"/>
+  <int value="154" label="LIBMODPLUG"/>
+  <int value="155" label="LIBMODPLUG*"/>
+  <int value="156" label="LIBNUT"/>
+  <int value="157" label="LIBNUT*"/>
+  <int value="158" label="LMLM4"/>
+  <int value="159" label="LMLM4*"/>
+  <int value="160" label="LOAS"/>
+  <int value="161" label="LOAS*"/>
+  <int value="162" label="LVF"/>
+  <int value="163" label="LVF*"/>
+  <int value="164" label="LXF"/>
+  <int value="165" label="LXF*"/>
+  <int value="166" label="WEBM"/>
+  <int value="167" label="WEBM*"/>
+  <int value="168" label="MGSTS"/>
+  <int value="169" label="MGSTS*"/>
+  <int value="170" label="MICRODVD"/>
+  <int value="171" label="MICRODVD*"/>
+  <int value="172" label="MM"/>
+  <int value="173" label="MM*"/>
+  <int value="174" label="MMF"/>
+  <int value="175" label="MMF*"/>
+  <int value="176" label="MOV"/>
+  <int value="177" label="MOV*"/>
+  <int value="178" label="MP3"/>
+  <int value="179" label="MP3*"/>
+  <int value="180" label="MPC8"/>
+  <int value="181" label="MPC8*"/>
+  <int value="182" label="MPC"/>
+  <int value="183" label="MPC*"/>
+  <int value="184" label="MPEG"/>
+  <int value="185" label="MPEG*"/>
+  <int value="186" label="VOBSUB"/>
+  <int value="187" label="VOBSUB*"/>
+  <int value="188" label="MPEGTS"/>
+  <int value="189" label="MPEGTS*"/>
+  <int value="190" label="MPEGTSRAW"/>
+  <int value="191" label="MPEGTSRAW*"/>
+  <int value="192" label="MPL2"/>
+  <int value="193" label="MPL2*"/>
+  <int value="194" label="MPSUB"/>
+  <int value="195" label="MPSUB*"/>
+  <int value="196" label="MSNWCTCP"/>
+  <int value="197" label="MSNWCTCP*"/>
+  <int value="198" label="MTV"/>
+  <int value="199" label="MTV*"/>
+  <int value="200" label="MV"/>
+  <int value="201" label="MV*"/>
+  <int value="202" label="MVI"/>
+  <int value="203" label="MVI*"/>
+  <int value="204" label="MXF"/>
+  <int value="205" label="MXF*"/>
+  <int value="206" label="MXG"/>
+  <int value="207" label="MXG*"/>
+  <int value="208" label="NC"/>
+  <int value="209" label="NC*"/>
+  <int value="210" label="NISTSPHERE"/>
+  <int value="211" label="NISTSPHERE*"/>
+  <int value="212" label="NSV"/>
+  <int value="213" label="NSV*"/>
+  <int value="214" label="NUT"/>
+  <int value="215" label="NUT*"/>
+  <int value="216" label="NUV"/>
+  <int value="217" label="NUV*"/>
+  <int value="218" label="OGG"/>
+  <int value="219" label="OGG*"/>
+  <int value="220" label="OMA"/>
+  <int value="221" label="OMA*"/>
+  <int value="222" label="PAF"/>
+  <int value="223" label="PAF*"/>
+  <int value="224" label="F64BE"/>
+  <int value="225" label="F64BE*"/>
+  <int value="226" label="F64LE"/>
+  <int value="227" label="F64LE*"/>
+  <int value="228" label="F32BE"/>
+  <int value="229" label="F32BE*"/>
+  <int value="230" label="F32LE"/>
+  <int value="231" label="F32LE*"/>
+  <int value="232" label="S32BE"/>
+  <int value="233" label="S32BE*"/>
+  <int value="234" label="S32LE"/>
+  <int value="235" label="S32LE*"/>
+  <int value="236" label="S24BE"/>
+  <int value="237" label="S24BE*"/>
+  <int value="238" label="S24LE"/>
+  <int value="239" label="S24LE*"/>
+  <int value="240" label="S16BE"/>
+  <int value="241" label="S16BE*"/>
+  <int value="242" label="S16LE"/>
+  <int value="243" label="S16LE*"/>
+  <int value="244" label="S8"/>
+  <int value="245" label="S8*"/>
+  <int value="246" label="U32BE"/>
+  <int value="247" label="U32BE*"/>
+  <int value="248" label="U32LE"/>
+  <int value="249" label="U32LE*"/>
+  <int value="250" label="U24BE"/>
+  <int value="251" label="U24BE*"/>
+  <int value="252" label="U24LE"/>
+  <int value="253" label="U24LE*"/>
+  <int value="254" label="U16BE"/>
+  <int value="255" label="U16BE*"/>
+  <int value="256" label="U16LE"/>
+  <int value="257" label="U16LE*"/>
+  <int value="258" label="U8"/>
+  <int value="259" label="U8*"/>
+  <int value="260" label="ALAW"/>
+  <int value="261" label="ALAW*"/>
+  <int value="262" label="MULAW"/>
+  <int value="263" label="MULAW*"/>
+  <int value="264" label="PJS"/>
+  <int value="265" label="PJS*"/>
+  <int value="266" label="PMP"/>
+  <int value="267" label="PMP*"/>
+  <int value="268" label="PSXSTR"/>
+  <int value="269" label="PSXSTR*"/>
+  <int value="270" label="PVA"/>
+  <int value="271" label="PVA*"/>
+  <int value="272" label="PVF"/>
+  <int value="273" label="PVF*"/>
+  <int value="274" label="QCP"/>
+  <int value="275" label="QCP*"/>
+  <int value="276" label="R3D"/>
+  <int value="277" label="R3D*"/>
+  <int value="278" label="LATM"/>
+  <int value="279" label="LATM*"/>
+  <int value="280" label="MLP"/>
+  <int value="281" label="MLP*"/>
+  <int value="282" label="TRUEHD"/>
+  <int value="283" label="TRUEHD*"/>
+  <int value="284" label="SHN"/>
+  <int value="285" label="SHN*"/>
+  <int value="286" label="RAWVIDEO"/>
+  <int value="287" label="RAWVIDEO*"/>
+  <int value="288" label="REALTEXT"/>
+  <int value="289" label="REALTEXT*"/>
+  <int value="290" label="RL2"/>
+  <int value="291" label="RL2*"/>
+  <int value="292" label="RM"/>
+  <int value="293" label="RM*"/>
+  <int value="294" label="RDT"/>
+  <int value="295" label="RDT*"/>
+  <int value="296" label="RPL"/>
+  <int value="297" label="RPL*"/>
+  <int value="298" label="RSO"/>
+  <int value="299" label="RSO*"/>
+  <int value="300" label="SDP"/>
+  <int value="301" label="SDP*"/>
+  <int value="302" label="RTP"/>
+  <int value="303" label="RTP*"/>
+  <int value="304" label="RTSP"/>
+  <int value="305" label="RTSP*"/>
+  <int value="306" label="SAMI"/>
+  <int value="307" label="SAMI*"/>
+  <int value="308" label="SAP"/>
+  <int value="309" label="SAP*"/>
+  <int value="310" label="SBG"/>
+  <int value="311" label="SBG*"/>
+  <int value="312" label="FILM_CPK"/>
+  <int value="313" label="FILM_CPK*"/>
+  <int value="314" label="VMD"/>
+  <int value="315" label="VMD*"/>
+  <int value="316" label="SIFF"/>
+  <int value="317" label="SIFF*"/>
+  <int value="318" label="SMK"/>
+  <int value="319" label="SMK*"/>
+  <int value="320" label="SMJPEG"/>
+  <int value="321" label="SMJPEG*"/>
+  <int value="322" label="SMUSH"/>
+  <int value="323" label="SMUSH*"/>
+  <int value="324" label="SOL"/>
+  <int value="325" label="SOL*"/>
+  <int value="326" label="SOX"/>
+  <int value="327" label="SOX*"/>
+  <int value="328" label="SPDIF"/>
+  <int value="329" label="SPDIF*"/>
+  <int value="330" label="SRT"/>
+  <int value="331" label="SRT*"/>
+  <int value="332" label="SUBVIEWER1"/>
+  <int value="333" label="SUBVIEWER1*"/>
+  <int value="334" label="SUBVIEWER"/>
+  <int value="335" label="SUBVIEWER*"/>
+  <int value="336" label="SWF"/>
+  <int value="337" label="SWF*"/>
+  <int value="338" label="TAK"/>
+  <int value="339" label="TAK*"/>
+  <int value="340" label="TEDCAPTIONS"/>
+  <int value="341" label="TEDCAPTIONS*"/>
+  <int value="342" label="THP"/>
+  <int value="343" label="THP*"/>
+  <int value="344" label="TIERTEXSEQ"/>
+  <int value="345" label="TIERTEXSEQ*"/>
+  <int value="346" label="TMV"/>
+  <int value="347" label="TMV*"/>
+  <int value="348" label="TTA"/>
+  <int value="349" label="TTA*"/>
+  <int value="350" label="TTY"/>
+  <int value="351" label="TTY*"/>
+  <int value="352" label="TXD"/>
+  <int value="353" label="TXD*"/>
+  <int value="354" label="VC1TEST"/>
+  <int value="355" label="VC1TEST*"/>
+  <int value="356" label="VIVO"/>
+  <int value="357" label="VIVO*"/>
+  <int value="358" label="VOC"/>
+  <int value="359" label="VOC*"/>
+  <int value="360" label="VPLAYER"/>
+  <int value="361" label="VPLAYER*"/>
+  <int value="362" label="VQF"/>
+  <int value="363" label="VQF*"/>
+  <int value="364" label="WAV"/>
+  <int value="365" label="WAV*"/>
+  <int value="366" label="W64"/>
+  <int value="367" label="W64*"/>
+  <int value="368" label="WC3MOVIE"/>
+  <int value="369" label="WC3MOVIE*"/>
+  <int value="370" label="WEBVTT"/>
+  <int value="371" label="WEBVTT*"/>
+  <int value="372" label="WSAUD"/>
+  <int value="373" label="WSAUD*"/>
+  <int value="374" label="WSVQA"/>
+  <int value="375" label="WSVQA*"/>
+  <int value="376" label="WTV"/>
+  <int value="377" label="WTV*"/>
+  <int value="378" label="WV"/>
+  <int value="379" label="WV*"/>
+  <int value="380" label="XA"/>
+  <int value="381" label="XA*"/>
+  <int value="382" label="XMV"/>
+  <int value="383" label="XMV*"/>
+  <int value="384" label="XWMA"/>
+  <int value="385" label="XWMA*"/>
+  <int value="386" label="YOP"/>
+  <int value="387" label="YOP*"/>
+  <int value="388" label="YUV4MPEGPIPE"/>
+  <int value="389" label="YUV4MPEGPIPE*"/>
+  <int value="390" label="MJPEG"/>
+  <int value="391" label="MJPEG*"/>
+  <int value="392" label="VC1"/>
+  <int value="393" label="VC1*"/>
+  <int value="394" label="M4V"/>
+  <int value="395" label="M4V*"/>
+  <int value="396" label="H264"/>
+  <int value="397" label="H264*"/>
+  <int value="398" label="H261"/>
+  <int value="399" label="H261*"/>
+  <int value="400" label="H263"/>
+  <int value="401" label="H263*"/>
+  <int value="402" label="DIRAC"/>
+  <int value="403" label="DIRAC*"/>
+  <int value="404" label="DNXHD"/>
+  <int value="405" label="DNXHD*"/>
+  <int value="406" label="MPEGVIDEO"/>
+  <int value="407" label="MPEGVIDEO*"/>
+  <int value="408" label="CAVSVIDEO"/>
+  <int value="409" label="CAVSVIDEO*"/>
+  <int value="410" label="ALSA"/>
+  <int value="411" label="ALSA*"/>
+  <int value="412" label="BKTR"/>
+  <int value="413" label="BKTR*"/>
+  <int value="414" label="DSHOW"/>
+  <int value="415" label="DSHOW*"/>
+  <int value="416" label="DV1394"/>
+  <int value="417" label="DV1394*"/>
+  <int value="418" label="FBDEV"/>
+  <int value="419" label="FBDEV*"/>
+  <int value="420" label="IEC61883"/>
+  <int value="421" label="IEC61883*"/>
+  <int value="422" label="JACK"/>
+  <int value="423" label="JACK*"/>
+  <int value="424" label="LAVFI"/>
+  <int value="425" label="LAVFI*"/>
+  <int value="426" label="LIBCDIO"/>
+  <int value="427" label="LIBCDIO*"/>
+  <int value="428" label="LIBDC1394"/>
+  <int value="429" label="LIBDC1394*"/>
+  <int value="430" label="OPENAL"/>
+  <int value="431" label="OPENAL*"/>
+  <int value="432" label="OSS"/>
+  <int value="433" label="OSS*"/>
+  <int value="434" label="PULSE"/>
+  <int value="435" label="PULSE*"/>
+  <int value="436" label="SNDIO"/>
+  <int value="437" label="SNDIO*"/>
+  <int value="438" label="V4L2"/>
+  <int value="439" label="V4L2*"/>
+  <int value="440" label="V4L"/>
+  <int value="441" label="V4L*"/>
+  <int value="442" label="VFWCAP"/>
+  <int value="443" label="VFWCAP*"/>
+  <int value="444" label="X11GRAB"/>
+  <int value="445" label="X11GRAB*"/>
+</enum>
+
 <enum name="FileDialogType" type="int">
   <int value="0" label="Select folder"/>
   <int value="1" label="Save as file"/>