summaryrefslogtreecommitdiffstats
path: root/libvo/vo_corevideo.h
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2011-12-17 20:47:15 +0100
committerUoti Urpala <uau@mplayer2.org>2012-04-26 21:03:10 +0300
commit768e06b0ac3d11e5383b2e6e90f7b99719ba5876 (patch)
treef1063122f34c9d429f1da3a75acc9b3e87805a01 /libvo/vo_corevideo.h
parentd12b9b611aa7030047e6556714e859dd2bfd38fc (diff)
downloadmpv-768e06b0ac3d11e5383b2e6e90f7b99719ba5876.tar.bz2
mpv-768e06b0ac3d11e5383b2e6e90f7b99719ba5876.tar.xz
vo_corevideo: restructure this video output
Restructure this video output to be similar to vo_gl, even if simpler and less feature complete (for example it's still missing EOSD support). Ideally, it should act as a decent fallback in the case where something breaks in the OSX support of vo_gl. Here's a summary of what changed: * Remove the shared buffer code since it wasn't using any function from the CoreVideo API. Moreover, its presence in vo_corevideo was forcing the non-GUI related code to perform more image copies than necessary. Equivalent shared-buffer functionality will be added in a separate new VO in the next commit (this means OSX GUIs will need to specify a different VO). * Clean up the code to conform a bit more to the mplayer2 conventions. Enforce 80 column wrapping, use a private struct for file variables, use the new libvo api. * Add OSD rendering using OpenGL instead of writing directly on the video image data. * Simplify the logic for the rendering function when dealing with panscan. * Add VOCTRL_REDRAW_FRAME support. * Add colormatrix support by using the built-in API provided by CoreVideo.
Diffstat (limited to 'libvo/vo_corevideo.h')
-rw-r--r--libvo/vo_corevideo.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/libvo/vo_corevideo.h b/libvo/vo_corevideo.h
index 28b3807376..cfb86621bc 100644
--- a/libvo/vo_corevideo.h
+++ b/libvo/vo_corevideo.h
@@ -23,20 +23,6 @@
#ifndef MPLAYER_VO_COREVIDEO_H
#define MPLAYER_VO_COREVIDEO_H
-#import <Cocoa/Cocoa.h>
#import <QuartzCore/QuartzCore.h>
-#import <Carbon/Carbon.h>
-
-// MPlayer OS X VO Protocol
-@protocol MPlayerOSXVOProto
-- (int) startWithWidth: (bycopy int)width
- withHeight: (bycopy int)height
- withBytes: (bycopy int)bytes
- withAspect: (bycopy int)aspect;
-- (void) stop;
-- (void) render;
-- (void) toggleFullscreen;
-- (void) ontop;
-@end
#endif /* MPLAYER_VO_COREVIDEO_H */