Delete unused video capture code for cropping, non-square pixels, and ARGB.

webrtc/media/base/videocommon.cc

 /*
  *  Copyright (c) 2010 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 116 matching lines @@
   // Maximum pixels limit is set to Retina MacBookPro 15" resolution of
   // 2880 x 1800 as of 4/18/2013.
   // For high fps, maximum pixels limit is set based on common 24" monitor
   // resolution of 2048 x 1280 as of 6/13/2013. The Retina resolution is
   // therefore reduced to 1440 x 900.
   int max_pixels = (fps > 5) ? 2048 * 1280 : 2880 * 1800;
   ComputeScaleMaxPixels(
       frame_width, frame_height, max_pixels, scaled_width, scaled_height);
 }
 
-// Compute size to crop video frame to.
-// If cropped_format_* is 0, return the frame_* size as is.
-void ComputeCrop(int cropped_format_width, int cropped_format_height,
-                 int frame_width, int frame_height,
-                 int pixel_width, int pixel_height,
-                 int rotation,
-                 int* cropped_width, int* cropped_height) {
-  // Transform screen crop to camera space if rotated.
-  if (rotation == 90 || rotation == 270) {
-    std::swap(cropped_format_width, cropped_format_height);
-  }
-  ASSERT(cropped_format_width >= 0);
-  ASSERT(cropped_format_height >= 0);
-  ASSERT(frame_width > 0);
-  ASSERT(frame_height > 0);
-  ASSERT(pixel_width >= 0);
-  ASSERT(pixel_height >= 0);
-  ASSERT(rotation == 0 || rotation == 90 || rotation == 180 || rotation == 270);
-  ASSERT(cropped_width != NULL);
-  ASSERT(cropped_height != NULL);
-  if (!pixel_width) {
-    pixel_width = 1;
-  }
-  if (!pixel_height) {
-    pixel_height = 1;
-  }
-  // if cropped_format is 0x0 disable cropping.
-  if (!cropped_format_height) {
-    cropped_format_height = 1;
-  }
-  float frame_aspect = static_cast<float>(frame_width * pixel_width) /
-      static_cast<float>(frame_height * pixel_height);
-  float crop_aspect = static_cast<float>(cropped_format_width) /
-      static_cast<float>(cropped_format_height);
-  // kAspectThresh is the maximum aspect ratio difference that we'll accept
-  // for cropping.  The value 1.34 allows cropping from 4:3 to 16:9.
-  // Set to zero to disable cropping entirely.
-  // TODO(fbarchard): crop to multiple of 16 width for better performance.
-  const float kAspectThresh = 1.34f;
-  // Wide aspect - crop horizontally
-  if (frame_aspect > crop_aspect &&
-      frame_aspect < crop_aspect * kAspectThresh) {
-    // Round width down to multiple of 4 to avoid odd chroma width.
-    // Width a multiple of 4 allows a half size image to have chroma channel
-    // that avoids rounding errors.
-    frame_width = static_cast<int>((crop_aspect * frame_height *
-        pixel_height) / pixel_width + 0.5f) & ~3;
-  } else if (frame_aspect < crop_aspect &&
-             frame_aspect > crop_aspect / kAspectThresh) {
-    frame_height = static_cast<int>((frame_width * pixel_width) /
-        (crop_aspect * pixel_height) + 0.5f) & ~1;
-  }
-  *cropped_width = frame_width;
-  *cropped_height = frame_height;
-}
-
-// Compute the frame size that makes pixels square pixel aspect ratio.
-void ComputeScaleToSquarePixels(int in_width, int in_height,
-                                int pixel_width, int pixel_height,
-                                int* scaled_width, int* scaled_height) {
-  *scaled_width = in_width;  // Keep width the same.
-  *scaled_height = in_height * pixel_height / pixel_width;
-}
-
 // The C++ standard requires a namespace-scope definition of static const
 // integral types even when they are initialized in the declaration (see
 // [class.static.data]/4), but MSVC with /Ze is non-conforming and treats that
 // as a multiply defined symbol error. See Also:
 // http://msdn.microsoft.com/en-us/library/34h23df8.aspx
 #ifndef _MSC_EXTENSIONS
 const int64_t VideoFormat::kMinimumInterval;  // Initialized in header.
 #endif
 
 std::string VideoFormat::ToString() const {
   std::string fourcc_name = GetFourccName(fourcc) + " ";
   for (std::string::const_iterator i = fourcc_name.begin();
       i < fourcc_name.end(); ++i) {
     // Test character is printable; Avoid isprint() which asserts on negatives.
     if (*i < 32 || *i >= 127) {
       fourcc_name = "";
       break;
     }
   }
 
   std::ostringstream ss;
   ss << fourcc_name << width << "x" << height << "x"
      << IntervalToFpsFloat(interval);
   return ss.str();
 }
 
 }  // namespace cricket