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

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

Issue 1820733003: Remove a content_switches.h from v4l2_video_encode_accelerator.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update Created 4 years, 9 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 | « no previous file | 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <fcntl.h> 5 #include <fcntl.h>
6 #include <linux/videodev2.h> 6 #include <linux/videodev2.h>
7 #include <poll.h> 7 #include <poll.h>
8 #include <string.h> 8 #include <string.h>
9 #include <sys/eventfd.h> 9 #include <sys/eventfd.h>
10 #include <sys/ioctl.h> 10 #include <sys/ioctl.h>
11 #include <sys/mman.h> 11 #include <sys/mman.h>
12 #include <utility> 12 #include <utility>
13 13
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "base/numerics/safe_conversions.h" 17 #include "base/numerics/safe_conversions.h"
18 #include "base/thread_task_runner_handle.h" 18 #include "base/thread_task_runner_handle.h"
19 #include "base/trace_event/trace_event.h" 19 #include "base/trace_event/trace_event.h"
20 #include "content/common/gpu/media/shared_memory_region.h" 20 #include "content/common/gpu/media/shared_memory_region.h"
21 #include "content/common/gpu/media/v4l2_video_encode_accelerator.h" 21 #include "content/common/gpu/media/v4l2_video_encode_accelerator.h"
22 #include "content/public/common/content_switches.h"
23 #include "media/base/bitstream_buffer.h" 22 #include "media/base/bitstream_buffer.h"
24 23
25 #define NOTIFY_ERROR(x) \ 24 #define NOTIFY_ERROR(x) \
26 do { \ 25 do { \
27 LOG(ERROR) << "Setting error state:" << x; \ 26 LOG(ERROR) << "Setting error state:" << x; \
28 SetErrorState(x); \ 27 SetErrorState(x); \
29 } while (0) 28 } while (0)
30 29
31 #define IOCTL_OR_ERROR_RETURN_VALUE(type, arg, value, type_str) \ 30 #define IOCTL_OR_ERROR_RETURN_VALUE(type, arg, value, type_str) \
32 do { \ 31 do { \
(...skipping 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after
1171 reqbufs.count = 0; 1170 reqbufs.count = 0;
1172 reqbufs.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; 1171 reqbufs.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
1173 reqbufs.memory = V4L2_MEMORY_MMAP; 1172 reqbufs.memory = V4L2_MEMORY_MMAP;
1174 IOCTL_OR_LOG_ERROR(VIDIOC_REQBUFS, &reqbufs); 1173 IOCTL_OR_LOG_ERROR(VIDIOC_REQBUFS, &reqbufs);
1175 1174
1176 output_buffer_map_.clear(); 1175 output_buffer_map_.clear();
1177 free_output_buffers_.clear(); 1176 free_output_buffers_.clear();
1178 } 1177 }
1179 1178
1180 } // namespace content 1179 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698