summaryrefslogtreecommitdiffstats
path: root/mpcommon.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30065Uoti Urpala2009-12-291-5/+6
|\
| * Use on-stack subtitle struct for temporary storage for passing subtitles onreimar2009-12-181-5/+6
| | | | | | | | | | | | | | | | | | | | for rendering by libass. This avoids mangling the static subtitle struct that is supposed to contain the subtitles that will actually be displayed and it also minimally reduces memory usage by freeing the subtitle lines again as early as possible. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30059 b3059339-0415-0410-9bf9-f77b7e298cf2
* | subtitles: Fix double text with libass rendered plaintext subsUoti Urpala2009-12-181-2/+3
| | | | | | | | | | | | | | | | | | | | When using libass to render plaintext (non-SSA/ASS) subtitles the code in update_subtitles() still called set_osd_subtitle() in one case, causing the global vo_sub variable containing non-libass subtitles to be set. Under some circumstances this resulted in both a libass-rendered and non-libass-rendered version of the same subtitle appearing on screen. Fix by running the subtitle clearing code (which called set_osd_subtitle) only when libass is not used.
* | subtitles: Fix recent filter-rendered libass timing problemUoti Urpala2009-12-021-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 4c552b2e420ba4cb6d888b12360c7bf63e7cd03a ("core: Do OSD/subtitle updates at a more accurate point") made filter-rendered libass subtitles appear one frame too late the first time they became visible (VO rendering was not affected, and filter rendering was accurate if seeking back later). The reason was that the subtitle code did not feed the subtitle events to libass before their starting time, and this now happened after the filtering phase. Fix this by skipping the time check in the libass case and feeding demuxed subtitles to it unconditionally (as timing is done separately anyway with libass). There are still at least theoretically possible new problems in the filter-rendered case because the filter now relies on packets demuxed before the _previous_ frame. There's a bigger chance of getting the subtitle packet too late, and the filter can't see packets for the first frame after a seek. However the former is not an issue for the samples I tested even with -nosound, and subtitles are not in general guaranteed to be shown when seeking to a new position (though it could be worth a later improvement).
* | options: Move ass_enabled to options structUoti Urpala2009-12-021-1/+1
| |
* | Merge svn changes up to r29912Uoti Urpala2009-11-161-12/+36
|\|
| * Add support for DVB teletext.reimar2009-11-101-1/+23
| | | | | | | | | | | | | | Patch by Francesco Lavra [francescolavra interfree it] with modifications by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29875 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove CONFIG_TV_TELETEXT.cehoyos2009-11-071-2/+0
| | | | | | | | | | | | | | | | DVB teletext support is nearly finished, it will be possible to read teletext from file, it will not be depending on reception any more. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Separate teletext from tv support.cehoyos2009-11-071-9/+8
| | | | | | | | | | | | | | Path by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Unbreak the demuxer-specific code in video.c with e.g.reimar2009-11-011-0/+4
| | | | | | | | | | | | | | | | | | | | -audiofile by moving the code to manually interleave subtitles to mp_common.c. video.c should still be changed to not be demuxer-specific anymore, it is bad practice but fully fixing it is non-trivial. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29810 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add MSGT_TELETEXT, rename TVI_CONTROL as VBI_CONTROL and fix some pathscehoyos2009-10-291-5/+5
| | | | | | | | | | | | | | | | | | in comments. Based on a patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29802 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move teletext specific code from stream into libmpcodecs.cehoyos2009-10-291-0/+1
| | | | | | | | | | | | | | Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29752Uoti Urpala2009-10-061-31/+28
|\| | | | | | | | | | | | | | | | | 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.
| * Add support for displaying subtitles on the command-line when playingreimar2009-09-231-6/+3
| | | | | | | | | | | | | | audio-only files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29712 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make update_subtitles work without sh_video for text subtitles.reimar2009-09-231-3/+2
| | | | | | | | | | | | | | | | | | This fixes a crash with e.g. auto-enabled subtitles and -novideo due to command.c calling update_subtitles even without video and is a step toward subtitle support for audio-only files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29710 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Include mpcommon.h in mpcommon.c, ensures that the declarations in the headerreimar2009-09-231-0/+1
| | | | | | | | | | | | | | match those in the file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29708 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factor out sh_video->pts into a refpts variable. This simplifies a future patchreimar2009-09-231-12/+12
| | | | | | | | | | | | | | that reduces the dependency on sh_video. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29707 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename ambiguous "pts" variable to subpts.reimar2009-09-231-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29706 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29532Uoti Urpala2009-08-181-2/+0
|\|
| * Remove pointless #ifdefs around harmless internal header #includes.diego2009-08-021-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29471 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Change type names to match upstream libassGrigori Goronzy2009-08-071-1/+1
| |
* | Remove internal libass treeUoti Urpala2009-07-261-2/+1
| | | | | | | | | | Remove the libass/ directory and use the newest standalone version of the library instead.
* | 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 the internal GUIAnton Khirnov2009-07-071-9/+0
| | | | | | | | | | | | | | | | | | The GUI is badly designed and too closely coupled to the internal details of other code. The GUI code is in bad shape and unmaintained for years. There is no indication that anyone would maintain it in the future either. Even if someone did volunteer to implement a better integrated GUI having the current code in the tree probably wouldn't help much. So get rid of it.
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-1/+1
| |
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-2/+2
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-2/+2
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Merge svn changes up to r29154Uoti Urpala2009-04-091-2/+2
|\| | | | | | | | | Synchronizes runtime CPU detection handling in the build system with latest FFmpeg.
| * Rename RUNTIME_CPUDETECT to CONFIG_RUNTIME_CPUDETECT and always define it.ramiro2009-04-081-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29154 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Initial ordered chapters supportUoti Urpala2009-04-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | Add basic support for Matroska ordered chapters. The switching between segments is implemented as a general edit timeline that could also be used for other purposes. Some things still need improvement. In particular the current code does not try to do any proper mapping between audio/video/subtitle streams of different files and there should be options for better control of how MPlayer searches other files for the required content.
* | Merge svn changes up to r28403Uoti Urpala2009-01-311-16/+8
|\|
| * Replace a bunch of '#if HAVE_FOO' preprocessor checks by 'if (HAVE_FOO)'.diego2009-01-261-16/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28375 b3059339-0415-0410-9bf9-f77b7e298cf2
| * HAVE_3DNOW --> HAVE_AMD3DNOWdiego2009-01-261-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28366Uoti Urpala2009-01-261-0/+51
|\| | | | | | | | | | | | | | | | | Contains more changes needed to sync build system with latest FFmpeg. Conflicts: Makefile configure mplayer.c
| * Add SSSE3 and CMOV to CPU information printed on startup.diego2009-01-251-2/+8
| | | | | | | | | | | | | | Fixes Bugzilla #1378. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28366 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Consistently name 3DNow! extensions.diego2009-01-251-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28365 b3059339-0415-0410-9bf9-f77b7e298cf2
| * HAVE_3DNOWEX --> HAVE_3DNOWEXTdiego2009-01-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28361 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factorize print_version().diego2009-01-251-0/+45
| | | | | | | | | | | | | | Print CPU information in verbose mode instead of by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28360 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert bad changes to SSA/ASS subtitle packet formatuau2008-09-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following commits are reverted partially or completely: "a valid ASS line contains 9 ',' before actual text" "demux_mkv: output correctly formated ASS packets" "libass: add a new ass_process_data() to process demuxed subtitle packets" These commits converted the internal representation of SSA/ASS subtitle packets from the format used by Matroska to a custom format where each packet has contents exactly matching one line in complete SSA script files. AFAIK no files natively use such a format for muxed subtitles. The stated reason for this change was to use a format that could in principle be muxed into a maximal number of containers. SSA subtitles do not have an implicit duration so both start time and duration or end time need to be specified explicitly; the new format moved timing information inside the codec packet data so it could be muxed without modification into containers that can represent only start time at the container level. However such a change is wrong from the viewpoint of program architecture. Timing information belongs to the demuxer level, but these commits moved not only the duration but also the authoritative value of the start time to inside the codec data. Additionally the new format lost the value of the Matroska ReadOrder field which is used by MPlayer. This commit changes the internal packet format back to that used by Matroska and makes the internal Matroska demuxer output that format again. Libavformat still outputs the "new" format; it could be converted back to the Matroska format in demux_lavf.c, but I'm not adding that code at least yet. The current lavf code has similar problems as the reverted code in MPlayer, and it also currently fails to provide any way to access the value of the ReadOrder field. I hope that the lavf side will be improved; if it isn't conversion can be added later. For now I'll make MPlayer default to the internal Matroska demuxer instead of the lavf one in a separate commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27550 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libass: add a new ass_process_data() to process demuxed subtitle packetsaurel2008-09-051-3/+1
| | | | | | | | | | | | | | conforming to the ASS spec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27530 b3059339-0415-0410-9bf9-f77b7e298cf2
| * a valid ASS line contains 9 ',' before actual textaurel2008-09-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27526 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Include corresponding .h in some .c filesUoti Urpala2008-08-121-0/+1
| |
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-031-2/+2
| | | | | | | | | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-6/+6
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Rename two GUI-related preprocessor directives:diego2008-07-301-6/+6
| | | | | | | | | | | | | | HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * Start unifying names of internal preprocessor directives.diego2008-07-301-2/+2
| | | | | | | | | | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Move dvdsub_id to options structUoti Urpala2008-04-231-2/+5
| | | | | | | | | | | | | | Name the field "sub_id" as it's not specific to DVD subs. Remove some other unused extern declarations together with dvdsub_id from demux_mkv.c and demux_lavf.c.
* | Move global vo_config_count to vo structUoti Urpala2008-04-231-2/+1