summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf_expand.c
Commit message (Collapse)AuthorAgeFilesLines
* Delete things related to old translation systemUoti Urpala2010-03-101-1/+0
| | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* Merge svn changes up to r30683Uoti Urpala2010-03-101-2/+2
|\
| * Rename open() vf initialization function to vf_open().diego2010-02-211-2/+2
| | | | | | | | | | | | | | This avoids clashes with fcntl.h under certain circumstances. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30680 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30643Uoti Urpala2010-03-101-2/+0
|\|
| * libmpcodecs: Remove pointless leftover '#if 1' preprocessor instructions.diego2010-02-171-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30608 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30463Uoti Urpala2010-03-091-0/+18
|\| | | | | | | | | | | Note that r30455 is wrong, that commit does not in fact change the default behavior as claimed in the commit message. It only breaks "-af-adv force=0", which was already pretty much useless though.
| * Add missing license headers to all files in the libmpcodecs directory.diego2010-01-301-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30463 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29962Uoti Urpala2009-11-231-0/+2
|\|
| * Fix initialization values for vf_expand priv struct.reimar2009-11-221-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29958 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29684Uoti Urpala2009-09-161-10/+21
|\|
| * %lf is not a valid printf format specifier, use just %f instead.reimar2009-09-141-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29680 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Always keep a backup of the expand values from the command-line, so valuesreimar2009-09-101-8/+19
| | | | | | | | | | | | | | | | will be recalculated correctly e.g. after aspect change and -vf expand=aspect=4/3 command line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29666 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29532Uoti Urpala2009-08-181-6/+5
|\|
| * Replace macro: MAX -> FFMAXben2009-08-061-6/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29479 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-7/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-7/+7
| |
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-3/+3
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-3/+3
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Update OSD while pausedUoti Urpala2008-12-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | When OSD contents change while paused, try to change the OSD drawn in the currently visible frame. If such OSD updates are not supported then advance by one frame and draw the OSD normally. Add some support for OSD redrawing to vo xv. The new xv code makes a copy of the original frame contents before drawing the OSD if MPlayer is already paused when the frame is drawn. If such a copy of the current frame exists then the frame contents can be restored and a different OSD drawn on top of the same frame.
* | Create a context struct for OSD stateUoti Urpala2008-06-241-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit creates the struct and passes it to some functions that needs to access OSD state but does not yet move much data from globals to it. vf_expand accesses the OSD state for rendering purposes outside of the normal OSD draw time. The way this currently works is suboptimal, but I did not attempt to clean it up now. To keep things working the same way vf_expand needs to know the address of the state object to be able to access the data even in the functions that should normally not need it. For that purpose this commit adds a VFCTRL to tell vf_expand the address of the object.
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
| * cosmetics: Remove pointless parentheses from return calls.diego2008-05-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Mark some constant symbols as suchUoti Urpala2008-04-261-2/+2
| |
* | Move opt_screen_size_[x|y] to options structUoti Urpala2008-04-251-5/+5
| |
* | Remove _s/_st suffix from some struct namesUoti Urpala2008-04-251-11/+11
| | | | | | | | | | Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless.
* | Add context variable to vo_draw_text callbackUoti Urpala2008-04-231-2/+2
|/ | | | | Add a context variable and rename the function to osd_draw_text. Create a new vo_draw_text that is a wrapper for VOs using old API.
* Make all vf_info_t structs constreimar2007-12-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25249 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add code to clear left and right borders not only top and bottom.reimar2007-08-281-2/+20
| | | | | | | Patch by Tomas Janousek (tomi nomi cz) with small modifications by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24263 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark m_struct_t defaults as constreimar2007-01-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22045 b3059339-0415-0410-9bf9-f77b7e298cf2
* allows OSD menu to be displayed when using MPEG PES video outben2007-01-041-0/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21821 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not modify parsed command-line values on config,reimar2006-11-011-4/+5
| | | | | | | use a local variable instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20577 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixes a bug when copying the image into a destination buffer smaller than ↵gpoirier2006-04-271-2/+2
| | | | | | | | | | | | | the source. This occurs when the destination buffer is packed but the source buffer uses aligned h&w. patch by John Koleszar < jkoleszar AH on2 POIS com > original thread: Date: Apr 11, 2006 4:27 PM Subject: [MPlayer-dev-eng] [PATCH] Chroma plane copy in vf_expand git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18322 b3059339-0415-0410-9bf9-f77b7e298cf2
* Part2 of several printf2mp_msg changes in patch from Otvos Attila oattila AT ↵reynaldo2006-03-311-3/+4
| | | | | | chello DOT hu with LOTS of modifications by me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18005 b3059339-0415-0410-9bf9-f77b7e298cf2
* passing pts through the filter layer (lets see if pts or cola comes out at ↵michael2006-03-211-3/+3
| | | | | | the end) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17907 b3059339-0415-0410-9bf9-f77b7e298cf2
* expand aspect works by display aspect, not video aspect.ods152005-12-051-2/+3
| | | | | | | try 2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17103 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify include path handling, -I.. is in CFLAGS.diego2005-11-181-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l to whoever got aspect upside-down.. it's w/h, not h/w. hope this doesn't ↵rfelker2005-10-231-3/+3
| | | | | | bother anyone already using it too much git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16838 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics.ods152005-07-081-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15942 b3059339-0415-0410-9bf9-f77b7e298cf2
* add 'aspect' and 'round' params to vf_expand.ods152005-07-071-17/+22
| | | | | | | (my first commit! I hope I did this correctly ;) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15940 b3059339-0415-0410-9bf9-f77b7e298cf2
* - preserve ordering of the sliceshenry2005-04-241-8/+37
| | | | | | | - make sure that the black buffer is actually allocated to avoid sig11 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15253 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix displaying of the subtitles when using sliceshenry2005-04-101-3/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15100 b3059339-0415-0410-9bf9-f77b7e298cf2
* call draw_slice in top-down order (fixes crash with -vf expand=...,scale)henry2004-12-011-9/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14075 b3059339-0415-0410-9bf9-f77b7e298cf2
* small warning fixrathann2003-06-191-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10312 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix segfaults with slices. support slice rendering into a filter evenrfelker2003-05-201-61/+60
| | | | | | | | when the following filter/vo doesn't support slices. also use unified vf->dmpi rather than having vf->priv->dmpi duplicated in every filter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10141 b3059339-0415-0410-9bf9-f77b7e298cf2
* And 10L their, i should have started to read vop.txt sooner ;)albeu2003-03-151-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9604 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for the new option stuff.albeu2003-03-151-3/+35
| | | | | | | | Add some check as sometimes we get a NULL dmpi ?? We should take a look at that, i suspect the slices stuff git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9595 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add the new -vf option wich is the same as vop in reverse order.albeu2003-03-151-1/+2
| | | | | | | | Syntax is we decided, so you can give the nomes or not with both vop and vf. vf take precedence over vop. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9594 b3059339-0415-0410-9bf9-f77b7e298cf2
* clear black bands when using slicesarpi2003-03-141-0/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9583 b3059339-0415-0410-9bf9-f77b7e298cf2
* experimental slices supportarpi2003-02-231-3/+37
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9496 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed palette supportarpi2003-02-041-0/+3
| | | | | | | based on patch by Joey Parrish <joey@nicewarrior.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9280 b3059339-0415-0410-9bf9-f77b7e298cf2
* use mp_msg for messages. prolly more filters need to be fixed like this toorfelker2003-01-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8870 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l bug, found by valgrind :)arpi2002-10-161-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7769 b3059339-0415-0410-9bf9-f77b7e298cf2
* changing return type of put_image void->intarpi2002-09-101-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7369 b3059339-0415-0410-9bf9-f77b7e298cf2
* allocating large enough buffer, fixes green stuff on top for encoding of ↵michael2002-08-211-1/+5
| | | | | | height %16 != 0 videos git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7053 b3059339-0415-0410-9bf9-f77b7e298cf2
* DR1+IPB support (works only with ffmpeg12, as libmpeg2 doesn't accept stride)arpi2002-07-201-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6762 b3059339-0415-0410-9bf9-f77b7e298cf2
* better planar support, chroma subsampling support and Y8/Y800 supportalex2002-06-231-30/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6540 b3059339-0415-0410-9bf9-f77b7e298cf2
* yv12 osd drawer is working for y8/y800/yvu9/if09 becouse it uses only ↵alex2002-06-231-0/+4
| | | | | | Y-plane and Y-plane is the same for all these formats git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6538 b3059339-0415-0410-9bf9-f77b7e298cf2
* yvu9 and if09 supportalex2002-06-231-0/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6526 b3059339-0415-0410-9bf9-f77b7e298cf2
* keep aspect ratio - based on Fredrik Kuivinen's ideaarpi2002-05-121-3/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6061 b3059339-0415-0410-9bf9-f77b7e298cf2
* expand=-1:-50:0:0 -> mwidth:mheight+50:0:0pontscho2002-05-011-0/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5922 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000larpi2002-04-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5879 b3059339-0415-0410-9bf9-f77b7e298cf2
* don't allow invalid parametersarpi2002-04-181-5/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5688 b3059339-0415-0410-9bf9-f77b7e298cf2
* IMGTYPE_IPB not yet supported :(arpi2002-04-171-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5672 b3059339-0415-0410-9bf9-f77b7e298cf2
* enabled new OSD code in -vop expand, subtitles rendering support to mencoderarpi2002-04-171-7/+40
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5670 b3059339-0415-0410-9bf9-f77b7e298cf2
* (buggy) osd support, disabled for now, mencoder needs fixes to compilearpi2002-04-161-4/+125
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5645 b3059339-0415-0410-9bf9-f77b7e298cf2
* mp_image.h and img_format.h moved to libmpcodecsarpi2002-04-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5608 b3059339-0415-0410-9bf9-f77b7e298cf2
* copy width tooarpi2002-04-081-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5531 b3059339-0415-0410-9bf9-f77b7e298cf2
* video filter layer - written from scratch, but inspired a lot by Fredrik ↵arpi2002-04-061-0/+137
Kuivinen's patch git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5508 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 07:27:56 +0000