1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-26 09:02:38 +00:00
Commit Graph

73 Commits

Author SHA1 Message Date
eugeni
bdb9b1d5dc Fix seeking in matroska files when timecodes do not start from zero.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19436 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 12:20:43 +00:00
eugeni
1de0c3327d Add matroska chapter seeking capability.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19348 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-06 18:55:34 +00:00
rathann
02362913a7 Native MPEG4 SP/ASP/AP support in Matroska.
Patch by Aurelien Jacobs and myself.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19159 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-22 14:35:49 +00:00
rfelker
79bacf325c more c++ decl crap
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18989 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 02:51:52 +00:00
eugeni
e15ae9a600 Initial libass release (without mencoder support).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:26:51 +00:00
eugeni
512eb68dc1 Rename mkv_sh_sub_t to sh_sub_t, move it to demuxer.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18939 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:02:49 +00:00
uau
e2727ec797 Add a new video pts tracking mode, enabled by option -correct-pts.
This mode has the following differences:
- Video timing is correct for streams with B frames, at least with some
  demuxers.
- Video filters can modify frame timestamps and insert new frames, and
  removing frames is handled better than before.
- Some things are known to break, it's not usable as the default yet.

Things should work as before when the -correct-pts option is not used.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18922 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-06 06:58:17 +00:00
reynaldo
8f65768bf2 rm unnecesary casts from void* - part 4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18890 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-03 13:21:54 +00:00
nicodvb
daaf965438 feed any audio track present in the mux; switch to any of the available audio tracks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18757 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-19 18:34:29 +00:00
uau
7022f65d0c Change free_sh_audio() to take demuxer and stream id as parameters
(same as new_sh_audio()) instead of sh_audio_t *, use those to remove
the pointer from demuxer->a_streams[] before freeing it.

Some demuxers use free_sh_audio() to undo the creation of an
already-allocated audio stream in case of error. These uses were unsafe
since free_sh_audio() freed the data structure but left the pointer in
demuxer->a_streams[], leading to double free later in free_demuxer()
(and perhaps use of the freed stream before that, I didn't check).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18711 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 14:05:59 +00:00
rtogni
9da9317579 Fix potential integer overflows in memory allocation.
Patch by Rich and me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-04 22:41:27 +00:00
gpoirier
4d3cfebbc3 fix parsing of vobsub private data, patch by Evgeniy Stepanov <eugeni P stepanov A gmail P com>
Original thread:
Date: May 14, 2006 12:28 AM
Subject: [MPlayer-dev-eng] [BUG][PATCH] parsing of vobsub private data in mkv probably broken


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18508 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-14 16:18:41 +00:00
diego
bc30e8e673 Unconditionally compile the Matroska demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18405 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-08 21:41:15 +00:00
reynaldo
3a406e94d7 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 07:20:34 +00:00
mosu
558f53de4b Do not give bogus timestamps for laced packets with no default duration. Patch by Uoti Urpala ( uoti ! urpala () pp1 ! inet ! fi ).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18237 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 06:28:45 +00:00
reimar
79e10e452c 10l, keyframes must have tag 0x10, not 1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18097 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-14 21:08:25 +00:00
rtognimp
ca10cc19a5 Fix RealAudio codecs (add descrambling)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18037 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-03 19:41:17 +00:00
mosu
df0b2d8206 Fix for playing RealVideo on PPC/big endian processors. Patch by Emanuele Giaquinta (emanuele ! giaquinta () gmail ! com).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17924 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-22 18:58:03 +00:00
corey
aba3f4a7ab Add audio_delay argument to demux_mkv_seek.
Some uspecified amount of sugary caffeineated liquid to me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17696 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-27 19:48:31 +00:00
mosu
2e40bfa136 Improved handling of text subs in Matroska files with adjacent newlines (\N) resulting in more than SUB_MAX_TEXT lines to display. Patch by Robert Henney (robh () rut ! org).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17309 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-04 12:05:15 +00:00
diego
36e1974be0 Unify include path handling, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-18 14:39:25 +00:00
lorenm
316bb1d44c sort timestamps instead of assuming conventional B-frame order. (fixes x264 B-pyramid)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16913 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-05 04:56:23 +00:00
reimar
2912984517 move resync_audio_stream after seeking to demuxer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16878 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-30 09:19:05 +00:00
mosu
d7a113f20d Added support for A_AAC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16825 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-22 10:13:28 +00:00
reimar
169416fd51 Use PRI?64 defines as format strings for 64 bit variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16751 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 18:33:56 +00:00
ods15
d620029e4b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
accuracey may be totally fake for some demuxers (mpg), but accurate for
others.. (avi)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16347 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-02 08:32:32 +00:00
mosu
a030e2fe1c Fixed seeking for AVC-in-Matroska (wrong assumption of what kind of references may be present for a non-I-frame).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16303 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-24 12:33:32 +00:00
rtognimp
cd68e1618b Demuxer modularization
Demuxer selection by name with -demuxer command (bakward compatible)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 19:57:47 +00:00
mosu
11bfc67802 demux_stream_t.pts should not be assigned by the demuxer. Fixes playback of VFR files. Patch by Sam Dennis <sam () malfunction ! screaming ! net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15702 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-09 07:45:17 +00:00
mosu
d8500a1a3b Do not switch to audio tracks whose codec private data differs from the main audio track's as this will most likely result in messed up audio output. Patch by Michael Behrisch <list () behrisch ! de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15534 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-21 06:50:08 +00:00
mosu
87f93d9d7f Reset the saved max_pts used for timecode reordering after seeking. Otherwise playback is broken after seeking back in a file that needs the timecodes to be reordered. Patch by Sam Dennis <sam () malfunction ! screaming !net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15518 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-19 12:09:26 +00:00
nicodvb
f595bf38ce removed unused variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15451 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-14 06:52:25 +00:00
nicodvb
3d450d0389 vorbis extradata is now passed from demuxer to decoder in matroska's way
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15421 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-12 17:35:58 +00:00
reimar
be54f4813f adds a parameter to the switch_audio command to directly select a track.
Patch by kiriuja mplayer-patches at en-directo net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15286 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-28 14:43:19 +00:00
gpoirier
2a08792ee8 Online audio switching now supports Matroska too. Patch by Michael Behrisch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15155 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-13 22:33:19 +00:00
rfelker
4eb1b755bb Fix the ogg fourcc nightmare!!!
The problem: once upon a time, windows idiots decided to try to store
vorbis-in-ogg-in-avi. Of course this failed miserably, but they used
the audio format tag 0xfffe for "extended" to do this. Later someone
working on MPlayer somehow decided 0xfffe was the format for vorbis,
which is nonsense, and now that's conflicting with real wav files with
extended audio format. This patch changes demux_ogg (and mkv) to use
sane fourcc's for vorbis and theora and gets rid of the 0xfffe
nonsense so hopefully wav files with extended audio will work now.
If there are problems, we'll have to find workarounds...and drive an
18-wheeler full of cola thru the house of whoever wrote this 0xfffe
nonsense in MPlayer to begin with...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14844 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-27 18:11:17 +00:00
mosu
efd53eed61 Handle missing palettes in the info part of VobSubs in Matroska files correctly by giving mplayer a NULL pointer. This way it will use a default palette instead of black only. Patch by Csillag Kristof (fenwick () freemail ! hu)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14562 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-21 18:25:44 +00:00
mosu
1cea37532f More support for AVC in Matroska.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14516 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-16 14:59:19 +00:00
reimar
027ed1e38e set sub_utf8 only when actually using mkv subtitles, will break external
subtitles (-sub) otherwise.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14514 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-16 12:17:41 +00:00
reimar
d147077c21 Move generic length and percent pos calculation to demuxer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14503 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-15 16:11:45 +00:00
mosu
60e7dabb30 Do not access word-sized elements on potentially unaligned memory addresses. RISC processors usually do not like that.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14490 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-13 21:04:34 +00:00
reimar
11880705aa Call subcp_close when closing the demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14462 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-11 18:32:49 +00:00
mosu
06bca786bd Support for AVC in Matroska.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14459 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-11 08:30:56 +00:00
mosu
911e30b26f Make use of the default duration for one frame if it is present in the file. This produces much smoother timecodes for laced audio frames. And I REALLY don't know why I missed that before...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14059 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-28 21:08:46 +00:00
mosu
2f83863883 Added support for MPEG-1 and MPEG-2 in Matroska.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14055 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-26 16:36:03 +00:00
mosu
50a86fcc34 Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14047 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-25 22:24:00 +00:00
mosu
6042541374 DTS uses the format tag 0x2001. Patch by Joakim Plate (joakim ! plate () ecce ! se)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13805 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-30 08:47:04 +00:00
joey
baef32bc2c fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13502 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-28 13:51:20 +00:00
mosu
07685ad398 With the latest change to dec_audio.c (1.32) the demuxers have to set sh_a->samplesize to something != 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13425 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-21 18:02:33 +00:00
reimar
a894ca74e8 fix playback of files with displaysize not set (aspect was set to NaN for these)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13382 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-18 14:35:19 +00:00