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

media/base/video_decoder_config.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/video_decoder_config.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 
 namespace media {
@@ skipping 60 matching lines @@
     UMA_HISTOGRAM_ENUMERATION("Media.VideoCodec", codec, kVideoCodecMax + 1);
     // Drop UNKNOWN because U_H_E() uses one bucket for all values less than 1.
     if (profile >= 0) {
       UMA_HISTOGRAM_ENUMERATION("Media.VideoCodecProfile", profile,
                                 VIDEO_CODEC_PROFILE_MAX + 1);
     }
     UMA_HISTOGRAM_COUNTS_10000("Media.VideoCodedWidth", coded_size.width());
     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);
   }
 
   codec_ = codec;
   profile_ = profile;
   format_ = format;
   coded_size_ = coded_size;
   visible_rect_ = visible_rect;
   natural_size_ = natural_size;
   extra_data_.assign(extra_data, extra_data + extra_data_size);
   is_encrypted_ = is_encrypted;
 }
 
 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 {
   return ((codec() == config.codec()) &&
           (format() == config.format()) &&
           (profile() == config.profile()) &&
           (coded_size() == config.coded_size()) &&
           (visible_rect() == config.visible_rect()) &&
           (natural_size() == config.natural_size()) &&
           (extra_data_size() == config.extra_data_size()) &&
@@ skipping 76 matching lines @@
 
 size_t VideoDecoderConfig::extra_data_size() const {
   return extra_data_.size();
 }
 
 bool VideoDecoderConfig::is_encrypted() const {
   return is_encrypted_;
 }
 
 }  // namespace media