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

Unified Diff: media/base/video_frame_unittest.cc

Issue 1286623002: Update padding/alignment constants to match ffmpeg. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
Index: media/base/video_frame_unittest.cc
diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc
index f1afcc8186c18039eceaf4e15bd6a9b415ca4f3b..52766eb5c3b0d448cdeaff9be5a6978b79bd8935 100644
--- a/media/base/video_frame_unittest.cc
+++ b/media/base/video_frame_unittest.cc
@@ -48,12 +48,10 @@ void ExpectFrameColor(media::VideoFrame* yv12_frame, uint32 expect_rgb_color) {
ASSERT_EQ(PIXEL_FORMAT_YV12, yv12_frame->format());
ASSERT_EQ(yv12_frame->stride(VideoFrame::kUPlane),
yv12_frame->stride(VideoFrame::kVPlane));
- ASSERT_EQ(
- yv12_frame->coded_size().width() & (VideoFrame::kFrameSizeAlignment - 1),
chcunningham 2015/08/10 23:45:36 I don't think this was asserting the correct thing
- 0);
- ASSERT_EQ(
- yv12_frame->coded_size().height() & (VideoFrame::kFrameSizeAlignment - 1),
- 0);
+ for (size_t plane = 0; plane < 3; ++plane) {
+ ASSERT_EQ(yv12_frame->stride(plane) & (VideoFrame::kFrameSizeAlignment - 1),
+ 0);
+ }
size_t bytes_per_row = yv12_frame->coded_size().width() * 4u;
uint8* rgb_data = reinterpret_cast<uint8*>(

Powered by Google App Engine
This is Rietveld 408576698