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

Unified Diff: media/video/capture/linux/video_capture_device_linux.cc

Issue 48113011: Remove media::VideoFrame from media::VideoCaptureDevice::Client interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn
Patch Set: ffdbaeb83 Trybot failures. Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: media/video/capture/linux/video_capture_device_linux.cc
diff --git a/media/video/capture/linux/video_capture_device_linux.cc b/media/video/capture/linux/video_capture_device_linux.cc
index ed2b3b1c5410c3cbe29160540e4aa80cdad40586..66aecff74351bf0f29e135e01be5212e833048e3 100644
--- a/media/video/capture/linux/video_capture_device_linux.cc
+++ b/media/video/capture/linux/video_capture_device_linux.cc
@@ -409,9 +409,9 @@ void VideoCaptureDeviceLinux::OnAllocateAndStart(int width,
// framerate configuration, or the actual one is different from the desired?
// Store our current width and height.
- frame_info_.color = V4l2ColorToVideoCaptureColorFormat(
- video_fmt.fmt.pix.pixelformat);
- frame_info_.width = video_fmt.fmt.pix.width;
+ frame_info_.color =
+ V4l2ColorToVideoCaptureColorFormat(video_fmt.fmt.pix.pixelformat);
+ frame_info_.width = video_fmt.fmt.pix.width;
frame_info_.height = video_fmt.fmt.pix.height;
frame_info_.frame_rate = frame_rate;
frame_info_.frame_size_type = VariableResolutionVideoCaptureDevice;
@@ -513,8 +513,13 @@ void VideoCaptureDeviceLinux::OnCaptureTask() {
// Dequeue a buffer.
if (ioctl(device_fd_, VIDIOC_DQBUF, &buffer) == 0) {
client_->OnIncomingCapturedFrame(
- static_cast<uint8*> (buffer_pool_[buffer.index].start),
- buffer.bytesused, base::Time::Now(), 0, false, false, frame_info_);
+ static_cast<uint8*>(buffer_pool_[buffer.index].start),
+ buffer.bytesused,
+ base::Time::Now(),
+ 0,
+ false,
+ false,
+ frame_info_);
// Enqueue the buffer again.
if (ioctl(device_fd_, VIDIOC_QBUF, &buffer) == -1) {
« no previous file with comments | « media/video/capture/android/video_capture_device_android.cc ('k') | media/video/capture/video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698