media/video/capture/mac/video_capture_device_avfoundation_mac.h - Issue 464853002: Mac Video Capture: correct to float the erroneous handling of frame rate as int.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/video/capture/mac/video_capture_device_avfoundation_mac.h

Issue 464853002: Mac Video Capture: correct to float the erroneous handling of frame rate as int. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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 | « media/video/capture/mac/platform_video_capturing_mac.h ('k') | media/video/capture/mac/video_capture_device_avfoundation_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/mac/video_capture_device_avfoundation_mac.h

diff --git a/media/video/capture/mac/video_capture_device_avfoundation_mac.h b/media/video/capture/mac/video_capture_device_avfoundation_mac.h

index 1c607b1918b8358b46bd49f9d0deb0d8a77e5931..d2262aeead1758303744a109ec9545a793c928ab 100644

--- a/media/video/capture/mac/video_capture_device_avfoundation_mac.h

+++ b/media/video/capture/mac/video_capture_device_avfoundation_mac.h

@@ -62,7 +62,7 @@ class VideoCaptureDeviceMac;

// The following attributes are set via -setCaptureHeight:width:frameRate:.

int frameWidth_;

int frameHeight_;

- int frameRate_;

+ float frameRate_;

base::Lock lock_; // Protects concurrent setting and using of frameReceiver_.

media::VideoCaptureDeviceMac* frameReceiver_; // weak.

@@ -105,7 +105,9 @@ class VideoCaptureDeviceMac;

// Configures the capture properties for the capture session and the video data

// output; this means it MUST be called after setCaptureDevice:. Return YES on

// success, else NO.

-- (BOOL)setCaptureHeight:(int)height width:(int)width frameRate:(int)frameRate;

+- (BOOL)setCaptureHeight:(int)height

+ width:(int)width

+ frameRate:(float)frameRate;

// Starts video capturing and register the notification listeners. Must be

// called after setCaptureDevice:, and, eventually, also after