aboutsummaryrefslogtreecommitdiffhomepage
path: root/libvo/vo_corevideo.m
Commit message (Collapse)AuthorAge
* vo_corevideo, vo_sharedbuffer: put private state in vo->privGravatar Stefano Pigozzi2012-07-27
| | | | | | | These VOs were already using a struct for all private data but the struct variable itself was static. Change them to store the address in vo->priv. Also change them to use the new automatic private data allocation and option parsing mechanism.
* vo_corevideo: restructure this video outputGravatar Stefano Pigozzi2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* vo_corevideo: use cocoa_common to display the windowGravatar Stefano Pigozzi2012-04-26
| | | | | | | Change vo_corevideo to use cocoa_common to create and manage the window. This doesn't affect external OSX GUIs, since they don't use vo_corevideo window management, but only read the image data from the shared buffer.
* vo_corevideo: use soft tabs (4 spaces)Gravatar Stefano Pigozzi2012-04-26
|
* vo_corevideo: fix key interpretation with modifiersGravatar Stefano Pigozzi2011-11-26
| | | | | | | | When interpreting a key event, use the "charactersIgnoringModifiers" method of the event in order to extract Alt+key combinations while keeping the normal meaning of "key". When the right alt modifier is pressed use the "characters" method to allow AltGr behavior to be used to generate different characters.
* input: move all key code lists to input/keycodes.hGravatar Uoti Urpala2011-05-02
| | | | | | | | | | | | | Move the definitions of all special key codes (those not passed by ASCII value) to input/keycodes.h. Before they were spread between osdep/keycodes.h, input/joystick.h, input/mouse.h and input/ar.h, plus some special values in input.h. This was especially inconvenient as the codes had to be coordinated to not conflict between the files. The change requires a bit of ugliness as appleir.c includes <linux/input.h> which contains various conflicting KEY_* definitions. Work around this by adding a special preprocessor variable which can be used to avoid defining these in keycodes.h.
* vo_corevideo: add key_modifier_alt only when pressing left option keyGravatar Stefano Pigozzi2011-03-18
|
* vo_corevideo: fix menubar showing 2 apples on snow leopardGravatar Stefano Pigozzi2011-03-11
|
* vo_corevideo: support modifier keys in keyboard inputGravatar Stefano Pigozzi2011-03-03
|
* sub/OSD: move some related files to sub/Gravatar Uoti Urpala2011-01-26
|
* cleanup: remove NULL checks before free() all over the codeGravatar cboesch2010-11-14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: Move variable into the only function it's used inGravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31826 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: move mouse hiding to check_eventsGravatar reimar2010-11-02
| | | | | | | | Move mouse hiding code to check_events, this allows mouse hiding to continue to work with -idle -fixed-vo, after the video has finished but the last frame is still displayed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31825 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: Make the Quit menu entry workGravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31824 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: simplify check_eventsGravatar reimar2010-11-02
| | | | | | Simplify check_events: avoid seemingly pointless untilDate argument. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31823 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: change window-closing handlingGravatar reimar2010-11-02
| | | | | | | | Change window-closing handling so it works properly if the KEY_CLOSE_WIN is rebound to e.g. skip to next file or not bound at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31822 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo, vo_quartz: remove useless kQuitCmdGravatar reimar2010-11-02
| | | | | | | | | | | | Remove kQuitCmd, it has no purpose or effect at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31811 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove unused kQuitCmd from vo_quartz. While just as useless as for corevideo, the "Quit" menu item at least works through kHICommandQuit here. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31812 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: indentation fixesGravatar reimar2010-11-02
| | | | | | | | | | Cosmetics: indentation fixes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31808 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix indentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31810 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: Avoid some code duplication.Gravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31809 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: Simplify update_screen_infoGravatar reimar2010-11-02
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31806 b3059339-0415-0410-9bf9-f77b7e298cf2 Avoid some code duplication in update_screen_info. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31807 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: avoid dangerous castsGravatar reimar2010-11-02
| | | | | | Declare variables with proper types to avoid dangerous pointer casts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31805 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo.m: remote useless parentheses and castsGravatar reimar2010-11-02
| | | | | | | | | | | | | | Remove useless (). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31802 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove yet more useless () git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31803 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove pointless casts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31804 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: Send KEY_CLOSE_WIN instead of KEY_ESC for quitGravatar reimar2010-11-02
| | | | | | | Send KEY_CLOSE_WIN instead of KEY_ESC when the user requested corevideo to quit, KEY_ESC might have been rebound to something else. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31801 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r31097Gravatar Uoti Urpala2010-04-26
|\
* \ Merge svn changes up to r31020Gravatar Uoti Urpala2010-04-26
|\ \
* \ \ Merge svn changes up to r30967Gravatar Uoti Urpala2010-04-26
|\ \ \
| | | * Avoid duplicating mouse-movement command-generation code.Gravatar reimar2010-04-25
| | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31091 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Deduplicate enable_mouse_movements declaration.Gravatar reimar2010-04-25
| | |/ | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31089 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * Fix RGB support for corevideo: corevideo can only supportGravatar reimar2010-04-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | ARGB and BGRA, which depending on endianness matches only one of RGB32 and BGR32. Also add RGB24 support which works independent of endianness, git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31016 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * Enable OSD also for BGR32, the code is the same as for RGB32.Gravatar reimar2010-04-05
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31015 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * Implement VOCTRL_DRAW_IMAGE instead of the deprecated draw_frame, avoidingGravatar reimar2010-04-05
| |/ | | | | | | | | | | | | an extra memcpy in case of stride mismatch. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31014 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Refactor OS X foreground process setting into a separate function.Gravatar diego2010-03-26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30964 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30055Gravatar Uoti Urpala2009-12-18
|\|
| * Add support for -geometry to corevideo.Gravatar adrian2009-12-15
| | | | | | | | | | | | | | Based on a patch by Tim Wojtulewicz (timwoj at ieee dot org). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30043 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add -xineramascreen support to corevideo vo. Still prefer corevideo's own ↵Gravatar adrian2009-12-15
| | | | | | | | | | | | device_id parameter if it's set. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30042 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29752Gravatar Uoti Urpala2009-10-06
|\| | | | | | | | | | | | | | | | | As part of merging subtitle-in-terminal changes make update_subtitles() only clear existing subtitles if called with the reset argument, and not try to set new ones. Later calls should set the needed new subtitles, and this change avoids some problems with trying to set subtitles when mp_property_sub() in command.c gets called from initialization code before full initialization.
| * Fix vo_corevideo with shared buffer after r29606: Only do GUI dependent ↵Gravatar adrian2009-09-20
| | | | | | | | | | | | display config if shared buffer is not enabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29699 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29684Gravatar Uoti Urpala2009-09-16
|\|
| * Factor out duplicated code to set play video scaled by a certain factor.Gravatar reimar2009-09-04
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29646 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Subopt parser subopts should now be const.Gravatar reimar2009-09-04
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29645 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29644Gravatar Uoti Urpala2009-09-04
|\|
| * Make glContext a local variable, it is not needed outside the functionGravatar reimar2009-09-01
| | | | | | | | | | | | | | where it is allocated, reference counting takes care of freeing it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29617 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a dealloc function to corevideo to reduce the memleaks fromGravatar reimar2009-09-01
| | | | | | | | | | | | | | (for my sample) about 12 MB to 2 MB. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29616 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix some of the major memleaks of vo_corevideo with -fixed-voGravatar reimar2009-09-01
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29615 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make shm_fd a local variable and close it when we need it no longer, thusGravatar reimar2009-09-01
| | | | | | | | | | | | | | fixing a file descriptor leak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29609 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reduce vo_corevideo memleaks by initializing static context etc. only onceGravatar reimar2009-09-01
| | | | | | | | | | | | | | in preinit and freeing the video-specific data before reallocating in config. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29608 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use MPlayer's standard aspect handling functions in corevideoGravatar reimar2009-09-01
| | | | | | | | | | | | | | instead of reimplementing them incompletely. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29606 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reuse the osx_common convert_key function to convert OSX keycodes to MPlayerGravatar reimar2009-08-28
| | | | | | | | | | | | | | keycodes instead of its own switch-case in vo_corevideo.m git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29575 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29412Gravatar Uoti Urpala2009-07-07
|\|
* | Remove trailing whitespace from most filesGravatar Uoti Urpala2009-07-07
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 09:08:44 +0000