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

Side by Side Diff: media/gpu/video_encode_accelerator_unittest.cc

Issue 2146733003: Remove USE_OZONE in video files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nit Created 4 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <inttypes.h> 5 #include <inttypes.h>
6 #include <stddef.h> 6 #include <stddef.h>
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "media/filters/ffmpeg_glue.h" 43 #include "media/filters/ffmpeg_glue.h"
44 #include "media/filters/ffmpeg_video_decoder.h" 44 #include "media/filters/ffmpeg_video_decoder.h"
45 #include "media/filters/h264_parser.h" 45 #include "media/filters/h264_parser.h"
46 #include "media/filters/ivf_parser.h" 46 #include "media/filters/ivf_parser.h"
47 #include "media/gpu/video_accelerator_unittest_helpers.h" 47 #include "media/gpu/video_accelerator_unittest_helpers.h"
48 #include "media/video/fake_video_encode_accelerator.h" 48 #include "media/video/fake_video_encode_accelerator.h"
49 #include "media/video/video_encode_accelerator.h" 49 #include "media/video/video_encode_accelerator.h"
50 #include "testing/gtest/include/gtest/gtest.h" 50 #include "testing/gtest/include/gtest/gtest.h"
51 51
52 #if defined(OS_CHROMEOS) 52 #if defined(OS_CHROMEOS)
53 #if defined(ARCH_CPU_ARMEL) || (defined(USE_OZONE) && defined(USE_V4L2_CODEC)) 53 #if defined(USE_V4L2_CODEC)
54 #include "media/gpu/v4l2_video_encode_accelerator.h" 54 #include "media/gpu/v4l2_video_encode_accelerator.h"
55 #endif 55 #endif
56 #if defined(ARCH_CPU_X86_FAMILY) 56 #if defined(ARCH_CPU_X86_FAMILY)
57 #include "media/gpu/vaapi_video_encode_accelerator.h" 57 #include "media/gpu/vaapi_video_encode_accelerator.h"
58 #include "media/gpu/vaapi_wrapper.h" 58 #include "media/gpu/vaapi_wrapper.h"
59 // Status has been defined as int in Xlib.h. 59 // Status has been defined as int in Xlib.h.
60 #undef Status 60 #undef Status
61 #endif // defined(ARCH_CPU_X86_FAMILY) 61 #endif // defined(ARCH_CPU_X86_FAMILY)
62 #elif defined(OS_MACOSX) 62 #elif defined(OS_MACOSX)
63 #include "media/gpu/vt_video_encode_accelerator_mac.h" 63 #include "media/gpu/vt_video_encode_accelerator_mac.h"
(...skipping 992 matching lines...) Expand 10 before | Expand all | Expand 10 after
1056 if (g_fake_encoder) { 1056 if (g_fake_encoder) {
1057 encoder.reset(new FakeVideoEncodeAccelerator( 1057 encoder.reset(new FakeVideoEncodeAccelerator(
1058 scoped_refptr<base::SingleThreadTaskRunner>( 1058 scoped_refptr<base::SingleThreadTaskRunner>(
1059 base::ThreadTaskRunnerHandle::Get()))); 1059 base::ThreadTaskRunnerHandle::Get())));
1060 } 1060 }
1061 return encoder; 1061 return encoder;
1062 } 1062 }
1063 1063
1064 std::unique_ptr<VideoEncodeAccelerator> VEAClient::CreateV4L2VEA() { 1064 std::unique_ptr<VideoEncodeAccelerator> VEAClient::CreateV4L2VEA() {
1065 std::unique_ptr<VideoEncodeAccelerator> encoder; 1065 std::unique_ptr<VideoEncodeAccelerator> encoder;
1066 #if defined(OS_CHROMEOS) && (defined(ARCH_CPU_ARMEL) || \ 1066 #if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC)
1067 (defined(USE_OZONE) && defined(USE_V4L2_CODEC)))
1068 scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kEncoder); 1067 scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kEncoder);
1069 if (device) 1068 if (device)
1070 encoder.reset(new V4L2VideoEncodeAccelerator(device)); 1069 encoder.reset(new V4L2VideoEncodeAccelerator(device));
1071 #endif 1070 #endif
1072 return encoder; 1071 return encoder;
1073 } 1072 }
1074 1073
1075 std::unique_ptr<VideoEncodeAccelerator> VEAClient::CreateVaapiVEA() { 1074 std::unique_ptr<VideoEncodeAccelerator> VEAClient::CreateVaapiVEA() {
1076 std::unique_ptr<VideoEncodeAccelerator> encoder; 1075 std::unique_ptr<VideoEncodeAccelerator> encoder;
1077 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) 1076 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
1810 1809
1811 media::g_env = 1810 media::g_env =
1812 reinterpret_cast<media::VideoEncodeAcceleratorTestEnvironment*>( 1811 reinterpret_cast<media::VideoEncodeAcceleratorTestEnvironment*>(
1813 testing::AddGlobalTestEnvironment( 1812 testing::AddGlobalTestEnvironment(
1814 new media::VideoEncodeAcceleratorTestEnvironment( 1813 new media::VideoEncodeAcceleratorTestEnvironment(
1815 std::move(test_stream_data), log_path, run_at_fps, 1814 std::move(test_stream_data), log_path, run_at_fps,
1816 needs_encode_latency, verify_all_output))); 1815 needs_encode_latency, verify_all_output)));
1817 1816
1818 return RUN_ALL_TESTS(); 1817 return RUN_ALL_TESTS();
1819 } 1818 }
OLDNEW
« content/common/sandbox_linux/bpf_gpu_policy_linux.cc ('K') | « media/gpu/ipc/client/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698