1
mirror of https://github.com/mpv-player/mpv synced 2024-11-14 22:48:35 +01:00
Commit Graph

80 Commits

Author SHA1 Message Date
uau
c843190441 Change common pts variables from floats to doubles. Individual demuxers
should be changed later.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18310 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 11:13:21 +00:00
rtognimp
6c4d9bfe51 4 - Implement a better way to calculate current audio pts and use it for
audio decoded with ad_libvorbis, ad_ffmpeg and ad_faad.

Patch by Uoti Urpala


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18243 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 10:58:40 +00:00
rtognimp
4b45ec30e4 3 - Move a definition of MP_NOPTS_VALUE from muxer.h to demuxer.h to
make it available in more files (needed for next patch).

Patch by Uoti Urpala


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18242 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 10:36:29 +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
henry
81317a1a79 do not forget to initialize dp->buffer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17612 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-12 17:01:30 +00:00
henry
deacfedb48 forgotten cast (blows on gcc4)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17600 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-12 10:51:04 +00:00
reimar
7bb8f38da8 add some sanity checks to new/resize_demux_packet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17598 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-12 09:28:09 +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
reimar
ab417b391a function to read from a demuxer up to (and including) the specified
3-byte pattern.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17418 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-17 20:04:49 +00:00
reimar
8771ad0741 add a demux_peekc function that allows to just "have a look" at the next
byte of data from the demuxer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16505 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-17 18:05:55 +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
reimar
0446e090b1 Allow forcing of demuxers and codecs by prepending '+'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16322 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-30 23:56:24 +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
reimar
c54b5a06bd musepack demuxing and decoding support (demuxing is v7 bitstream only).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15959 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-10 17:14:12 +00:00
nicodvb
12a755b63b added AAC ADTS demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15721 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-13 20:40:29 +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
faust3
9ba19353ed avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14694 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-13 13:39:19 +00:00
rtognimp
939e46626e TwinVQ decoder and demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14277 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-29 19:51:56 +00:00
iive
22d8dd7d32 disable demuxer_bmp,
that works with signle image in single file.
removing is part of vu1nerabi1ity fix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14161 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-15 18:39:51 +00:00
nicodvb
939cfe1341 merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14035 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-24 18:55:03 +00:00
joey
c9040923b7 show ogg subtitle language on OSD, if available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13503 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-28 14:00:49 +00:00
mosu
bddf8c6c27 Do not use globals. Put the variables into the appropriate demuxer struct instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13128 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-24 21:20:24 +00:00
rtognimp
087c4e5801 nsv (Nullsoft streaming video) demuxer
Patch by Reza Jelveh <reza (dot) jelveh (at) tu-harburg (dot) de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12176 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-12 14:19:12 +00:00
michael
8580ca5c5f demux_lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12165 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-11 14:26:04 +00:00
arpi
f861d2a4b3 LML-M4 mpeg4 capture card raw stream format support
original code by Maxim Yevtyushkin <max@linuxmedialabs.com>
partially rewritten, "mplayerized" by me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11591 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 19:33:38 +00:00
alex
aba42ce2fe Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11235 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-22 19:01:37 +00:00
mosu
ee83fe5c81 Proper demuxer number for the MPEG4-in-TS demuxer. Patch by Nico <nsabbi@libero.it>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10716 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-29 08:03:56 +00:00
mosu
7f30bfeaac Updated highest demuxer number.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10711 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-28 13:31:44 +00:00
arpi
38f4f0b4cf - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
patch by Nico <nsabbi@libero.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10688 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-24 18:08:54 +00:00
arpi
080311d08f TiVo demuxer and sub-cc/osd decoder
patch by usenet@wingert.org
(http://tivo-mplayer.sourceforge.net/releases/MPlayer-20030501-tivo-patch.gz)
changes by me:
- spit demux_ty to demux_ty and demux_ty_osd (later handles mpeg user-data
  decoding, ie sub-cc and osd)
- removed some cosmetics changes
- some compile fixes (gcc3 specific variable decl etc)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10264 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-06-09 00:24:49 +00:00
rtognimp
5b0d3c5971 Add support for Realaudio files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10034 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-30 19:50:46 +00:00
mosu
004d3a060c Added Matroska demuxing support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10025 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-30 11:39:32 +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
5c49cd8e07 this is a combo patch that:
1) adds an experimental TS demuxer to mplayer
2) adds an input (streaming) interface from DVB cards.
It compiles and runs with the following versions of the drivers:
dvb-kernel (HEAD) (with stock kernel 2.4.20) and 0.9.4 (with kernel 2.4.18)
patch by Nico <nsabbi@libero.it>
some cleanups, ts demuxer fixes by me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9611 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-16 20:13:28 +00:00
arpi
0cf1424936 libgif/libungif based demuxer support for libmpdemux.
patch by Joey Parrish <joey@nicewarrior.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9130 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-28 00:12:23 +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
arpi
e819653a23 raw video demuxer, requested by Michael
(try mplayer -rawvideo on:cif mobile.cif)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9066 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-22 23:51:04 +00:00
arpi
970435ce12 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
inspired by patch by Fabian Franz <FabianFranz@gmx.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9007 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-19 00:21:54 +00:00
arpi
61d7976721 XMMS Input plugin support
based on patches by Balatoni Denes <pnis@coder.hu>
changes by me: glib dependency removed, files merged, code simplified, some bugfixes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8529 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-22 21:01:01 +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
ec12b2922c cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
instead doing it in demux_avi.c, storing private data in priv insteda of
demuxer structs)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8031 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-02 00:45:12 +00:00
arpi
60c8189dd9 fill the extra bytes with zero
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7777 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-17 00:54:13 +00:00
arpi
6998d862e0 ds_tell_block()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7749 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-16 14:50:45 +00:00
alex
62269a7d37 added smjpeg demuxer only for nexus' request
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7383 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-13 18:58:14 +00:00
arpi
7c5ed4f1c2 .PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
slightly modified patch, original by Matteo Giani <matgiani@ctonet.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7365 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-10 21:50:03 +00:00
arpi
4aed347e68 raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6926 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-05 17:21:35 +00:00