1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-23 20:00:56 +00:00
Commit Graph

126 Commits

Author SHA1 Message Date
nicodvb
380d0dcebc cosmetics: reindentation and braces removal
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22053 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 21:25:50 +00:00
nicodvb
ed9e5b1565 moved scoreboarding code to 2 separate functions (update_stats() and clear_stats()) to be reused next
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22052 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 21:22:39 +00:00
nicodvb
25918a8b31 set has_valid_timestamps and corresponding first and final pts only after
having checked that at the beginning, at the middle and at the end of the
stream timestamps don't reset and that they seem to progress (almost-) linearly;
additionally probe those timestamps only when the stream type is file and it's seekable,
so all other stream types (especially network ones) won't waste time trying to seek
and possibly slowing down detection.
Seeking is not negatively affected by these changes.
Patch by Christian Aistleitner (zaek7q gmx net) reworked by me.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22039 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 10:45:34 +00:00
nicodvb
68f75d788f substream 0x75 doesn't seem to be a valid vc1 stream, after all; removed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21997 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-22 22:29:54 +00:00
nicodvb
3253bba2b3 set priv->last_pts to the pts read only if the pts was really read; patch by zaek7q gmx net (Christian Aistleitner)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21996 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-22 22:24:50 +00:00
nicodvb
fa90811f58 demux vc1 (stream id 0x1Fd with 0x55 <= substream id <= 0x5F in the pes_extension_2 payload)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21966 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 12:13:50 +00:00
nicodvb
34ef7517eb 1000l; fixed wrong operator precedence
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21952 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-17 21:42:04 +00:00
nicodvb
375fe84da6 in evo files [e]ac3 substreams range from 0xc0 to 0xcf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21945 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-16 22:50:47 +00:00
nicodvb
9c56f01564 one more #if 1 removed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21937 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-15 23:03:45 +00:00
nicodvb
12233b5063 removed useless #if1s added too long time ago
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21936 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-15 21:39:30 +00:00
nicodvb
6443cc76f5 in EVO files substreams 0xC0 of private streams 0xBD contain [e]ac3.
A more proper range will be committed when specs begin to appear;
for the time being enjoy the audio stream


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21935 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-15 21:21:42 +00:00
nicodvb
538674f6b6 set dp->stream_pts only when feeding the video stream to workaround
strange interleaving patterns in some samples (that show with wild
alternations of the OSD timer going back and forth)



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21807 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-01 22:47:14 +00:00
nicodvb
33ce3088d1 replace call to ds_read_packet() with the usual stream_read()+ds_add_packet() sequence;
fill demux_packet->stream_pts if the stream layer supports it



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21797 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 11:08:27 +00:00
reimar
6caf5586ee Get rid of min/max macros from aviheader.h, they do not belong here.
Replace their uses by FFMIN/FFMAX


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 12:24:11 +00:00
reimar
c5fa0bbf92 Make subtitle stream handling more similar to audio and video streams.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 16:15:23 +00:00
nicodvb
6e28f63e36 consistency fix: STREAM_CTRL_GET_TIME_LENGTH and STREAM_CTRL_GET_CURRENT_TIME now return time in (double) seconds
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20867 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-12 17:19:56 +00:00
nicodvb
c5cbf5efe6 Reset demuxer->sub (consistently with audio and video) after seeking and at the end
of demux_mpg_open() to prevent ghost packets. Patch by Olaf Mandel - olaf mandel name.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20011 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-01 09:33:23 +00:00
nicodvb
bc996f4dee demuxer->movi_end is updated after ds_fill_buffer(),
this in demux_mpg_probe() end_seq_start must be assigned
after ds_fill_buffer


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19902 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-18 22:32:51 +00:00
reimar
42d99bda52 Incorrect check in gxf demuxer leading to crash with textKO.gxf sample file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19187 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-26 17:22:01 +00:00
diego
a356cbcc01 Remove unused variables, patch by Stefan Huehner stefan at huehner org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 17:28:36 +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
ffd83d3e2a Remove misleading Encrypted VOB message; patch by Ismail Donmez (ismail ab pardus punctum org puntum tr)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18761 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-19 21:43:02 +00:00
nicodvb
b74779d89a workaround: at every read update demux->movi_end with stream->end_pos; needed to show the progress bar when playing dvdnav streams
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18716 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 22:12:06 +00:00
nicodvb
3253df6f12 now any audio stream can be chosen during DEMUXER_CTRL_SWITCH_AUDIO, irrispective of the codec used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18683 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-11 21:18:25 +00:00
nicodvb
fab6247393 psm longer than 1018 bytes is not allowed, thus invalid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18550 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-18 18:05:10 +00:00
nicodvb
78577530ca fixed %d->PRIu64 in read_mpeg_timestamp()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18383 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-03 18:18:25 +00:00
nicodvb
8622d18bde stream_read_word() returns _unsigned_ int
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18382 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-03 18:12:38 +00:00
nicodvb
c5777d7f53 in read_mpeg_timestamp() cast int expression to uint64_t before shifting to avoid truncation of bits and to prevent propagation of bit 1 as sign bit in pts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18381 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-03 17:55:02 +00:00
nicodvb
e6ab7db3e4 timestamps are 33 bits long, so they don't fit in an unsigned int; 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18078 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-11 20:05:24 +00:00
reimar
aaf067719b make sure the check for valid timestamps does not accidentially search through
several hundered MB (e.g. happens under MinGW with certain DVDs due to movi_end
overflowing).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18073 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-10 16:18:17 +00:00
nicodvb
1ae5708df3 fail immediately if any of the parameters necessary to switch audio stream isn't set/correct; closes cid 55
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17823 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-12 12:28:09 +00:00
nicodvb
c164e2dd44 check sh_video before seeking; closes cid 56
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17822 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-12 12:13:37 +00:00
nicodvb
882b24c23c init sh_a (new audio stream) to sh_audio (current audio stream); closes cid 241
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17820 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-12 11:12:48 +00:00
reimar
93ffd2ad79 Missing free_demux_packet after read error
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17780 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-08 15:21:12 +00:00
nicodvb
941b080f9c try to get duration from the stream layer, if an implementation of STREAM_CTRL_GET_TIME_LENGTH is available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17700 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-27 21:13:17 +00:00
corey
1ab575101a Second-try commit of this patch.
1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
   that mplayer/mencoder will instantly be in sync even when -delay is
   specified.

I've quadruple checked this time; hopefully I haven't missed anything.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-17 01:57:41 +00:00
corey
3f6e7ce5f5 Reverse commit of unfinished patch for passing audio_delay to the demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 19:39:51 +00:00
corey
15debd85d2 1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
   that mplayer/mencoder will instantly be in sync even when -delay is
   specified.

Other demuxers could be modified similarly in the future.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-07 20:22:44 +00:00
rathann
2601de4120 massive attack: mp_msg printf format fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-12 20:04:36 +00:00
lorenm
0471912bbf h264es: don't seek to non-keyframes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17290 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-03 07:29:59 +00:00
nicodvb
db69d933c1 don't reset dvdsub->id unless -slang is specified; assign default sub stream id when demux->sub->id is -1 (autodetect)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17287 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-02 20:40:25 +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
reimar
0d70ad3248 10l, demux_mpg_control was missing from demuxer info struct, causing audio
switching not to work


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16772 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-15 11:51:37 +00:00
reimar
9a684fa55f faster mpg and much faster gxf demuxing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16370 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-03 08:58:34 +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
rtognimp
16670aff3a Fix mpeg-pes playback
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16315 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-26 22:53:59 +00:00
reimar
655334804b support MPEG in GXF container with extension-based detection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16311 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-26 17:40:02 +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
nicodvb
999ac17eba support raw ac3 (in private pes packets without the usual dvd 4 bytes substream header). Patch by Matthias Scharzott
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15816 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-25 13:25:27 +00:00
nicodvb
2b1fef3a98 moved mpeg-ps/es probing code to demux_mpg.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15671 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-06 21:30:53 +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
9e909f0dde Added support of audio stream switching in the MPEG demuxer using the #-key
Patch by Michael Behrisch < behrisch $ informatik * hu-berlin * de >
commited with the kind blessing of D. Richard Felker III


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15047 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-03 14:08:28 +00:00
nicodvb
c596f03a8a added support for other codecs (mpeg4/h264/aac) in mpeg-ps parsing the PSM
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14924 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-06 21:10:01 +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
nicodvb
b11ef987a5 fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14427 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-08 10:05:44 +00:00
aurel
6943b13bb5 seeking based on the largest timestamp in an mpeg stream
It is often more accurate than the current seeking and it has the
additional benefit of giving the (almost) precise total time of the movie.
patch by Michael Behrisch < behrisch at informatik.hu-berlin.de >


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13739 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-23 00:05:38 +00:00
reimar
b7e93ce09e avoid segfault with -vc dummy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13650 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-15 16:11:30 +00:00
reimar
f7e04468d6 fix for crash when seeking with -novideo option
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12968 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-07 14:20:28 +00:00
alex
922162fb5d removed the historic libcss support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11593 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 21:34:05 +00:00
michael
e419df6f85 H264-ES demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9825 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-04 15:38:46 +00:00
arpi
da08b8a076 raw mpeg4-es support (you need to set -fps manually!)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9070 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-23 02:12:15 +00:00
michael
01c201dbe8 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8255 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-23 10:58:14 +00:00
arpi
422b0d2a4c demuxer_control(), percent position and time length query implemented in
asf, avi, mpeg demuxers.
patch by Balatoni Denes <pnis@coder.hu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8209 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-16 03:42:14 +00:00
arpi
f859d013a8 *HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-06 23:54:29 +00:00
arpi
a38ea8705b fixed LPCM parsing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7672 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-08 22:57:39 +00:00
arpi
eb7eb4bdde some cleanup - made private vars/funcs static, removed obsolete externs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7560 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-29 19:26:40 +00:00
arpi
c4f98047c1 max_packs increased for some dvd with too many audio/sub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5571 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-12 00:47:02 +00:00
arpi
e73f29e800 added mp3 detection
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4712 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-14 23:41:34 +00:00
arpi
a84d0c2628 DVD start position handling changed (progbar/eta fix)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4392 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-27 20:10:28 +00:00
lgb
997c6f8f7b Return of the 'Old-style-DVD-support', with dynamic loading (using libdl) so
no more conflict with libdvdread: you can compile in both of libdvdread and
libcss support! You can even select libcss.so to load from command line or
configuration file, with '-csslib /usr/local/lib/libcss.so' or something
similar. Default for this option is /usr/local/lib/libcss.so. Note: libcss
version (ver>0.1) with newer API is not supported in this version! This is
the first version so stay tuned :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3976 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-04 13:08:14 +00:00
arpi
ea4503d78e hotfix for ac3 aid<0x20 (VDR)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3956 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-02 19:18:11 +00:00
arpi
63dc65aa44 mpeg VDR vs. BIN fixed?
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3771 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-12-26 16:34:06 +00:00
arpi
c5347864c0 combined PS/PES sync to allow .VDR playback from stdin
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3256 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-12-01 22:09:18 +00:00
arpi
9ee7852bb7 config.h cleanup, few things added to steram/demuxer headers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2556 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-10-30 17:03:11 +00:00
arpi
b7c1f37d4c includes cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2339 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-10-21 15:47:31 +00:00
arpi
881e5d0783 libdemuxer...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2311 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-10-20 18:49:08 +00:00