Commit Graph

55 Commits

Author SHA1 Message Date
reimar e870f84bfb Move duplicate FF_INPUT_BUFFER_PADDING_SIZE handling into demuxer.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27301 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-16 16:18:25 +00:00
reimar 3f35a38237 Do not just print a warning, also fix the len in ASF demuxer!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27299 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-16 16:06:14 +00:00
reimar 100554a37f Replace asserts by proper conditions to allow playback of some broken but
still playable files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27154 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 10:06:19 +00:00
eugeni 547cc5772c Check ASF packet size before calling demux_asf_read_packet. Fixes segfault
with damaged ASF files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26644 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-02 13:33:14 +00:00
uau c9e6af5949 demux_asf: Fix operator precedence in packet length check
Change (len & 3-1) to correct ((len & 3) - 1) in packet length check.
Also change "a - 1 < b" to simpler "a <= b".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26446 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 23:04:07 +00:00
diego 21c200e767 FFmpeg now uses different (unified) #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 15:46:36 +00:00
rtogni 74ab56cbac Check buffer index while reading to avoid sig11
Fixes bugzilla #956


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25957 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-05 21:32:37 +00:00
reimar 5960ddb8e5 Use defines to give names to the different seek flags.
A better solution should be considered later, esp. for the many
broken demuxers that do not treat these flags correctly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 15:11:38 +00:00
reimar 35ef167321 Make all demuxer_desc_t const, thus moving them to .rodata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 16:00:39 +00:00
reimar e53bba09a9 Replace LOAD_LE32 etc. by AV_RL32 etc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25516 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-23 16:46:24 +00:00
reimar c42fa08085 Add a read_varlen function to reduce some code duplication
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25515 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-23 16:42:54 +00:00
nicodvb 6099913ed0 removed functions that were used to parse mpeg12 video (no more video); patch by John Donaghy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23531 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 09:25:09 +00:00
uau 2d06dc3ce7 Calculate pts with double precision in demux_asf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23489 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-07 09:17:10 +00:00
reimar 6a09e8e2ed Replace implicit use of fast_memcpy via macro by explicit use to allow
for future optimization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 14:27:54 +00:00
zuxy e5113fdfec Set i_bps for ASF video streams according to extended stream properties
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23375 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-22 13:55:14 +00:00
uau de444acf51 Fix double free() in demux_asf.c
If demux_open_asf() fails it frees the demuxer->priv field before
returning. Then demuxer.c calls demux_close_asf() which frees the field
again. Fix by removing the free() in demux_open_asf().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23313 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-14 01:23:54 +00:00
nicodvb e4d7bc4396 For DVR-MS:
extract timing information from the payload extension, set key frames,
detect video frame boundaries, interpolate the average video frame time
using the known informations from past frames and timestamps.
Video data before the first video key frame is thrown away.
Patch by John Donaghy johnfdonaghy gmail com



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23257 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-07 21:58:42 +00:00
diego e085bc8dcf Add explicit location for headers from the stream/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:36:36 +00:00
reimar 8e374ff809 Instead of printing a useless "sig11 coming soon" message, just abort parsing
in the hope of still saving things (helps with at least
http://sam.zoy.org/zzuf/lol-mplayer.wmv).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21986 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 18:29:18 +00:00
gpoirier d8435fd9c6 Fix crash when attempting to seek in a streamed unseekable stream, like
mms://a632.v3306a.c3306.e.vm.akamaistream.net/7/632/3306/v1/multith.download.akamai.com/3306/2005/COMEDIE/1144-0186-001.wmv 
patch by alexandre % alex14fr A yahoo P fr %


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20808 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 23:54:21 +00:00
nicodvb a28d7004b4 don't set the resolution for dvr-ms files: in the asf headers it seems to
be always set incorrectly; the decoder will deal with it much better.
Patch by John Donaghy (johnfdonaghy gmail com)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20652 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 22:53:24 +00:00
nicodvb bd40e0ea1d interpolate real fps of dvr-ms files using the extended stream properties.
Patch by John Donaghy - johnfdonaghy gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19967 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-24 15:19:48 +00:00
uau 6723323303 Clean up audio pts handling, make audio pts tracking in the audio-only
case work the same as with video.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18713 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 19:48:54 +00:00
pacman 2a8494d031 Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18610 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-06 23:34:21 +00:00
iive 9b4c7840b9 fix descrambling of asf file,
where signed buffer could cause erroneous values to be filled in descrable variables,
add misssing check for one of these variables
and restore sign of these variables as insurance that these checks will work even in such case.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18002 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-30 23:06:18 +00:00
albeu 22e18ebe85 Move global vars used for header parsing, etc to dewux->priv as it should
be. Also cleanup a bit signedness.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17993 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-29 23:25:09 +00:00
diego eebf08b978 Convert all if(verbose>X) to mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:12:03 +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
reimar 955fbdff3f we cannot continue without a crash when read_asf_header fails, since some
memory is allocated in that function (ugly!!).
Fixes bug #450, patch by Mikulas Patocka (mikulas at artax karlin mff cuni cz)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17599 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-12 09:58:27 +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
nicodvb f774739df9 include the right avcodec.h, consistently with the rest of mplayer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17344 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-08 14:03:42 +00:00
rtognimp 228f0abcf4 Typo in ASF demuxer selection by name (it's 'asf', not 'asv')
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17233 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-24 12:48:01 +00:00
henry c0e54fd248 malloc padding to avoid access beyond allocated memory
Credits to Mikulas Patocka (mikulas at artax karlin mff cuni cz)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17227 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-19 19:38:28 +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
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
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 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 4499002cf9 Speedup asf descrambling (avoid one memcpy and use our fastmemcpy).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15554 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-23 16:20:46 +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
reimar 1b385d6496 fix seeking in audio-only case (crash when seeking backwards, time reset to 0)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13311 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-11 09:40:34 +00:00
alex f6127f8737 skip ecc only if present, patch by Alexis Durelle <alexis.durelle@cen.cnamts.fr> (needed for the Aiptek DV3500 camera)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12878 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-21 08:54:39 +00:00
alex 8d49e37b89 plen=0 is handled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10833 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-07 01:41:09 +00:00
arpi 604f4432f3 fixes http://pot.lsd.ro/video.asf
(bug reported by dragos <iocatretine@yahoo.com> @ -users)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10623 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-15 16:36:32 +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 d483a015a2 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-22 02:33:28 +00:00
arpi d6a28d426a 100l - seq++ for grouping
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6669 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-07 20:06:55 +00:00