summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* EDL: add support for new EDL file formatUoti Urpala2011-04-058-18/+491
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timeline code previously added to support Matroska ordered chapters allows constructing a playback timeline from segments picked from multiple source files. Add support for a new EDL format to make this machinery available for use with file formats other than Matroska and in a manner easier to use than creating files with ordered chapters. Unlike the old -edl option which specifies an additional file with edits to apply to the video file given as the main argument, the new EDL format is used by giving only the EDL file as the file to play; that file then contains the filename(s) to use as source files where actual video segments come from. Filename paths in the EDL file are ignored. Currently the source files are only searched for in the directory of the EDL file; support for a search path option will likely be added in the future. Format of the EDL files The first line in the file must be "mplayer EDL file, version 2". The rest of the lines belong to one of these classes: 1) lines specifying source files 2) empty lines 3) lines specifying timeline segments. Lines beginning with '<' specify source files. These lines first contain an identifier used to refer to the source file later, then the filename separated by whitespace. The identifier must start with a letter. Filenames that start or end with whitespace or contain newlines are not supported. On other lines '#' characters delimit comments. Lines that contain only whitespace after comments have been removed are ignored. Timeline segments must appear in the file in chronological order. Each segment has the following information associated with it: - duration - output start time - output end time (= output start time + duration) - source id (specifies the file the content of the segment comes from) - source start time (timestamp in the source file) - source end time (= source start time + duration) The output timestamps must form a continuous timeline from 0 to the end of the last segment, such that each new segment starts from the time the previous one ends at. Source files and times may change arbitrarily between segments. The general format for lines specifying timeline segments is [output time info] source_id [source time info] source_id must be an identifier defined on a '<' line. Both the time info parts consists of zero or more of the following elements: 1) timestamp 2) -timestamp 3) +duration 4) * 5) -* , where "timestamp" and "duration" are decimal numbers (computations are done with nanosecond precision). Whitespace around "+" and "-" is optional. 1) and 2) specify start and end time of the segment on output or source side. 3) specifies duration; the semantics are the same whether this appears on output or source side. 4) and 5) are ignored on the output side (they're always implicitly assumed). On the source side 4) specifies that the segment starts where the previous segment _using this source_ ended; if there was no previous segment time 0 is used. 5) specifies that the segment ends where the next segment using this source starts. Redundant information may be omitted. It will be filled in using the following rules: - output start for first segment is 0 - two of [output start, output end, duration] imply third - two of [source start, source end, duration] imply third - output start = output end of previous segment - output end = output start of next segment - if "*", source start = source end of earlier segment - if "-*", source end = source start of a later segment As a special rule, a last zero-duration segment without a source specification may appear. This will produce no corresponding segment in the resulting timeline, but can be used as syntax to specify the end time of the timeline (with effect equal to adding -time on the previous line). Examples: ----- begin ----- mplayer EDL file, version 2 < id1 filename 0 id1 123 100 id1 456 200 id1 789 300 ----- end ----- All segments come from the source file "filename". First segment (output time 0-100) comes from time 123-223, second 456-556, third 789-889. ----- begin ----- mplayer EDL file, version 2 < f filename f 60-120 f 600-660 f 30- 90 ----- end ----- Play first seconds 60-120 from the file, then 600-660, then 30-90. ----- begin ----- mplayer EDL file, version 2 < id1 filename1 < id2 filename2 +10 id1 * +10 id2 * +10 id1 * +10 id2 * +10 id1 * +10 id2 * ----- end ----- This plays time 0-10 from filename1, then 0-10 from filename1, then 10-20 from filename1, then 10-20 from filename2, then 20-30 from filename1, then 20-30 from filename2. ----- begin ----- mplayer EDL file, version 2 < t1 filename1 < t2 filename2 t1 * +2 # segment 1 +2 t2 100 # segment 2 t1 * # segment 3 t2 *-* # segment 4 t1 3 -* # segment 5 +0.111111 t2 102.5 # segment 6 7.37 t1 5 +1 # segment 7 ----- end ----- This rather pathological example illustrates the rules for filling in implied data. All the values can be determined by recursively applying the rules given above, and the full end result is this: +2 0-2 t1 0-2 # segment 1 +2 2-4 t2 100-102 # segment 2 +0.758889 4-4.758889 t1 2-2.758889 # segment 3 +0.5 4.4758889-5.258889 t2 102-102.5 # segment 4 +2 5.258889-7.258889 t1 3-5 # segment 5 +0.111111 7.258889-7.37 t2 102.5-102.611111 # segment 6 +1 7.37-8.37 t1 5-6 # segment 7
* stream.[ch], ass_mp: new stream function for whole-file readsUoti Urpala2011-03-033-34/+56
| | | | | | Add new stream_read_complete() function which reads the complete contents of file. Use that in ass_mp.c which had custom code to do the same.
* tl_matroska.c: move the find_files() function hereUoti Urpala2011-03-035-83/+60
| | | | | | Move the find_files() function from findfiles.c to tl_matroska.c. Delete the findfiles.c file. Add a check against opendir() failure in find_files().
* bstr.[ch], path.[ch]: add string and path handling functionsUoti Urpala2011-02-265-32/+190
| | | | | | | Add some new string and path handling functions to be used in following commits. Use new path handling functions to simplify find_files().
* core: ordered chapters: move timeline creation to timeline/Uoti Urpala2011-02-264-207/+240
| | | | | | | | | | Add new file timeline/tl_matroska.c. Move the code that parses ordered chapter information from Matroska files and creates the timeline structure based on that to the new file. Initialize the format parameter given to open_stream() in the moved code. The previous uninitialized value shouldn't have caused any visible effects.
* options: drop support for numeric -demuxer valuesUoti Urpala2011-02-223-85/+68
| | | | | | | Drop support for specifying demuxer types by numeric ID (options -demuxer, -audio-demuxer and -sub-demuxer). Stop printing the numeric values in "-demuxer help" output. Convert the list of DEMUXER_TYPE_XXX defines to "enum demuxer_type".
* cleanup: demuxer.[ch]: remove unused code, make functions staticUoti Urpala2011-02-224-32/+9
| | | | | | | Remove some unused lines from demuxer.h. Make some demuxer.c functions static. Move new_ds_stream() declaration from demuxer.h to stream.h (the function is defined in stream.c). Clean up some code in mplayer.c that had commented-out free_demuxer_stream() calls.
* cleanup: reindent demuxer.h, use struct names for typesUoti Urpala2011-02-221-169/+193
| | | | | Reindent demuxer.h and also change some comments. Change some types from 'foo_t' to 'struct foo'.
* build: change version number generationUoti Urpala2011-02-193-7/+8
| | | | | | | Force Makefile to always run version.sh to potentially regenerate version.h. Drop compiler version and 'git-' prefix from version number. Match only git tags starting 'v'+number when generating version number; leave the 'v' out from the result.
* configure: fix --enable-libvorbis with tremor installedUoti Urpala2011-02-181-0/+2
| | | | | | Autodetected libvorbis prevented tremor test from running, but --enable-libvorbis didn't. Add an explicit check to disable tremor in that case.
* .gitignore: add /po and /localeUoti Urpala2011-02-151-0/+2
|
* terminal output: change program name to "MPlayer2"Uoti Urpala2011-02-151-1/+1
|
* codecs.conf: Add FFmpeg WC4 xan decodercehoyos2011-02-151-0/+8
| | | | | | Patch by Philip Langdale, philipl overt org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32875 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_ts: change DVB SPU format for libavcodecreimar2011-02-151-3/+4
| | | | | | | | Change DVB SPU stream format in TS demuxer so it can be decoded by libavcodec (as soon as lavc is fixed not to fail just because of an extra padding byte). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32866 b3059339-0415-0410-9bf9-f77b7e298cf2
* subs: Print a message when lavc subtitle decoding failsreimar2011-02-151-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32865 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_ts: DVB and PGS subtitle fixesreimar2011-02-151-6/+5
| | | | | | | | Fix r32587: the previous approach to return subtitles in time broke DVB subtitles due to returning incomplete packets and even for PGS subtitles resulted in incorrect pts values for the sub packets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32864 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_qtaudio: fix use with the libavformat mov demuxerfaust32011-02-151-2/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32863 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_ts: Set subtitle stream type correctly for DVB subtitlesreimar2011-02-151-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32862 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: remove some casts of memalign() return valuediego2011-02-152-6/+6
| | | | | | | Do not pointlessly cast the return value of memalign(). memalign() returns void*, which is compatible with any pointer in C. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32850 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add apco, ap4h, ai55, ai15 fourccscompn2011-02-151-0/+5
| | | | | | | add apco and ap4h fourcc to prores decoder add ai55 and ai15 fourcc to h264 docoders git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32843 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_mpng: libpng API update, use color type gettercboesch2011-02-151-3/+6
| | | | | | | | | | Use color type getter instead of direct access to private member. Using the getter is mandatory since recent libpng 1.5 release. Patch by Gianluigi Tiesi (mplayer - netfarm it) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32840 b3059339-0415-0410-9bf9-f77b7e298cf2
* libmpcodecs/vf_*.c: Replace memalign() by av_malloc()michael2011-02-153-8/+12
| | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32834 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix postprocessing and perspective filters on x86-64 (missing libavutil/mem.h include). Original patch by Reinhard Tartler git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32835 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream/url.c: escape characters >= 127 in URLsreimar2011-02-151-2/+1
| | | | | | Escape character values >= 127 in URLs as required by the RFC. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32833 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_asf: add sanity checkreimar2011-02-151-0/+4
| | | | | | Check that rlen is valid before using it to increment a pointer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32832 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: disable libmpcdec by defaultreimar2011-02-151-3/+4
| | | | | | | Disable libmpcdec (musepack) support by default, FFmpeg has a decoder that works better for us and is used by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32826 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: mplayer.c: clean up pause_loop() a bitUoti Urpala2011-02-151-11/+11
|
* terminal output: show cache fill changes in "PAUSED" messagereimar2011-02-153-6/+31
| | | | | | | | | | | Convert cache_fill_status into a function so we always get the latest state, not whatever it was after the last read. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32818 b3059339-0415-0410-9bf9-f77b7e298cf2 Update PAUSED status line with cache fill status if it changed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32819 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: remove unused maemo checkUoti Urpala2011-02-151-24/+0
| | | | | | configure had a check for some libraries specific to the maemo platform. Apparently the code which would have used the results of this check was never added. Remove the unused check.
* configure: use LINGUAS environment variable for messagesUoti Urpala2011-02-151-0/+1
| | | | | | | | Previously the default with --enable-translation was to install all language files if --language-msg was not explicitly specified. Change the default to the languages set with the --language option or LINGUAS environment variable if those are set; if neither is set then the default is still to install all message languages.
* DOCS/xml/en: remove various outdated documentationUoti Urpala2011-02-159-10952/+43
| | | | | | | | | | The XML documentation was badly outdated, with various obsolete, useless and and sometimes actively harmful advice. Delete a lot of the obsolete stuff, without spending much effort to replace it for now. In the FAQ section I removed some questions completely; in other cases I only removed the answer if I thought the entry might be worth keeping but the answer would need to be updated.
* documentation: remove Changelog, rewrite READMEUoti Urpala2011-02-153-3338/+28
| | | | | The Changelog and README files were badly out of date. Remove Changelog and replace README with a new minimal one.
* configure: abort if FFmpeg libraries are not foundUoti Urpala2011-02-081-2/+4
| | | | | | | | | | | | | | Abort if FFmpeg libraries are not found unless --disable-ffmpeg was explicitly specified. Note that even if you disable FFmpeg, libavutil and libswscale are still required and you'll need to add linker flags for them manually; I didn't try to clean up that case (few people will want to do that). Also fix the fallback test used if pkg-config doesn't find the libraries: fix wrong header name and drop forced -lavcore which isn't present in all FFmpeg versions. This shouldn't make a difference for normal use since the pkg-config test should succeed if the libraries are available.
* fix compilation with old FFmpeg versionsUoti Urpala2011-02-085-6/+25
| | | | | | | | | | | | af_lavcac3enc: use old SampleFormat names without AV_ prefix, the latter were only added in 2010-11 vd_ffmpeg: add ifdef around CODEC_ID_LAGARITH use demux_real: use ffmpeg_files/intreadwrite.h stream/http.c, stream/realrtsp/real.c: define AV_BASE64_SIZE macro for old libavutil versions lacking it
* ffmpeg_files/taglists.c: add new FFmpeg valuesUoti Urpala2011-02-051-0/+10
| | | | Updated to last FFmpeg svn version values (r26400).
* input: accept Shift modifier for Enter and Tab keysUoti Urpala2011-02-051-1/+2
| | | | | | Enter and Tab are the only named keys (rather than identified by the printable character they produce) with code below 256. Add a special case to recognize the Shift modifier with them.
* input: remove incorrect "CTRL" keyname alias for backspaceUoti Urpala2011-02-051-1/+0
| | | | | | | | | | | The keycodes.h file contains a KEY_CTRL define, then various control keys expressed as "KEY_CTRL + 0" and so on. Back in 2002 when the key name table in input.c was created this KEY_CTRL define was mistakenly interpreted as a key name, apparently confusing it with the Ctrl key (even though the input system didn't handle that key back then). As a result there was an incorrect key name entry with the same key code as backspace and name "CTRL". This incorrect entry was used when printing the name of the key. Delete it.
* x11_common: fix for reconfig with pos/xineramascreen setUoti Urpala2011-02-032-9/+9
| | | | | | | | | | | | | vo_x11_create_vo_window() only called vo_x11_update_geometry() if no window position had been specified by -geometry or -xineramascreen, to avoid overwriting the specified position with values from the existing window. However window size should be initialized to the existing window here, and setting new window title for -use-filename-title is also done in vo_x11_update_geometry() (for whatever reason, it doesn't match what else that function does). Change the code in vo_x11_create_vo_window() to always call vo_x11_update_geometry() for size variable and window title updates, but add a flag that tells it not to update position variables.
* af_lavcac3enc: fix for lavc AC-3 encoder change to float inputUoti Urpala2011-02-031-5/+26
| | | | | | | | | | | | | | | | The libavcodec AC-3 encoder was changed to use floats, and take floating point samples as input (the fixed-point version is still available under the new name "ac3_fixed"). This broke af_lavcac3enc because it blindly assumed without checking that the "ac3" encoder would take signed 16-bit integer samples. Improve af_lavcac3enc so that it checks the sample formats supported by the encoder and can handle either int16_t or float. Perhaps an option to keep using integer input but instead switch the encoder name to "ac3_fixed" for new libavcodec versions would have some value. Then again, maybe not. Using the preferred data format of the default "ac3" encoder should normally be best, so probably better not add such an option unless real need appears.
* ad_ffmpeg: add missing extradata paddingUoti Urpala2011-02-021-1/+2
| | | | | | One of two alternative code parts passing codec extradata to libavcodec didn't add the buffer padding that libavcodec requires, resulting in invalid reads beoynd allocated memory area. Fix.
* configure: print "Unknown parameter: " error to stderrUoti Urpala2011-02-021-1/+1
| | | | | Print the "Unknown parameter: " line shown for unrecognized configure options to stderr; other fatal errors are already directed there.
* configure: drop unused liblzo and bzlib testsUoti Urpala2011-02-021-35/+0
| | | | | The configure liblzo test was left over from MEncoder functionality, bzlib from internal FFmpeg build. Remove both.
* configure: prefer libvorbis to libvorbisidec/tremorUoti Urpala2011-02-011-6/+6
| | | | | | | | libvorbis and libvorbisidec cannot both be enabled at the same time. Change configure to enable libvorbis by default if both are available. It's the more common library, and if someone want to do a special build for FPU-less systems he can select the library manually.
* tremor: drop internal tremor libraryUoti Urpala2011-02-0137-9779/+3
| | | | | | | Drop internal copy of the tremor library. Note that the internal ogg demuxer (which is still sometimes useful to work around libavformat ogg demuxer problems, though it's itself quite buggy) now cannot be compiled without either external libvorbis or libvorbisidec (tremor).
* libmpeg2: drop libmpeg2 supportUoti Urpala2011-02-0131-13963/+0
| | | | | libavcodec mpeg2 decoder has been the default for a while and seems to work fine.
* Copyright: delete removed library copies from listUoti Urpala2011-02-011-46/+4
|
* terminal output: change infamous "Core dumped" messageUoti Urpala2011-02-011-2/+2
| | | | | | The "Core dumped ;)" message printed after finishing a stream dump is known to confuse users but was kept as "humor". Change it to say "Stream dump complete." instead.
* manpage: remove BUGS section, misc fixesUoti Urpala2011-02-011-22/+4
| | | | | | | About the only useful part of the BUGS section on the manpage was a link to mplayerhq.hu, and that doesn't really apply any more (includes references to Subversion etc). Remove that section and update/remove some outdated info.
* options: remove CONF_OLD option flagUoti Urpala2011-01-313-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The resulting semantics of this flag are weird enough that they're unlikely to be what is wanted in any situation. Remove the flag and convert the two options using it, -screenw and -screenh, to use CONF_NOSAVE instead. I'm not sure why those specific options had the flag and if any flag is really needed, but I don't want to check in detail now and using CONF_NOSAVE should keep about the same behavior in practice. A bit more detail about the weird behavior this flag had: When not using file groups, the flag had the same behavior as CONF_NOSAVE, namely that when switching files the option would not be reset to the global value (only possible file-specific settings were applied). When using file groups, group-specific options would apply to the _first two_ files in the group, but for the rest after the first two, settings would not be reset when changing files (wtf?). This was a result of the following sequence: 1) push higher-level settings, enter group 2) apply group-specific settings 3) push settings before applying ones specific to file 1 in group 4) apply file 1 settings, play file 1 5) pop settings to return to group settings 6) push settings before applying ones specific to file 2 7) apply file 2 settings 8) pop settings Here the option was set at 2). 3) saved it because it had been set after last push, so 5) restored the setting and it was used for file 2 too. However 6) no longer saved it because there had been pushes after the original setting in 2), thus 8) no longer restored the setting and the option was no longer forced to any particular value when playing further files after that.
* options: mark -fs with CONF_NOSAVE to keep state between filesUoti Urpala2011-01-311-1/+1
| | | | | | | | | | | Most of the time users want to keep current fullscreen state when switching to another file, rather than always resetting to the global default that was determined when the command line was parsed. Add the CONF_NOSAVE flag to the -fs option to achieve this. The change means that the fullscreen state from the previous file is kept unless there is an explicit file-specific -fs or -nofs setting for the new file (or in case file groups are used, moving to the new file enters a group with explicitly specified state).
* options: remove unused "func_full" option typeUoti Urpala2011-01-313-43/+2
| | | | | | vo_zr was the last user of the "func_full" option type. I think it's better if future features are implemented using more straightforward option functionality. Delete the func_full implementation.
* vo_zr2: drop Zoran supportUoti Urpala2011-01-3116-3455/+0
| | | | | | | There were multiple files specific to Zoran support, and they also depended on internal FFmpeg headers (so it would probably have been hard to get them to compile now even if you tried). It's obsolete now, so just drop the whole mess.
* vo_dxr2, ao_dxr2: drop dxr2 supportUoti Urpala2011-01-318-1326/+1
| | | | | | dxr2 support had been broken quite a while and nobody noticed. There were finally commits to fix it in the svn repo, but rather than apply those I'll just drop dxr2 support.
* vidix: drop VIDIX supportUoti Urpala2011-01-3193-44226/+14