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 /media/base/video_decoder_config.cc | |
| 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 'media/base/video_decoder_config.cc')
| -rw-r--r-- | media/base/video_decoder_config.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/base/video_decoder_config.cc b/media/base/video_decoder_config.cc index dc135d8..6f1c02f 100644 --- a/media/base/video_decoder_config.cc +++ b/media/base/video_decoder_config.cc @@ -78,7 +78,7 @@ void VideoDecoderConfig::Initialize(VideoCodec codec, UmaHistogramAspectRatio("Media.VideoCodedAspectRatio", coded_size); UMA_HISTOGRAM_COUNTS_10000("Media.VideoVisibleWidth", visible_rect.width()); UmaHistogramAspectRatio("Media.VideoVisibleAspectRatio", visible_rect); - UMA_HISTOGRAM_ENUMERATION("Media.VideoFormat", format, + UMA_HISTOGRAM_ENUMERATION("Media.VideoFramePixelFormat", format, VideoFrame::FORMAT_MAX + 1); UMA_HISTOGRAM_ENUMERATION("Media.VideoFrameColorSpace", color_space, VideoFrame::COLOR_SPACE_MAX + 1); @@ -98,8 +98,8 @@ bool VideoDecoderConfig::IsValidConfig() const { return codec_ != kUnknownVideoCodec && natural_size_.width() > 0 && natural_size_.height() > 0 && - VideoFrame::IsValidConfig(format_, coded_size_, visible_rect_, - natural_size_); + VideoFrame::IsValidConfig(format_, VideoFrame::STORAGE_UNKNOWN, + coded_size_, visible_rect_, natural_size_); } bool VideoDecoderConfig::Matches(const VideoDecoderConfig& config) const { |