summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ordered_chapters'Uoti Urpala2009-04-0828-358/+906
|\
| * Add option -noordered-chapters.Uoti Urpala2009-04-085-0/+16
| |
| * Support chapter seeking with ordered chaptersUoti Urpala2009-04-025-8/+70
| |
| * Change demuxer_seek_chapter() parametersUoti Urpala2009-04-025-66/+26
| | | | | | | | | | | | Remove the "num_chapters" and "mode" parameters that aren't needed by any callers. Change "float *seek_pts" to "double *". Allocate the string returned via "chapter_name" with talloc.
| * demux_mkv: Remove first_tc and stop_timecodeUoti Urpala2009-04-021-33/+3
| | | | | | | | | | | | | | | | | | | | | | The first_tc code was used to force timestamps in the file to start from 0. There should be no need to do this, and it would likely break ordered chapter support for any files it affected (since the chapter timecodes would refer to the original times, not the modified ones). stop_timecode was used to implement end of playback at a specified chapter. There is now common code which implements that and demuxer-specific implementations are not needed.
| * demux_mkv: Adjust seeks a bit to catch inexact keyframe matchesUoti Urpala2009-04-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a seek to "time X or before" to match a keyframe at X plus 1 ms, and correspondingly for seeks to "X or later". This allows seeks to a known keyframe to succeed even if the time is not quite perfectly exact. The main motivation for this improvement was chapter seeking. Some time ago things worked in practice because chapter times were slightly below the exact target and demux_mkv seeked forward of the specified position by default. Some commits ago demux_mkv started seeking backward by default, which is generally a more desirable behavior, but worked worse for the chapter times which happened to be slightly behind a keyframe rather than ahead. After this commit chapter seeks go to the desired keyframe again.
| * VO: Don't reset pause status in VO config() functionsUoti Urpala2009-04-026-6/+4
| | | | | | | | | | | | | | | | | | Many VOs kept track of pause status, but reset the value when their config() function was called. However it can be called while playback stays in pause mode. Modify the VOs to not change anything in config(). Also send the VO either VOCTRL_PAUSE or VOCTRL_RESUME when the playback of a new file is starting to make sure they have the right status.
| * Make -fixed-vo the defaultUoti Urpala2009-04-022-4/+6
| | | | | | | | | | | | | | | | Lack of -fixed-vo causes the output window to be recreated not only when changing files but also when switching the video stream, and that happens when moving from one ordered chapter source to another. Having the window disappear and reappear (likely at another location if it was ever moved) is just too annoying.
| * Initial ordered chapters supportUoti Urpala2009-04-029-25/+437
| | | | | | | | | | | | | | | | | | | | | | 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.
| * core: Clean up OSD seek info logicUoti Urpala2009-03-313-32/+29
| | | | | | | | | | | | | | | | | | | | Clean up the code and make the behavior more consistent. Before bits of the OSD information were triggered in different places, and various property commands that affect playback position only showed the seek bar while the main seek command also triggered showing the percentage in OSD text. Now only the seek and chapter commands trigger all information and others nothing (which is consistent with most property behavior).
| * options: Move osd_level and osd_duration to options structUoti Urpala2009-03-317-27/+36
| |
| * vf_ass: Free private data at uninitUoti Urpala2009-03-311-0/+1
| |
| * VO: Don't force window position in X11 VOsUoti Urpala2009-03-314-1/+15
| | | | | | | | | | | | | | | | | | | | Disable by default the code that forcefully moved the video output window to the middle of the screen whenever it was reconfigured or created. That behavior was really annoying when switching video streams within a file, and overriding the window manager like that is not good default behavior for the initial creation of a window either. Add a new option "-force-window-position" that can be used to restore the old behavior.
| * Set the fullscreen option value too when fs state changesUoti Urpala2009-03-291-0/+1
| | | | | | | | | | | | | | If the fullscreen state was changed via keyboard commands or the slave interface the option value was not changed. However that value is used if the VO is reconfigured. Set the option too to avoid switching back to the previous state in that case.
| * Add improved relative seek modeUoti Urpala2009-03-244-7/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the new mode is active relative seeks are converted to absolute ones (current video pts + relative seek amount) and forward/backward flag before being sent to the demuxer. This mode is used if the demuxer has set the accurate_seek field in the demuxer struct and there is a video stream. At the moment the mkv and lavf demuxers enable the flag. This change is useful for later Matroska ordered chapter support (and for more general timelime editing), but also fixes problems in existing functionality. The main problem with the old mode, where relative seeks are passed directly to the demuxer, is that the user wants to seek relative to the currently displayed position but the demuxer does not know what that position is. There can be an arbitrary amount of buffering between the demuxer read position and what is displayed on the screen. In some situations this makes small seeks fail to move backward at all (especially visible at high playback speed, when audio needs to be demuxed and decoded further ahead to fill the output buffers after resampling). Some container formats that can be used with the lavf demuxer do not always have reliable timestamps that could be used for unambiguous absolute seeking. However I made the demuxer always enable the new mode because it already converted all seeks to absolute ones before sending them to libavformat, so cases without reliable absolute seeks were failing already and this should only improve the working cases.
| * demux_mkv: Parse ordered chapter informationUoti Urpala2009-03-223-3/+92
| | | | | | | | | | | | Parse the ordered chapter structure if present and place the information in the public demuxer structure. Nothing uses the information yet.
| * Allocate struct demuxer with tallocUoti Urpala2009-03-212-4/+5
| | | | | | | | Makes it possible to add data to it without explicit freeing code.
| * demux_mkv: Some cleanup, fix duration printed at verbose levelUoti Urpala2009-03-211-154/+134
| | | | | | | | | | | | | | | | | | | | | | Clean up demux_mkv_read_info() and demux_mkv_read_chapters() somewhat. (Why do the names of static functions have a stupid prefix like that? Didn't remove it now however). Demux_mkv_read_info() now delays printing duration information until the end of the function where we hopefully have the correct timescale for converting it to seconds. The code to calculate the duration had been fixed for that earlier but the message had not.
* | vo_xv: Fix context Shminfo table sizeUoti Urpala2009-04-051-1/+1
| | | | | | | | | | This bug could cause problems if you used -dr with xv. The most likely symptom was crash at uninit.
* | Merge svn changes up to r29136Uoti Urpala2009-04-032-0/+4
|\ \ | | | | | | | | | Fixes compilation with latest FFmpeg.
| * | add fourccs: dvp and dvs1, from vlc dv video fourcc listcompn2009-04-031-0/+2
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29136 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Fix compilation for newly added VAAPI_HWACCEL's.cehoyos2009-04-031-0/+2
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29135 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | Make VO xv preferred over vdpau againUoti Urpala2009-04-021-3/+3
| | | | | | | | | | | | | | | I can still reproduce bugs easily with vo vdpau, and there's no pause update support for it yet.
* | | Merge svn changes up to r29134Uoti Urpala2009-04-0235-198/+378
|\| |
| * | Use native endian float filter provided by libbs2b instead ofbircoph2009-04-021-5/+2
| | | | | | | | | | | | | | | | | | | | | selection based on WORDS_ENDIAN. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29134 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Add documentation for libbs2b audio filter.bircoph2009-04-021-0/+17
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29133 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Add libbs2b audio filter itself.bircoph2009-04-023-0/+220
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29132 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Support for libbs2b audio filter.bircoph2009-04-021-0/+43
| | | | | | | | | | | | | | | | | | | | | Add auto detection and selection routines to configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29131 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Fix compilation with libavcodec's HWACCEL.cehoyos2009-04-021-0/+5
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29130 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | swscale: Remove mmx2 params from h[yc]scale().ramiro2009-04-021-29/+36
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29129 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | swscale: Split h[yc]scale_fast() into their own functions.ramiro2009-04-021-23/+38
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29128 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | swscale: Execute sfence and emms depending on runtime flags.ramiro2009-04-021-17/+4
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29127 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Remove unnecessary malloc.h #includes and related #ifdeffery.diego2009-04-0226-123/+0
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29126 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Add recently added FFmpeg subdirs to DIRS variable.diego2009-04-021-0/+11
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29125 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | override codec tag for pcm s32le and s32be, used in movbcoudurier2009-04-021-0/+2
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29124 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Add config.h #include, necessary for HAVE_MALLOC_H check.diego2009-04-011-0/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29123 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Remove unused variable along with the related warning.diego2009-04-011-1/+0
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29122 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Increase probe buffer size to 32kB, this makes ac3 auto-detection far more ↵reimar2009-04-011-1/+1
| | | | | | | | | | | | | | | | | | reliable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29121 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | At least direct3d vo supports -xineramascreen, tooreimar2009-04-011-1/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29120 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Make examples and test progs depend on librariesmru2009-04-011-5/+0
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29119 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Prefer vo vdpau over vo xv where available.cehoyos2009-03-311-3/+3
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29118 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | Merge svn changes up to r29117Uoti Urpala2009-04-01130-2030/+3071
|\| |
| * | 100l, add forgotten BGR15 format to fmt-conversion.c tablereimar2009-03-311-0/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29117 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | cdvh decodes with ffdvcompn2009-03-311-0/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29116 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Add forgotten escapes for -reimar2009-03-311-2/+2
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29115 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Add missing $(EXESUF) to example/test program dependency declaration.diego2009-03-311-3/+3
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29114 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Explain relationship between -geometry and -xineramascreen.reimar2009-03-311-0/+3
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29113 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Get rid of nonsensical limits on -geometry x, y,w and h values, they onlyreimar2009-03-311-15/+8
| | | | | | | | | | | | | | | | | | | | | cause confusion on multi-monitor setups. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29112 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | More flags; sync with Linux kernel.zuxy2009-03-311-1/+10
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29111 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | override lavf tag for pcm s24le, mov uses the same for s24bebcoudurier2009-03-301-0/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29110 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Support IMGFMT_NV12 for vo vdpau.cehoyos2009-03-301-0/+6
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29109 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Set the forced_subs_only value correctly whenever a new spudec is created.reimar2009-03-302-1/+6
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29108 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Use correct PRId64 instead of "lld" in printf string, fixes compiler warnings.reimar2009-03-301-1/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29107 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Make sure we do not accidentally use the vdp_get_error_string from thereimar2009-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | previous initialization. git-svn-id: svn://svn.mplayerhq