summaryrefslogtreecommitdiffstats
path: root/spudec.c
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
* 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
* 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
* 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
| | | | | | | | | | | | | | | | | | | | | the input from some DVDs with known subtitle-dropouts: 1. The packet-size at the beginning of the packet, which is used to check, whether we got all fragments, is sometimes one byte too long. It seems to be always padded to an even number, while the actual size can be odd. 2. The original algorythm used to assemble the fragments relies on the timestamps to check, whether a new packet begins. This has proven to be unrelieable on some disks. So instead, I use the timestamp only to check, whether it's been too long (defined as 0,01sec) since the last fragment, which is probably indicating a broken packet, and normaly starting a new packet when the last one has been finished. patch by Christof Buergi <christof@buergi.lugs.ch> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7744 b3059339-0415-0410-9bf9-f77b7e298cf2
* Put all spudec_new stuff in a single function,kmkaplan2002-08-061-21/+5
| | | | | | | | | spudec_new_scaled_vobsub. Original frame width is always either 720x576 or 720x480. See dvd-subtitle-problem.txt and dvd-subtitle-problem.txt.vob. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6939 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make spudec_assemble more resistent in the face of incomplete packets.kmkaplan2002-07-241-5/+16
| | | | | | | Put the global spu_changed into spudec_handle_t. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6779 b3059339-0415-0410-9bf9-f77b7e298cf2
* Suppress garbage at the end of some subtitles.kmkaplan2002-06-171-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6460 b3059339-0415-0410-9bf9-f77b7e298cf2
* - hardened a bit the new bilinear algo (missing checks)pl2002-05-291-13/+26
| | | | | | | | | - warning fix (include, int -> void) - avoids messing with 0 byte allocation (result not reliable) (Fredrik Kuivinen <freku045@student.liu.se> noticed it) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6226 b3059339-0415-0410-9bf9-f77b7e298cf2
* avoids malloc()ing a negative number (== very big size_t)pl2002-05-291-3/+14
| | | | | | | | some vobsub's trigger this case and cause a: "MPlayer interrupted by signal 2 in module: decode_video" git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6224 b3059339-0415-0410-9bf9-f77b7e298cf2
* spu/vobsub speedup patch, new all better bilinear scaler similiar to win ↵atmos42002-05-281-3/+114
| | | | | | vobsub ones. ptyh by Hephooey. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6216 b3059339-0415-0410-9bf9-f77b7e298cf2
* Bounding box and partial update patch for vob/dvdsub by Hephooey.atmos42002-05-251-2/+32
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6191 b3059339-0415-0410-9bf9-f77b7e298cf2
* Improvment for spu subtitles.albeu2002-05-171-19/+44
| | | | | | | | | | | | Removed the integreted spudec in vobsub. Various cleanup/bugfix in vobsub (no more auto palette when a true one is here) HW spu rendering moved in spudec because we first need to reassable the packet before sending them to the hw. Spudec is now created only if nedded. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6111 b3059339-0415-0410-9bf9-f77b7e298cf2
* Suggested fix byatmos42002-04-301-2/+2
| | | | | | | Arne Driescher <driescher at mpi-magdeburg.mpg.de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5918 b3059339-0415-0410-9bf9-f77b7e298cf2
* guessing palette - patch by salvador <salvador@inti.gov.ar>arpi2002-04-291-5/+67
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5909 b3059339-0415-0410-9bf9-f77b7e298cf2
* VobSub updates, custom palette support and other stuff, can't write the name ↵atmos42002-04-251-0/+28
| | | | | | of the chinese(?) patch supplier. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5834 b3059339-0415-0410-9bf9-f77b7e298cf2
* new osd code, use osd objs to follow changes and do minimal updatesarpi2002-04-151-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5639 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed SPU pts, it's 1024/90000 based instead of 1/100arpi2002-04-041-1/+1
| | | | | | | | spudec code doesn't requires dvdread - removed some #ifdefs - from dvdnav patch by Kees Cook <mplayer@outflux.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5489 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec_update_palette() added - dvdnav patch by Kees Cook <mplayer@outflux.net>arpi2002-04-031-0/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5475 b3059339-0415-0410-9bf9-f77b7e298cf2
* * New command line switch for mplayer & mencoder:kmkaplan2002-03-291-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | -ifo <ifo file> Indicate the file that will be used to load palette and frame size for MPEG subtitles. * mencoder.c: Fix cropping when decoding MPEG2. * spudec.c: If scaling is needed only do it once. Change WITH_NO_ANTIALIASING to ANTIALIASING_ALGORITHM. * vobsub.c: Support reading info regarding size and palette from IDX file instead of IFO file. Support streams containing audio or video. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5389 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l accidently commited an already customized version with different default ↵atmos42002-02-221-1/+1
| | | | | | scaling algo. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4811 b3059339-0415-0410-9bf9-f77b7e298cf2
* Forgot to commit with vo_sdl osd patch.atmos42002-02-221-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4810 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a third scaling algorithm wich should be faster. Select bykmkaplan2002-01-151-3/+49
| | | | | | | defining ANTIALIASING_ALGORITHM for now. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4181 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix brightness of subtitleskmkaplan2002-01-121-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4123 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add spudec_new_scaled and spudec_draw_scaled for vobsub support.kmkaplan2002-01-101-39/+310
| | | | | | | | | | | | | | | | Change what is passed to spudec_new for vobsub support. Suppress conditional on USE_DVDREAD. Correct a bug where some subtitles with no Stop display control code would not display long enough. Be more strict with bogus packets. Transform everything that should into unsigned. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4079 b3059339-0415-0410-9bf9-f77b7e298cf2
* dvdsub pts fix, based on patch by Kim Minh Kaplanarpi2001-12-281-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3843 b3059339-0415-0410-9bf9-f77b7e298cf2
* printf->mp_msgarpi2001-12-281-17/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3823 b3059339-0415-0410-9bf9-f77b7e298cf2
* more stable and reliable spudec packet reassemblerarpi2001-12-281-0/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3821 b3059339-0415-0410-9bf9-f77b7e298cf2
* dvd seeking -> subtitle disappearing bugs fixedarpi2001-12-251-2/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3745 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixes warningspl2001-12-251-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3726 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>:pl2001-12-091-17/+27
| | | | | | | | - removes garbage on the right hand side of DVD subtitles - improves the handling of unknown SPU control codes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3403 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix spudec compile with libdvdread enabled.atmos42001-11-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3184 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec_new has a dvd_priv_t as an argument, which is defined inpl2001-11-281-0/+5
| | | | | | | libmpdemux/stream.h only if USE_DVDREAD is defined. (Arpi) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3181 b3059339-0415-0410-9bf9-f77b7e298cf2
* unistd.h required at least by FreeBSDnexus2001-11-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3176 b3059339-0415-0410-9bf9-f77b7e298cf2
* Palette support for SPU decoder.atmos42001-11-271-48/+30
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3167 b3059339-0415-0410-9bf9-f77b7e298cf2
* subtitles looked bad here (inverted colors sometimes)pl2001-11-201-1/+5
| | | | | | | | looked like values wrapped around the byte (not sure of the side effects but subtitles look good now) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3039 b3059339-0415-0410-9bf9-f77b7e298cf2
* DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>arpi2001-11-201-96/+312
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3035 b3059339-0415-0410-9bf9-f77b7e298cf2
* (C) fixedarpi_esp2001-04-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@674 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec_decode() moved from mplayer.c to spudec.carpi_esp2001-04-211-0/+29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@562 b3059339-0415-0410-9bf9-f77b7e298cf2
* Separated dvdsub code to be able to work with it easierlgb2001-04-211-0/+88
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@561 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by