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

Unified Diff: content/renderer/pepper/pepper_video_capture_host.cc

Issue 22876027: Consolidate duplicated frame / capability structures in video_capture_types.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased: changed media::VideoCaptureCapability::kI420 -> media::PIXEL_FORMAT_I420 etc. Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/video_capture_message_filter_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_video_capture_host.cc
diff --git a/content/renderer/pepper/pepper_video_capture_host.cc b/content/renderer/pepper/pepper_video_capture_host.cc
index 5f90099d48691d3ee6f1dd913c1a76e530404edf..5813a722902d84fdc12041f2d26baa8c34d515ac 100644
--- a/content/renderer/pepper/pepper_video_capture_host.cc
+++ b/content/renderer/pepper/pepper_video_capture_host.cc
@@ -160,7 +160,7 @@ void PepperVideoCaptureHost::OnDeviceInfoReceived(
PP_VideoCaptureDeviceInfo_Dev info = {
static_cast<uint32_t>(device_info.width),
static_cast<uint32_t>(device_info.height),
- static_cast<uint32_t>(device_info.frame_per_second)
+ static_cast<uint32_t>(device_info.frame_rate)
};
ReleaseBuffers();
@@ -353,7 +353,7 @@ void PepperVideoCaptureHost::SetRequestedInfo(
capability_.height = device_info.height;
capability_.frame_rate = device_info.frames_per_second;
capability_.expected_capture_delay = 0; // Ignored.
- capability_.color = media::VideoCaptureCapability::kI420;
+ capability_.color = media::PIXEL_FORMAT_I420;
capability_.interlaced = false; // Ignored.
}
« no previous file with comments | « content/renderer/media/video_capture_message_filter_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698