Remove dead code paths around PIXEL_STORAGE_TEXTURE in capture pipeline.

media/base/video_capture_types.cc

 // Copyright 2013 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_capture_types.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "media/base/limits.h"
 #include "media/base/video_frame.h"
@@ skipping 39 matching lines @@
       pixel_storage(pixel_storage) {
 }
 
 bool VideoCaptureFormat::IsValid() const {
   return (frame_size.width() < media::limits::kMaxDimension) &&
          (frame_size.height() < media::limits::kMaxDimension) &&
          (frame_size.GetArea() >= 0) &&
          (frame_size.GetArea() < media::limits::kMaxCanvas) &&
          (frame_rate >= 0.0f) &&
          (frame_rate < media::limits::kMaxFramesPerSecond) &&
-         (pixel_storage != PIXEL_STORAGE_TEXTURE ||
-          pixel_format == PIXEL_FORMAT_ARGB);
+         (pixel_format > PIXEL_FORMAT_UNKNOWN &&

[mcasas, 2015/11/13 19:13:57]

Actually there's at least one case of valid VideoFrame with
PIXEL_FORMAT_UNKNOWN [1], in CreateEOSFrame(). Suggest
here s/>/>=/.


[1]
https://code.google.com/p/chromium/codesearch#chromium/src/media/base/video_f...

[miu, 2015/11/14 03:43:47]

Done.

+          pixel_format <= PIXEL_FORMAT_MAX) &&
+         (pixel_storage == PIXEL_STORAGE_CPU ||
+          pixel_storage == PIXEL_STORAGE_GPUMEMORYBUFFER);
 }
 
 size_t VideoCaptureFormat::ImageAllocationSize() const {
   return VideoFrame::AllocationSize(pixel_format, frame_size);
 }
 
 //static
 std::string VideoCaptureFormat::ToString(const VideoCaptureFormat& format) {
   return base::StringPrintf(
       "(%s)@%.3ffps, pixel format: %s storage: %s.",
       format.frame_size.ToString().c_str(), format.frame_rate,
       VideoPixelFormatToString(format.pixel_format).c_str(),
       PixelStorageToString(format.pixel_storage).c_str());
 }
 
 // static
 std::string VideoCaptureFormat::PixelStorageToString(
     VideoPixelStorage storage) {
   switch (storage) {
     case PIXEL_STORAGE_CPU:
       return "CPU";
-    case PIXEL_STORAGE_TEXTURE:
-      return "TEXTURE";
     case PIXEL_STORAGE_GPUMEMORYBUFFER:
       return "GPUMEMORYBUFFER";
   }
   NOTREACHED() << "Invalid VideoPixelStorage provided: "
                << static_cast<int>(storage);
   return std::string();
 }
 
 // static
 bool VideoCaptureFormat::ComparePixelFormatPreference(
     const VideoPixelFormat& lhs,
     const VideoPixelFormat& rhs) {
   const auto& format_lhs = std::find(
       kSupportedCapturePixelFormats,
       kSupportedCapturePixelFormats + arraysize(kSupportedCapturePixelFormats),
       lhs);
   const auto& format_rhs = std::find(
       kSupportedCapturePixelFormats,
       kSupportedCapturePixelFormats + arraysize(kSupportedCapturePixelFormats),
       rhs);
   return format_lhs < format_rhs;
 }
 
 VideoCaptureParams::VideoCaptureParams()
     : resolution_change_policy(RESOLUTION_POLICY_FIXED_RESOLUTION),
       power_line_frequency(PowerLineFrequency::FREQUENCY_DEFAULT) {}
 
 }  // namespace media