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

Side by Side Diff: media/base/video_frame_unittest.cc

Issue 2982009: Revert everything related to the relanding. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 5 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 unified diff | Download patch
« no previous file with comments | « media/base/pipeline_impl.h ('k') | media/filters/ffmpeg_glue_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/video_frame.h" 5 #include "media/base/video_frame.h"
6 6
7 #include "base/format_macros.h" 7 #include "base/format_macros.h"
8 #include "base/scoped_ptr.h"
9 #include "base/string_util.h" 8 #include "base/string_util.h"
10 #include "media/base/buffers.h" 9 #include "media/base/buffers.h"
11 #include "media/base/mock_filters.h" 10 #include "media/base/mock_filters.h"
12 #include "media/base/yuv_convert.h" 11 #include "media/base/yuv_convert.h"
13 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
14 13
15 namespace media { 14 namespace media {
16 15
17 // Helper function that initializes a YV12 frame with white and black scan 16 // Helper function that initializes a YV12 frame with white and black scan
18 // lines based on the |white_to_black| parameter. If 0, then the entire 17 // lines based on the |white_to_black| parameter. If 0, then the entire
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 // Test frame properties. 209 // Test frame properties.
211 EXPECT_EQ(1, frame->stride(VideoFrame::kRGBPlane)); 210 EXPECT_EQ(1, frame->stride(VideoFrame::kRGBPlane));
212 EXPECT_EQ(memory.get(), frame->data(VideoFrame::kRGBPlane)); 211 EXPECT_EQ(memory.get(), frame->data(VideoFrame::kRGBPlane));
213 212
214 // Delete |memory| and then |frame|. 213 // Delete |memory| and then |frame|.
215 memory.reset(); 214 memory.reset();
216 frame = NULL; 215 frame = NULL;
217 } 216 }
218 217
219 } // namespace media 218 } // namespace media
OLDNEW
« no previous file with comments | « media/base/pipeline_impl.h ('k') | media/filters/ffmpeg_glue_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698