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

Unified Diff: remoting/host/video_frame_capturer_mac.mm

Issue 10799013: Removing unused and private methods remoting::Capturer interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 5 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 | « remoting/host/video_frame_capturer_linux.cc ('k') | remoting/host/video_frame_capturer_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/video_frame_capturer_mac.mm
diff --git a/remoting/host/video_frame_capturer_mac.mm b/remoting/host/video_frame_capturer_mac.mm
index f0a79a442083cc9595a04e3d6c4174eff8c76ddb..9adb8720d7ee05b73807a6a60617c88e1c2fa898 100644
--- a/remoting/host/video_frame_capturer_mac.mm
+++ b/remoting/host/video_frame_capturer_mac.mm
@@ -162,12 +162,8 @@ class VideoFrameCapturerMac : public VideoFrameCapturer {
// Overridden from VideoFrameCapturer:
virtual void Start(const CursorShapeChangedCallback& callback) OVERRIDE;
virtual void Stop() OVERRIDE;
- virtual void ScreenConfigurationChanged() OVERRIDE;
virtual media::VideoFrame::Format pixel_format() const OVERRIDE;
- virtual void ClearInvalidRegion() OVERRIDE;
virtual void InvalidateRegion(const SkRegion& invalid_region) OVERRIDE;
- virtual void InvalidateScreen(const SkISize& size) OVERRIDE;
- virtual void InvalidateFullScreen() OVERRIDE;
virtual void CaptureInvalidRegion(
const CaptureCompletedCallback& callback) OVERRIDE;
virtual const SkISize& size_most_recent() const OVERRIDE;
@@ -182,6 +178,9 @@ class VideoFrameCapturerMac : public VideoFrameCapturer {
void CaptureRegion(const SkRegion& region,
const CaptureCompletedCallback& callback);
+ // Called when the screen configuration is changed.
+ void ScreenConfigurationChanged();
+
void ScreenRefresh(CGRectCount count, const CGRect *rect_array);
void ScreenUpdateMove(CGScreenUpdateMoveDelta delta,
size_t count,
@@ -341,68 +340,14 @@ void VideoFrameCapturerMac::Stop() {
}
}
-void VideoFrameCapturerMac::ScreenConfigurationChanged() {
- ReleaseBuffers();
- helper_.ClearInvalidRegion();
- last_buffer_ = NULL;
-
- CGDirectDisplayID mainDevice = CGMainDisplayID();
- int width = CGDisplayPixelsWide(mainDevice);
- int height = CGDisplayPixelsHigh(mainDevice);
- InvalidateScreen(SkISize::Make(width, height));
-
- if (!CGDisplayUsesOpenGLAcceleration(mainDevice)) {
- VLOG(3) << "OpenGL support not available.";
- return;
- }
-
- if (display_create_image_func_ != NULL) {
- // No need for any OpenGL support on Lion
- return;
- }
-
- CGLPixelFormatAttribute attributes[] = {
- kCGLPFAFullScreen,
- kCGLPFADisplayMask,
- (CGLPixelFormatAttribute)CGDisplayIDToOpenGLDisplayMask(mainDevice),
- (CGLPixelFormatAttribute)0
- };
- CGLPixelFormatObj pixel_format = NULL;
- GLint matching_pixel_format_count = 0;
- CGLError err = CGLChoosePixelFormat(attributes,
- &pixel_format,
- &matching_pixel_format_count);
- DCHECK_EQ(err, kCGLNoError);
- err = CGLCreateContext(pixel_format, NULL, &cgl_context_);
- DCHECK_EQ(err, kCGLNoError);
- CGLDestroyPixelFormat(pixel_format);
- CGLSetFullScreen(cgl_context_);
- CGLSetCurrentContext(cgl_context_);
-
- size_t buffer_size = width * height * sizeof(uint32_t);
- pixel_buffer_object_.Init(cgl_context_, buffer_size);
-}
-
media::VideoFrame::Format VideoFrameCapturerMac::pixel_format() const {
return pixel_format_;
}
-void VideoFrameCapturerMac::ClearInvalidRegion() {
- helper_.ClearInvalidRegion();
-}
-
void VideoFrameCapturerMac::InvalidateRegion(const SkRegion& invalid_region) {
helper_.InvalidateRegion(invalid_region);
}
-void VideoFrameCapturerMac::InvalidateScreen(const SkISize& size) {
- helper_.InvalidateScreen(size);
-}
-
-void VideoFrameCapturerMac::InvalidateFullScreen() {
- helper_.InvalidateFullScreen();
-}
-
void VideoFrameCapturerMac::CaptureInvalidRegion(
const CaptureCompletedCallback& callback) {
// Only allow captures when the display configuration is not occurring.
@@ -697,6 +642,48 @@ const SkISize& VideoFrameCapturerMac::size_most_recent() const {
return helper_.size_most_recent();
}
+void VideoFrameCapturerMac::ScreenConfigurationChanged() {
+ ReleaseBuffers();
+ helper_.ClearInvalidRegion();
+ last_buffer_ = NULL;
+
+ CGDirectDisplayID mainDevice = CGMainDisplayID();
+ int width = CGDisplayPixelsWide(mainDevice);
+ int height = CGDisplayPixelsHigh(mainDevice);
+ helper_.InvalidateScreen(SkISize::Make(width, height));
+
+ if (!CGDisplayUsesOpenGLAcceleration(mainDevice)) {
+ VLOG(3) << "OpenGL support not available.";
+ return;
+ }
+
+ if (display_create_image_func_ != NULL) {
+ // No need for any OpenGL support on Lion
+ return;
+ }
+
+ CGLPixelFormatAttribute attributes[] = {
+ kCGLPFAFullScreen,
+ kCGLPFADisplayMask,
+ (CGLPixelFormatAttribute)CGDisplayIDToOpenGLDisplayMask(mainDevice),
+ (CGLPixelFormatAttribute)0
+ };
+ CGLPixelFormatObj pixel_format = NULL;
+ GLint matching_pixel_format_count = 0;
+ CGLError err = CGLChoosePixelFormat(attributes,
+ &pixel_format,
+ &matching_pixel_format_count);
+ DCHECK_EQ(err, kCGLNoError);
+ err = CGLCreateContext(pixel_format, NULL, &cgl_context_);
+ DCHECK_EQ(err, kCGLNoError);
+ CGLDestroyPixelFormat(pixel_format);
+ CGLSetFullScreen(cgl_context_);
+ CGLSetCurrentContext(cgl_context_);
+
+ size_t buffer_size = width * height * sizeof(uint32_t);
+ pixel_buffer_object_.Init(cgl_context_, buffer_size);
+}
+
void VideoFrameCapturerMac::ScreenRefresh(CGRectCount count,
const CGRect* rect_array) {
SkIRect skirect_array[count];
« no previous file with comments | « remoting/host/video_frame_capturer_linux.cc ('k') | remoting/host/video_frame_capturer_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698