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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 23551011: From Video Capture, abolish OnFrameInfo and enable resolution changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add assert to vcbp unittest Created 7 years, 2 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
« content/renderer/media/video_capture_message_filter.cc ('K') | « content/renderer/pepper/pepper_platform_video_capture.cc ('k') | content/renderer/pepper/pepper_video_capture_host.cc » ('j') | media/video/capture/video_capture.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_video_capture_host.h
diff --git a/content/renderer/pepper/pepper_video_capture_host.h b/content/renderer/pepper/pepper_video_capture_host.h
index ab6a3046a2daed39c55031a7db8ea8794c5705cd..d8a4fea4126d126e05f0abd99c48f24c23702962 100644
--- a/content/renderer/pepper/pepper_video_capture_host.h
+++ b/content/renderer/pepper/pepper_video_capture_host.h
@@ -49,7 +49,7 @@ class PepperVideoCaptureHost
const scoped_refptr<media::VideoFrame>& frame) OVERRIDE;
virtual void OnDeviceInfoReceived(
media::VideoCapture* capture,
- const media::VideoCaptureParams& device_info) OVERRIDE;
+ const media::VideoCaptureFormat& device_info) OVERRIDE;
private:
int32_t OnOpen(ppapi::host::HostMessageContext* context,
@@ -91,7 +91,7 @@ class PepperVideoCaptureHost
std::vector<BufferInfo> buffers_;
size_t buffer_count_hint_;
- media::VideoCaptureCapability capability_;
+ media::VideoCaptureParams param_request_;
PP_VideoCaptureStatus_Dev status_;
« content/renderer/media/video_capture_message_filter.cc ('K') | « content/renderer/pepper/pepper_platform_video_capture.cc ('k') | content/renderer/pepper/pepper_video_capture_host.cc » ('j') | media/video/capture/video_capture.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698