| Index: webrtc/common_video/libyuv/include/webrtc_libyuv.h
|
| diff --git a/webrtc/common_video/libyuv/include/webrtc_libyuv.h b/webrtc/common_video/libyuv/include/webrtc_libyuv.h
|
| index 6d7ed1fd02db1bcdd9568054e7e65dd8d91d977b..74fb67c89984592718a3e7c2d0854d1eb7b60377 100644
|
| --- a/webrtc/common_video/libyuv/include/webrtc_libyuv.h
|
| +++ b/webrtc/common_video/libyuv/include/webrtc_libyuv.h
|
| @@ -19,39 +19,19 @@
|
| #include <vector>
|
|
|
| #include "webrtc/api/video/video_frame.h"
|
| -#include "webrtc/common_types.h" // RawVideoTypes.
|
| +#include "webrtc/common_types.h" // VideoTypes.
|
| #include "webrtc/typedefs.h"
|
|
|
| namespace webrtc {
|
|
|
| class I420Buffer;
|
|
|
| -// Supported video types.
|
| -enum VideoType {
|
| - kUnknown,
|
| - kI420,
|
| - kIYUV,
|
| - kRGB24,
|
| - kABGR,
|
| - kARGB,
|
| - kARGB4444,
|
| - kRGB565,
|
| - kARGB1555,
|
| - kYUY2,
|
| - kYV12,
|
| - kUYVY,
|
| - kMJPG,
|
| - kNV21,
|
| - kNV12,
|
| - kBGRA,
|
| -};
|
| -
|
| // This is the max PSNR value our algorithms can return.
|
| const double kPerfectPSNR = 48.0f;
|
|
|
| -// Conversion between the RawVideoType and the LibYuv videoType.
|
| -// TODO(wu): Consolidate types into one type throughout WebRtc.
|
| -VideoType RawVideoTypeToCommonVideoVideoType(RawVideoType type);
|
| +// TODO(nisse): Some downstream apps call CalcBufferSize with
|
| +// ::webrtc::kI420 as the first argument. Delete after they are updated.
|
| +const VideoType kI420 = VideoType::kI420;
|
|
|
| // Calculate the required buffer size.
|
| // Input:
|
|
|