Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Unified Diff: media/base/video_frame_unittest.cc

Issue 2694113002: Delete media/base/yuv_convert and dependents. Prefer libyuv. (Closed)
Patch Set: Fix media_unittests. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/simd/xcode_hack.c ('k') | media/base/video_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 =
« no previous file with comments | « media/base/simd/xcode_hack.c ('k') | media/base/video_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698