diff options
author | mcasas <mcasas@chromium.org> | 2015-05-29 15:38:56 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-29 22:39:21 +0000 |
commit | f1236fc25c67ceb18942ffc1696f24fd05e15453 (patch) | |
tree | 925ecdaca1415ddffdea51e0fa4d835c70aaca8a /tools | |
parent | cea5a9cbf8d5722435a6e13d4777568b1259ca75 (diff) | |
download | chromium_src-f1236fc25c67ceb18942ffc1696f24fd05e15453.zip chromium_src-f1236fc25c67ceb18942ffc1696f24fd05e15453.tar.gz chromium_src-f1236fc25c67ceb18942ffc1696f24fd05e15453.tar.bz2 |
Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.
Relanding after revert 1161803003.
(original list of reviewers:)
TBR=reveman@chromium.org, watk@chromium.org, jfroy@chromium.org, svitkine@chromium.org, DaleCurtis@chromium.org, miu@chromium.org, bbudge@chromium.org (for pepper)
Original CL description:
-----------------------------------------------------------
VideoFrame: Segregate Pixel Format and Storage Type.
VideoFrame::Format is a mix of textures and cpu-backed
formats. Textures are then further specified by
a texture format VideoFrame::TextureFormat.
This CL consolidates this into a single pixel format
and a storage type. This applies to HOLE as well,
which is understood as another Storage type.
VideoFrame ctor forces to pass a |mailbox_holders_|
also for non-texture based formats. Another private
ctor is added without this necessity, and all the
necessary factory methods are updated.
UMA-wise: Removing NATIVE_TEXTURE and HOLE from pixel
format prevents them from being UMA-accounted, but
there are no registered instances of those anyway.
NV12 format is restricted to OS_MACOSX.
BUG=489744
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Committed: https://crrev.com/80f289fe303323361d07c5b58b23f8499903a154
Cr-Commit-Position: refs/heads/master@{#332000}
Review URL: https://codereview.chromium.org/1154153003
Cr-Commit-Position: refs/heads/master@{#332065}
Diffstat (limited to 'tools')
-rw-r--r-- | tools/metrics/histograms/histograms.xml | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index 3184f7b..e5a984b 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml @@ -15821,6 +15821,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> @@ -15832,6 +15835,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. @@ -66594,6 +66602,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"/> @@ -66612,6 +66623,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. |