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

Side by Side Diff: content/common/gpu/media/video_decode_accelerator_unittest.cc

Issue 882123004: Renamed v4l2_video_device.*->v4l2_device.* and generic_v4l2_video_device.*->generic_v4l2_device.* a… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed the include to updated file name. Created 5 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 unified diff | Download patch
« no previous file with comments | « content/common/gpu/media/v4l2_video_encode_accelerator.h ('k') | content/content_common.gypi » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // The bulk of this file is support code; sorry about that. Here's an overview 5 // The bulk of this file is support code; sorry about that. Here's an overview
6 // to hopefully help readers of this code: 6 // to hopefully help readers of this code:
7 // - RenderingHelper is charged with interacting with X11/{EGL/GLES2,GLX/GL} or 7 // - RenderingHelper is charged with interacting with X11/{EGL/GLES2,GLX/GL} or
8 // Win/EGL. 8 // Win/EGL.
9 // - ClientState is an enum for the state of the decode client used by the test. 9 // - ClientState is an enum for the state of the decode client used by the test.
10 // - ClientStateNotification is a barrier abstraction that allows the test code 10 // - ClientStateNotification is a barrier abstraction that allows the test code
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "content/public/common/content_switches.h" 54 #include "content/public/common/content_switches.h"
55 #include "media/filters/h264_parser.h" 55 #include "media/filters/h264_parser.h"
56 #include "ui/gfx/codec/png_codec.h" 56 #include "ui/gfx/codec/png_codec.h"
57 #include "ui/gl/gl_image.h" 57 #include "ui/gl/gl_image.h"
58 58
59 #if defined(OS_WIN) 59 #if defined(OS_WIN)
60 #include "base/win/windows_version.h" 60 #include "base/win/windows_version.h"
61 #include "content/common/gpu/media/dxva_video_decode_accelerator.h" 61 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
62 #elif defined(OS_CHROMEOS) 62 #elif defined(OS_CHROMEOS)
63 #if defined(USE_V4L2_CODEC) 63 #if defined(USE_V4L2_CODEC)
64 #include "content/common/gpu/media/v4l2_device.h"
64 #include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h" 65 #include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h"
65 #include "content/common/gpu/media/v4l2_video_decode_accelerator.h" 66 #include "content/common/gpu/media/v4l2_video_decode_accelerator.h"
66 #include "content/common/gpu/media/v4l2_video_device.h"
67 #endif 67 #endif
68 #if defined(ARCH_CPU_X86_FAMILY) 68 #if defined(ARCH_CPU_X86_FAMILY)
69 #include "content/common/gpu/media/vaapi_video_decode_accelerator.h" 69 #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
70 #include "content/common/gpu/media/vaapi_wrapper.h" 70 #include "content/common/gpu/media/vaapi_wrapper.h"
71 #endif // defined(ARCH_CPU_X86_FAMILY) 71 #endif // defined(ARCH_CPU_X86_FAMILY)
72 #else 72 #else
73 #error The VideoAccelerator tests are not supported on this platform. 73 #error The VideoAccelerator tests are not supported on this platform.
74 #endif // OS_WIN 74 #endif // OS_WIN
75 75
76 #if defined(USE_OZONE) 76 #if defined(USE_OZONE)
(...skipping 1551 matching lines...) Expand 10 before | Expand all | Expand 10 after
1628 ui::OzonePlatform::InitializeForUI(); 1628 ui::OzonePlatform::InitializeForUI();
1629 #endif 1629 #endif
1630 1630
1631 content::g_env = 1631 content::g_env =
1632 reinterpret_cast<content::VideoDecodeAcceleratorTestEnvironment*>( 1632 reinterpret_cast<content::VideoDecodeAcceleratorTestEnvironment*>(
1633 testing::AddGlobalTestEnvironment( 1633 testing::AddGlobalTestEnvironment(
1634 new content::VideoDecodeAcceleratorTestEnvironment())); 1634 new content::VideoDecodeAcceleratorTestEnvironment()));
1635 1635
1636 return RUN_ALL_TESTS(); 1636 return RUN_ALL_TESTS();
1637 } 1637 }
OLDNEW
« no previous file with comments | « content/common/gpu/media/v4l2_video_encode_accelerator.h ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698