| Index: media/base/video_frame_unittest.cc
|
| diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc
|
| index 815b7b7579bcc8a87bdb062b08dff1ed4777213a..1d400f639d9d96d05b51525bb27c33484513b825 100644
|
| --- a/media/base/video_frame_unittest.cc
|
| +++ b/media/base/video_frame_unittest.cc
|
| @@ -14,8 +14,8 @@
|
| #include "base/memory/aligned_memory.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "gpu/command_buffer/common/mailbox_holder.h"
|
| -#include "media/base/yuv_convert.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| +#include "third_party/libyuv/include/libyuv.h"
|
|
|
| namespace media {
|
|
|
| @@ -64,16 +64,14 @@ void ExpectFrameColor(media::VideoFrame* yv12_frame,
|
| VideoFrame::kFrameSizePadding,
|
| VideoFrame::kFrameAddressAlignment));
|
|
|
| - media::ConvertYUVToRGB32(yv12_frame->data(VideoFrame::kYPlane),
|
| - yv12_frame->data(VideoFrame::kUPlane),
|
| - yv12_frame->data(VideoFrame::kVPlane),
|
| - rgb_data,
|
| - yv12_frame->coded_size().width(),
|
| - yv12_frame->coded_size().height(),
|
| - yv12_frame->stride(VideoFrame::kYPlane),
|
| - yv12_frame->stride(VideoFrame::kUPlane),
|
| - bytes_per_row,
|
| - media::YV12);
|
| + libyuv::I420ToARGB(yv12_frame->data(VideoFrame::kYPlane),
|
| + yv12_frame->stride(VideoFrame::kYPlane),
|
| + yv12_frame->data(VideoFrame::kUPlane),
|
| + yv12_frame->stride(VideoFrame::kUPlane),
|
| + yv12_frame->data(VideoFrame::kVPlane),
|
| + yv12_frame->stride(VideoFrame::kVPlane), rgb_data,
|
| + bytes_per_row, yv12_frame->coded_size().width(),
|
| + yv12_frame->coded_size().height());
|
|
|
| for (int row = 0; row < yv12_frame->coded_size().height(); ++row) {
|
| uint32_t* rgb_row_data =
|
|
|