aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* demux_lavf: add simple seek-by-bytes mode for MPEGGravatar Uoti Urpala2010-11-10
| | | | | | | | | Seeking in MPEG files with pts resets could fail completely, as it was always done by timestamps and those of course don't unambiguously specify a file position in such files. Add basic functionality for byte-based seeking and playback position reporting, and decide whether to use that functionality based on a simple heuristic (could be improved).
* demux: improve -alang / -slang track choosing logicGravatar Uoti Urpala2010-11-08
| | | | | | | | | | | | When -alang / -slang was specified the numerically first matching track (if any) was always chosen. This meant that specifying "-alang eng" could change the track choice even if all tracks were in English, because now the default flag of tracks was ignored. Change the logic to take the default flag into account as a secondary sorting key. The code also accepted prefix matches, so that "-slang g" would match track language "ger". I think that was not intentional. Change it to require exact matches.
* demux_mkv: seek: with no track-specific index entries use anyGravatar Uoti Urpala2010-11-08
| | | | | | | | | The Cue entries in typical Matroska files have information for the video track only. This caused seeks to fail when playing with -novideo, as demux_mkv tried to use audio track index entries then. Add a fallback case that uses any index entries without caring what track they're for if there are no entries specific to the track we're interested in.
* demux_mkv: fix relative seeks without indexGravatar Uoti Urpala2010-11-08
| | | | | | | | Relative seeks didn't add the current position as they should. Fix. Note that this had no effect in normal playback case even if the file had no index, because the "accurate_seek" logic at higher level would convert all commands to absolute seeks before calling demuxer level.
* TOOLS/matroska.py: recognize MaxCache elementGravatar Uoti Urpala2010-11-08
|
* demux_mkv: fix seek hang when going past end of file without indexGravatar Uoti Urpala2010-11-08
|
* demux_mkv: cleanup: separate index creation part of seekingGravatar Uoti Urpala2010-11-08
| | | | | Move the code to build an index and seek without using cue information from the file to a separate function.
* core: use correct demuxer with -audiofile / -subfileGravatar Uoti Urpala2010-11-08
| | | | | | | | | | | Various code referred to "mpctx->demuxer" where it should really have referred to the one used for audio/subtitles in case those differ. Fix by using "mpctx->d_audio->demuxer" etc instead. Disable the copying of streams in demux_demuxers; that was a partial workaround for things referring to the main demuxer (and it wasn't enough anyway). This fixes, among other things, switching audio tracks within the file specified by -audiofile.
* demux_demuxers: initialize stream_pts to MP_NOPTS_VALUEGravatar Uoti Urpala2010-11-08
| | | | | | | demux_demuxers doesn't run the normal demuxer.c initialization for new demuxers. Initialize stream_pts separately (it won't ever be changed with the current implementation). This at least avoids other code assuming it was set properly.
* core: move video pos/length query functions from demux to coreGravatar Uoti Urpala2010-11-08
| | | | | | | | | Move functions to query current playback position, percentage position and total video length from from the demuxer layer to top level. The functions need access to playback state that doesn't belong on the demuxing level. Make the new functions more capable and simplify some code that can now rely on them. This fixes some errors in displayed in OSD and slave mode information when using timeline (ordered chapters).
* demux: fix -correct-pts autoselection with -audiofileGravatar Uoti Urpala2010-11-08
| | | | | | Make demuxer-based -correct-pts autoselection base the decision on the video demuxer in case several are being used, such as with -audiofile.
* cleanup: don't check for NULL before free()Gravatar diego2010-11-08
| | | | | | patch by Clément Bœsch, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: document need to add fourccs to parser list in demuxer.cGravatar cehoyos2010-11-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32597 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer.c: add missing parser list fourccsGravatar cehoyos2010-11-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32596 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer.c: fix parser list fourcc typo: 'MPE '->'MP3 'Gravatar cehoyos2010-11-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32595 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_ffmpeg: compare IMGFMT instead of PIX_FMTGravatar reimar2010-11-08
| | | | | | | Use IMGFMT to compare instead of PIX_FMT to avoid issues with the "JPEG" formats like PIX_FMT_YUVJ422P. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32594 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add missing YV12 output formats for FFmpeg codecsGravatar reimar2010-11-08
| | | | | | | For FFmpeg codecs YV12 should always be in the supported format lists if I420 is. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32593 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_dvd: fill_buffer(): use given buffer, not stream's defaultGravatar reimar2010-11-08
| | | | | | | | | Fix dvd:// fill_buffer function to actually write into the specified buffer and check that the buffer is sufficiently large. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32591 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32592 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_dvd: minor cleanupGravatar reimar2010-11-08
| | | | | | | | | | | | | | Remove a pointless and stupid condition. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32588 b3059339-0415-0410-9bf9-f77b7e298cf2 Change code to something understandable (but equivalent). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32589 b3059339-0415-0410-9bf9-f77b7e298cf2 100l, add missing return. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32590 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_ts: Fix subtitle sync issuesGravatar reimar2010-11-08
| | | | | | | Ensure we queue all subtitle packets before demuxing the next video packet. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32587 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: mark fflatm non-buggy (now default for AAC/LATM)Gravatar reimar2010-11-08
| | | | | | | fflatm seems to be working, whereas external faad does not work at all with latm (internal does). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32585 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_faad: Make work with -demuxer lavfGravatar reimar2010-11-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32586 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs_conf, mp_taglists: Use only one fourcc for LATMGravatar reimar2010-11-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32584 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_ffmpeg: Handle EAGAIN, needed for LATM to work properly with demux_tsGravatar reimar2010-11-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32583 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer.c: Add support for parsing LATMGravatar reimar2010-11-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32582 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_lavf: Fix program switchingGravatar reimar2010-11-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32580 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_lavf: Print PROGRAM_ID -identify output similar to demux_tsGravatar reimar2010-11-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32579 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_scale: accept all non-hw-accel formats we know a PIX_FMT forGravatar reimar2010-11-08
| | | | | | | | | | Make scale filter accept all non-hardware-acceleration input formats we know a PIX_FMT_* for. It is possible we will not have a conversion for some of these formats, but since it will just fail differently this approach is better since it avoids having to expand the explicit list continuously. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32576 b3059339-0415-0410-9bf9-f77b7e298cf2
* video: simplify some tests with a new IMGFMT_IS_HWACCEL macroGravatar reimar2010-11-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32575 b3059339-0415-0410-9bf9-f77b7e298cf2
* mplayer.desktop: Add video/3gpp and application/x-flash-video mime typesGravatar diego2010-11-08
| | | | | | patch extracted from the ALT Linux patch set git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32574 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: Do not enable rpath on NetBSDGravatar diego2010-11-08
| | | | | | patch extracted from the NetBSD pkgsrc tree git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32573 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: Enable joystick support on FreeBSDGravatar diego2010-11-08
| | | | | | patch extracted from the FreeBSD ports tree git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32572 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf, mp_taglists: Support FFmpeg LATM decodingGravatar cehoyos2010-11-08
| | | | | | | | Also move libfaad codecs.conf entry into the same position as in svn (no functionality change since ffaac is marked buggy so only faad is used by default regardless or order). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32571 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_kva: Restore all the attributes after changing aspect ratioGravatar komh2010-11-07
| | | | | | kvaSetup() resets all the attributes, so there is need to restore them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32570 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_kva: Prevent a parent window from painting over ours in slave modeGravatar komh2010-11-07
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32569 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_directx: Fix possible out-of-bounds accessGravatar reimar2010-11-07
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32568 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/man/zh_CH: sync with en/mplayer.1 rev. 32566Gravatar jrash2010-11-07
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32567 b3059339-0415-0410-9bf9-f77b7e298cf2
* TOOLS/binary_codecs.sh: make indentation consistentGravatar siretart2010-11-07
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32561 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache, stream: avoid extra memcpy when using cacheGravatar reimar2010-11-07
| | | | | | | | | | Add a stream_read_internal() function that reads directly into a given buffer instead of the stream's internal one. Use this to read directly into cache memory, avoiding a memcpy(). This requires also adding a stream_seek_internal() as the normal seek function reads into the stream's buffer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32559 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: cache2.c: Remove some irrelevant commented-out codeGravatar reimar2010-11-07
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32555 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_dvd: millisecond accuracy for chapters in -identify outputGravatar cigaes2010-11-07
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32539 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_lavf: for avi, use packet .dts instead of .ptsGravatar Uoti Urpala2010-11-06
| | | | | | | | | | | | When playing avi files take timestamps from the .dts field of the packet instead of .pts. For avi libavformat returns the original avi timestamps in .dts; without GENPTS set .pts is sometimes unset, with GENPTS set it'll contain some made up values which are not correct pts. Current libavformat also has a bug take makes it loop over the whole avi file if you use GENPTS with video streams disabled. The timing code can cope with the avi timestamps even though they're not really pts.
* build: enable vf_geq if libavutil version installs eval.hGravatar Uoti Urpala2010-11-06
| | | | | New enough libavutil versions allow building vf_geq.c without requiring internal FFmpeg headers.
* demux_lavf: avoid deprecated "first_iformat" by using newer APIGravatar Uoti Urpala2010-11-06
|
* demux_lavf: add hack for stream-changing ogg input (internet radio)Gravatar Uoti Urpala2010-11-06
| | | | | | | | | | | | | | | Some internet radio streams are ogg/vorbis with a new stream for each track (and the previous stream stops receiving data). Add a hack to ignore the stream number in packets when input seems to match this case; all packets will be effectively regarded as parts of the same audio stream. This workaround can't work perfectly with current lavf because it will keep adding streams and then hit its 20 stream maximum; at that point playback will likely fail. Print a warning about this problem and mention "-demuxer ogg" as a possible workaround. Currently there's no check that the vorbis extradata is actually compatible between the streams.
* demux_lavf: more future proof AVInputFormat name comparisonGravatar Uoti Urpala2010-11-06
| | | | | | | | AVInputFormat name fields consist of comma-separated components, more of which may be added in backwards-compatible versions. demux_lavf did a strcmp against the whole field at once; this would break if a component was added. Change the code to search for individual component matches within the field instead.
* ffmpeg_files/taglists.c: update to latest FFmpeg values (r25209)Gravatar Uoti Urpala2010-11-05
|
* options: add OPT_MAKE_FLAGS macro, creates "opt/noopt" flag pairGravatar Clément Bœsch2010-11-04
|
* options: move -name and -title to option structGravatar Clément Bœsch2010-11-04
|
* Makefile: enable .DELETE_ON_ERROR special targetGravatar Uoti Urpala2010-11-04
| | | | | | | | | msgfmt creates the output file even if there was a fatal error. Thus make would stop because of the error return, but the output file would be left on disk and running make again would continue building other files. Enable the .DELETE_ON_ERROR special target to automatically delete target files changed by failing commands. This affects all rules; I think it is the correct behavior for all existing rules.