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

Side by Side Diff: media/gpu/ipc/service/gpu_jpeg_decode_accelerator.cc

Issue 2824743002: Make V4L2 Jpeg Decode Accelerator not compiled on an Intel device (Closed)
Patch Set: Make V4L2 Jpeg Decode Accelerator not compiled on an Intel device Created 3 years, 8 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/gpu/BUILD.gn ('k') | no next file » | 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 "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h" 5 #include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 14 matching lines...) Expand all
25 #include "media/base/media_switches.h" 25 #include "media/base/media_switches.h"
26 #include "media/filters/jpeg_parser.h" 26 #include "media/filters/jpeg_parser.h"
27 #include "media/gpu/fake_jpeg_decode_accelerator.h" 27 #include "media/gpu/fake_jpeg_decode_accelerator.h"
28 #include "media/gpu/ipc/common/media_messages.h" 28 #include "media/gpu/ipc/common/media_messages.h"
29 #include "ui/gfx/geometry/size.h" 29 #include "ui/gfx/geometry/size.h"
30 30
31 #if defined(OS_CHROMEOS) 31 #if defined(OS_CHROMEOS)
32 #if defined(ARCH_CPU_X86_FAMILY) 32 #if defined(ARCH_CPU_X86_FAMILY)
33 #include "media/gpu/vaapi_jpeg_decode_accelerator.h" 33 #include "media/gpu/vaapi_jpeg_decode_accelerator.h"
34 #endif 34 #endif
35 #if defined(USE_V4L2_CODEC) 35 #if defined(USE_V4L2_CODEC) && defined(ARCH_CPU_ARM_FAMILY)
36 #include "media/gpu/v4l2_device.h" 36 #include "media/gpu/v4l2_device.h"
37 #include "media/gpu/v4l2_jpeg_decode_accelerator.h" 37 #include "media/gpu/v4l2_jpeg_decode_accelerator.h"
38 #endif 38 #endif
39
39 #endif 40 #endif
40 41
41 namespace { 42 namespace {
42 43
43 std::unique_ptr<media::JpegDecodeAccelerator> CreateV4L2JDA( 44 std::unique_ptr<media::JpegDecodeAccelerator> CreateV4L2JDA(
44 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) { 45 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) {
45 std::unique_ptr<media::JpegDecodeAccelerator> decoder; 46 std::unique_ptr<media::JpegDecodeAccelerator> decoder;
46 #if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC) 47 #if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC) && \
48 defined(ARCH_CPU_ARM_FAMILY)
47 scoped_refptr<media::V4L2Device> device = media::V4L2Device::Create(); 49 scoped_refptr<media::V4L2Device> device = media::V4L2Device::Create();
48 if (device) 50 if (device)
49 decoder.reset(new media::V4L2JpegDecodeAccelerator( 51 decoder.reset(new media::V4L2JpegDecodeAccelerator(
50 device, std::move(io_task_runner))); 52 device, std::move(io_task_runner)));
51 #endif 53 #endif
52 return decoder; 54 return decoder;
53 } 55 }
54 56
55 std::unique_ptr<media::JpegDecodeAccelerator> CreateVaapiJDA( 57 std::unique_ptr<media::JpegDecodeAccelerator> CreateVaapiJDA(
56 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) { 58 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) {
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 filter_ = nullptr; 448 filter_ = nullptr;
447 } 449 }
448 } 450 }
449 451
450 bool GpuJpegDecodeAccelerator::Send(IPC::Message* message) { 452 bool GpuJpegDecodeAccelerator::Send(IPC::Message* message) {
451 DCHECK(CalledOnValidThread()); 453 DCHECK(CalledOnValidThread());
452 return channel_->Send(message); 454 return channel_->Send(message);
453 } 455 }
454 456
455 } // namespace media 457 } // namespace media
OLDNEW
« no previous file with comments | « media/gpu/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698