| Index: webrtc/media/base/videocommon.h
|
| diff --git a/webrtc/media/base/videocommon.h b/webrtc/media/base/videocommon.h
|
| index d8d7f9cdd387f03672a821d61a243d5866ebb281..757100b07d4436f42aac442dbcfd24ec3dc324e3 100644
|
| --- a/webrtc/media/base/videocommon.h
|
| +++ b/webrtc/media/base/videocommon.h
|
| @@ -135,31 +135,6 @@ inline std::string GetFourccName(uint32_t fourcc) {
|
| return name;
|
| }
|
|
|
| -// Computes a scale less to fit in max_pixels while maintaining aspect ratio.
|
| -void ComputeScaleMaxPixels(int frame_width, int frame_height, int max_pixels,
|
| - int* scaled_width, int* scaled_height);
|
| -
|
| -// For low fps, max 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.
|
| -void ComputeScale(int frame_width, int frame_height, int fps,
|
| - int* scaled_width, int* scaled_height);
|
| -
|
| -// Compute the frame size that conversion should crop to based on aspect ratio.
|
| -// Ensures size is multiple of 2 due to I420 and conversion limitations.
|
| -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);
|
| -
|
| -// 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);
|
| -
|
| //////////////////////////////////////////////////////////////////////////////
|
| // Definition of VideoFormat.
|
| //////////////////////////////////////////////////////////////////////////////
|
|
|