| Index: webrtc/media/base/videoframe.cc
|
| diff --git a/webrtc/media/base/videoframe.cc b/webrtc/media/base/videoframe.cc
|
| index 64d4c1f3b31f1d171d4f88f0029da6e9c180c32f..4ce0dfd90cf4dd2a340b407701418aacaeff731b 100644
|
| --- a/webrtc/media/base/videoframe.cc
|
| +++ b/webrtc/media/base/videoframe.cc
|
| @@ -12,10 +12,6 @@
|
|
|
| #include <string.h>
|
|
|
| -#include "libyuv/convert_from.h"
|
| -#include "libyuv/compare.h"
|
| -#include "libyuv/planar_functions.h"
|
| -#include "libyuv/scale.h"
|
| #include "webrtc/base/arraysize.h"
|
| #include "webrtc/base/checks.h"
|
| #include "webrtc/base/logging.h"
|
| @@ -23,27 +19,6 @@
|
|
|
| namespace cricket {
|
|
|
| -size_t VideoFrame::ConvertToRgbBuffer(uint32_t to_fourcc,
|
| - uint8_t* buffer,
|
| - size_t size,
|
| - int stride_rgb) const {
|
| - const size_t needed = std::abs(stride_rgb) * static_cast<size_t>(height());
|
| - if (size < needed) {
|
| - LOG(LS_WARNING) << "RGB buffer is not large enough";
|
| - return needed;
|
| - }
|
| -
|
| - if (libyuv::ConvertFromI420(
|
| - video_frame_buffer()->DataY(), video_frame_buffer()->StrideY(),
|
| - video_frame_buffer()->DataU(), video_frame_buffer()->StrideU(),
|
| - video_frame_buffer()->DataV(), video_frame_buffer()->StrideV(),
|
| - buffer, stride_rgb, width(), height(), to_fourcc)) {
|
| - LOG(LS_ERROR) << "RGB type not supported: " << to_fourcc;
|
| - return 0; // 0 indicates error
|
| - }
|
| - return needed;
|
| -}
|
| -
|
| static const size_t kMaxSampleSize = 1000000000u;
|
| // Returns whether a sample is valid.
|
| bool VideoFrame::Validate(uint32_t fourcc,
|
|
|