summaryrefslogtreecommitdiffstats
path: root/spudec.c
Commit message (Collapse)AuthorAgeFilesLines
* spudec: Faster paletted to OSD conversionreimar2010-11-021-7/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31707 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: Fix conversion from paletted to MPlayer's OSD formatreimar2010-11-021-4/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31705 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: Reuse spudec_draw for the unscaled casereimar2010-11-021-8/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31703 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: minor improvementsreimar2010-11-021-14/+15
| | | | | | | | | | | | | | Remove useless casts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31702 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify alpha conversion code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31704 b3059339-0415-0410-9bf9-f77b7e298cf2 Document code inefficiency. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31706 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: Fix calc_bbox to always return sensible valuesreimar2010-11-021-4/+3
| | | | | | | When the scaled width is equal to the current width we could reuse the previous bbox value, however we havent saved them anywhere... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31701 b3059339-0415-0410-9bf9-f77b7e298cf2
* subs: improve scaling for avcodec subsreimar2010-11-021-3/+1
| | | | | | | Try to get subtitle scaling somewhat right with libavcodec decoded bitmap subtitles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31697 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: add missing orig_frame_width settingreimar2010-11-021-0/+1
| | | | | | 10l, also assign the original width in spudec_new_scaled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31696 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: indentation fixreimar2010-11-021-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31695 b3059339-0415-0410-9bf9-f77b7e298cf2
* subs: Add support for PGS subtitle decoding via libavcodecreimar2010-11-021-0/+72
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31665 b3059339-0415-0410-9bf9-f77b7e298cf2
* subs: change subdelay handling and vobsub timingreimar2010-11-021-0/+1
| | | | | | | | | | | Make subdelay handling work the same way for all subtitle types and also allow changing subtitle delay to work better with vobsubs. This probably breaks vobsub behaviour with timestamp wrapping though. Positive values for sub delay now delay subtitles compared to video, where before the effect was in the opposite direction. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31663 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: simplifyreimar2010-11-021-2/+2
| | | | | | Reuse spudec_visible to avoid code duplication. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31661 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: Add warning about bad values in bounding box handlingreimar2010-11-021-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31660 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: Extract image allocation code to a separate functionreimar2010-11-021-12/+22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31659 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r31303Uoti Urpala2010-06-021-5/+9
|\
| * Reindent.reimar2010-05-311-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31296 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix subtitle display for http://samples.mplayerhq.hu/sub/largeres_vobsub.mkvreimar2010-05-311-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31295 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31040Uoti Urpala2010-04-261-7/+1
|\|
| * Remove dead code.cehoyos2010-04-141-6/+0
| | | | | | | | | | | | | | Patch by ubitux, ubitux gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31037 b3059339-0415-0410-9bf9-f77b7e298cf2
| * typo fix found by ubituxcompn2010-04-131-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31035 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark some more functions that are not used outside of their files as static.diego2010-02-181-2/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30632 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn change r30576Uoti Urpala2010-03-091-4/+9
|\|
| * Avoid using sscanf for basic parsing, it is horribly slow.reimar2010-02-141-4/+9
| | | | | | | | | | | | | | Now uses strncmp as a first step, which is 40 times faster. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30576 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30529Uoti Urpala2010-03-091-13/+20
|\|
| * Fix subtitle display for DVDs using fade-in/fade-out.reimar2010-02-061-5/+17
| | | | | | | | | | | | | | | | This does not do the actual fading, this is not supported by MPlayer, but will just use the highest alpha value used during display. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30524 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make mkalpha function simpler, faster and more correct.reimar2010-02-061-8/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30523 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30475Uoti Urpala2010-03-091-12/+28
|\|
| * Add license header to all top-level files missing them.diego2010-01-301-12/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 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
* | Replace libavutil internal header #includes with MPlayer copiesUoti Urpala2009-07-261-1/+1
| | | | | | | | | | | | Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/ instead.
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-7/+7
| |
* | Merge svn changes up to r28310Uoti Urpala2009-01-151-3/+4
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * Simplify and comment spudec bilinear scaling codereimar2009-01-011-3/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28223 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27841Uoti Urpala2008-10-281-25/+61
|\| | | | | | | | | Conflicts: mplayer.c
| * Factorize vobsub idx/extradata handling.aurel2008-10-271-25/+61
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27841 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Make various functions staticUoti Urpala2008-08-121-2/+3
| |
* | 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 useless parentheses from return statements.diego2008-05-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Add context variable to vo_draw_text callbackUoti Urpala2008-04-231-3/+3
| | | | | | | | | | 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.
* | Add new video driver APIUoti Urpala2008-04-231-5/+5
|/ | | | | | | | | | | | | Create new video driver API that has a per-instance context structure and does not rely on keeping status in global or static variables. Existing drivers are not yet converted to this API; instead there is a wrapper which translates calls to them. In the new API, an old API call vo_functions->xyz(args) is generally replaced by vo_xyz(vo_instance, args). The changes to keep the vesa, dxr2 and xover drivers compiling have not been tested.
* FFmpeg now uses different (unified) #include paths.diego2008-02-251-5/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add an extra check to avoid a case that cause black lines in scaledreimar2008-01-101-0/+2
| | | | | | | vobsubs due to an overflow in the multiplication. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25668 b3059339-0415-0410-9bf9-f77b7e298cf2
* Vobsub support tridx setting in .idx file.ulion2007-12-191-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25460 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix spudec to display current vobsub immediately after a seek.ulion2007-12-111-15/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25350 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark several uses of vo_functions_t as const to stop some of the currentreimar2007-12-021-2/+2
| | | | | | | hacks e.g. in vidix code from spreading. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25247 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove stray line that slipped through in last commit.ulion2007-11-301-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25213 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix warnings:ulion2007-11-301-3/+4
| | | | | | | | | | | spudec.c: In function 'spudec_assemble': spudec.c:353: warning: 'current_nibble[0]' may be used uninitialized in this function spudec.c:353: warning: 'current_nibble[1]' may be used uninitialized in this function spudec.c:352: warning: 'end_pts' may be used uninitialized in this function spudec.c:351: warning: 'start_pts' may be used uninitialized in this function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25212 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: Remove empty block.cehoyos2007-08-081-4/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24038 b3059339-0415-0410-9bf9-f77b7e298cf2
* bbox[n] and spu->scaled_start_row are unsigned, comparison with 0 is pointless.cehoyos2007-08-081-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24029 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert r23530.voroshil2007-06-211-115/+0
| | | | | | | | | r23530 breaks policy: notification was not sent to mailing list, agreements of other devs were not received. Code also should be reviewed/cleaned up/fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23593 b3059339-0415-0410-9bf9-f77b7e298cf2
* Teletext support for tv:// (v4l and v4l2 only)voroshil2007-06-101-0/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified patch from Otvos Attila oattila at chello dot hu Module uses zvbi library for all low-level VBI operations (like I/O with vbi device, converting vbi pages into usefull vbi_page stuctures, rendering them into RGB32 images). All teletext related stuff (except properties, slave commands and rendering osd in text mode or RGB32 rendered teletext pages in spu mode) is implemented in tvi_vbi.c New properties: teletext_page - switching between pages teletext_mode - switch between on/off/opaque/transparent modes teletext_format - (currently read-only) allows to get format info (black/white,gray,text) teletext_half_page - trivial zooming (displaying top/bottom half of teletext page) New slave commands: teletext_add_dec - user interface for jumping to any page by editing page number interactively teletext_go_link - goes though links, specified on current page git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23530 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace MIN with FFMINreimar2007-03-011-5/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22396 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix build with shared libavutil. Approved by Diego.rathann2006-12-311-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21794 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()lucabe2006-09-171-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19876 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move postproc ---> libswscalelucabe2006-06-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18866 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix some subtitles that didn't show.reimar2005-06-191-0/+2
| | | | | | | Sample: http://mplayerhq.hu/MPlayer/samples/sub/starwarssub2.vob git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15762 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix black line on right of subtitle with -spuaa 4 by setting alpha ofreimar2005-01-081-9/+6
| | | | | | | border pixels to 0 after scaling, not before. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14433 b3059339-0415-0410-9bf9-f77b7e298cf2
* passing an array or double precission parameters for the scaling function, ↵michael2004-09-181-1/+1
| | | | | | | | | instead of missusing a few bits of the flags fixing the naming of the scaling functions a little git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13374 b3059339-0415-0410-9bf9-f77b7e298cf2
* many small typo and grammar fixesgabucino2003-10-041-1/+1
| | | | | | | Based on Bernard Leak's mail <bernard 4t brenda-arkle.demon.co.uk> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11001 b3059339-0415-0410-9bf9-f77b7e298cf2
* Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>attila2003-09-211-2/+25
| | | | | | | | | | | | | | | | | | | | | For a given subtitle language you can now chose to display only the forced subtitles. Defaut is set to "show all subtitles" so that current mplayer behaviour is not changed. For DVD: Use -forced_subs_only additionally to e.g. -slang en if you are only interested in the forced subtitles. For VobSub: The idx file is now parsed for the "forced subs: ON/OFF" tag and used according to its settings. Key: You can toggle the display of forced subtitles by pressing "F" (upper case letter). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10918 b3059339-0415-0410-9bf9-f77b7e298cf2
* sws_ prefix, more seperation between internal & external swscaler APImichael2003-02-231-8/+8
| | | | | | | sws_scale() returns the number of outputed lines git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9495 b3059339-0415-0410-9bf9-f77b7e298cf2
* Improved subtitle queueing, parameters (start_pts, end_pts, palette, alpha)ranma2003-02-161-172/+202
| | | | | | | are now also queued. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9449 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix "invalid fragment" handling.ranma2003-02-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9443 b3059339-0415-0410-9bf9-f77b7e298cf2
* Improvements to spudec (DVD/VobSub) subtitle code:rfelker2003-01-241-36/+103
| | | | | | | | | - runtime selectable positioning, like with text subs - runtime selectable scaling/antialiasing algorithm - gaussian blur scaler (finally dvd/vobsub doesn't look like shit!) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9078 b3059339-0415-0410-9bf9-f77b7e298cf2
* I have seen problems where DVD subtitles don't displayarpi2003-01-081-81/+150
| | | | | | | | | | | | | | | | | | | | at the right time and sometimes they don't appear at all. The problem stems from the fact that subtitle command packets are being applied as soon as they are read and assembled from the input stream. Sometimes, a fully assembled subtitle packet arrives at the spudec_assemble function before the previous subtitle appears onscreen and thus the viewer only sees the second subtitle. So I created a patch that queues assembled subtitle packets and applies them at the appropriate time within the heartbeat function. The reset function clears the packet queue when seeking through the video. Tomasz Farkas <tomasz_farkas@yahoo.co.uk> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8844 b3059339-0415-0410-9bf9-f77b7e298cf2
* All right: The patch adresses two issues which I found, when I analyzedarpi2002-10-151-3/+8
| | | | | | | | | | | | | | | |