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

Side by Side Diff: media/video/gpu_memory_buffer_video_frame_pool_unittest.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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/video/gpu_memory_buffer_video_frame_pool.cc ('k') | media/video/h264_poc.h » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 <stdint.h>
6
5 #include "base/bind.h" 7 #include "base/bind.h"
6 #include "base/test/test_simple_task_runner.h" 8 #include "base/test/test_simple_task_runner.h"
7 #include "gpu/command_buffer/client/gles2_interface_stub.h" 9 #include "gpu/command_buffer/client/gles2_interface_stub.h"
8 #include "media/base/video_frame.h" 10 #include "media/base/video_frame.h"
9 #include "media/renderers/mock_gpu_video_accelerator_factories.h" 11 #include "media/renderers/mock_gpu_video_accelerator_factories.h"
10 #include "media/video/gpu_memory_buffer_video_frame_pool.h" 12 #include "media/video/gpu_memory_buffer_video_frame_pool.h"
11 #include "testing/gmock/include/gmock/gmock.h" 13 #include "testing/gmock/include/gmock/gmock.h"
12 14
13 namespace media { 15 namespace media {
14 16
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 gpu_memory_buffer_pool_->MaybeCreateHardwareFrame( 212 gpu_memory_buffer_pool_->MaybeCreateHardwareFrame(
211 software_frame, base::Bind(MaybeCreateHardwareFrameCallback, &frame)); 213 software_frame, base::Bind(MaybeCreateHardwareFrameCallback, &frame));
212 214
213 RunUntilIdle(); 215 RunUntilIdle();
214 216
215 EXPECT_NE(software_frame.get(), frame.get()); 217 EXPECT_NE(software_frame.get(), frame.get());
216 EXPECT_EQ(3u, gles2_->gen_textures); 218 EXPECT_EQ(3u, gles2_->gen_textures);
217 } 219 }
218 220
219 } // namespace media 221 } // namespace media
OLDNEW
« no previous file with comments | « media/video/gpu_memory_buffer_video_frame_pool.cc ('k') | media/video/h264_poc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698