summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf_expand.c
Commit message (Collapse)AuthorAgeFilesLines
* Adjust ffmpeg/libav #includes to work with recent upstream changesUoti Urpala2012-08-211-1/+2
| | | | | | | | The <libavutil/avutil.h> stopped including <libavutil/common.h> recursively in recent ffmpeg/libav git revisions. As a result, some files no longer got needed definitions, causing a build failure. Modify #include lines in various files to fix build with the latest versions of ffmpeg/libav headers.
* vf_expand: remove OSD supportwm42012-08-161-98/+1
| | | | | | | | It's not clear why this video filter supported OSD rendering. The manpage says: "Can be used for placing subtitles/OSD in the resulting black bands." But every single VO already does this if vf_expand adds black borders. This feature is 100% pointless.
* vf_expand: add sanity checksmplayer-svn2012-08-031-1/+20
| | | | | | | | | | Make vf expand more picky: refuse operating on compressed or hwaccel formats and fix up offsets that would cause color corruption for YUV formats with downsampled chroma. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34356 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* vf_expand: always clear the added borderswm42011-12-191-93/+20
| | | | | | | | | | | | | | | | | | | | | | | | Using the "expand" filter makes the image area larger by adding borders to the video frame. These borders are supposed to be always black. The filter relied on the borders in its output buffer staying black without redrawing them for each frame. However, when using direct rendering, a video filter inserted after vf_expand can draw into these borders, for example the "unsharp" and "ass" filters. These changes incorrectly stayed visible in the the following video frames. Fix this by always clearing the borders in vf_expand. In some cases, this might be more work than necessary, but vf_expand has no way of detecting whether a subsequent filter draws into the borders or not, and this avoids fragile assumptions about the existing contents of the output buffer(s). This also deals with frame size changes when config() is called again. Before this commit, remains of the old video were visible if the new video frame size was smaller than before. Since we now always clear the borders, there's no more need for the complicated code that cleared only the regions that were covered by the OSD. Delete that.
* core, vo: modify OSD redraw architecture, support EOSDUoti Urpala2011-12-061-4/+2
| | | | | | | | | | | | | | | | Previously the core sent VFCTRL_REDRAW_OSD to change OSD contents over the current frame. Change this to VFCTRL_REDRAW_FRAME followed by normal EOSD and OSD drawing calls, then vo_flip_page(). The new version supports changing EOSD contents for libass-rendered subtitles and simplifies the redraw support code needed per VO. vo_xv doesn't support EOSD changes because it relies on vf_ass to render EOSD contents earlier in the filter chain. vo_xv logic is additionally simplified because the previous commit removed the need to track the status of current and next images separately (now each frame is guaranteed to become "visible" soon after we receive it as "next", with no VO code running in the interval between).
* sub/OSD: move some related files to sub/Uoti Urpala2011-01-261-1/+1
|
* cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"Uoti Urpala2010-05-291-11/+11
| | | | | | | Change 'struct vf_instance' pointer arguments to more standard style as in the subject. Also some other minor formatting fixes. Patch by Diego Biurrun.
* Merge svn changes up to r31141Uoti Urpala2010-05-071-0/+4
|\
| * Add support for 12-bit color mode on framebuffer devices.cehoyos2010-05-061-0/+4
| | | | | | | | | | | | | | Patch Janusz Krzysztofik, jkrzyszt A tis icnet pl git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31139 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark a bunch of video filter structures as const.diego2010-02-221-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30704 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Declare externally used variables from vd.c as extern in vd.h.diego2010-02-221-3/+1
| | | | | | | | | | | | | | This saves declaring them as extern all over the place. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30695 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename struct vf_instance_s --> vf_instance.diego2010-02-211-11/+11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
* | 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