Commit Graph

98 Commits

Author SHA1 Message Date
rtognimp cdb97ab7e0 Fix some potential integer overflow in memory allocation (mot of these
were probably safe or disabled anyway)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18506 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-14 15:51:05 +00:00
rtognimp 5e86603495 Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18445 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-11 18:50:46 +00:00
reynaldo c03b175452 Part3 of Otvos Attila's oattila AT chello-hu mp_msg changes, with lots of modifications as usual
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18177 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 05:12:10 +00:00
reimar 97efe20cd1 always cast stream IDs to unsigned before comparing to MAX_STREAMS.
just defining them as unsigned might be a better fix though...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18107 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-15 21:09:29 +00:00
diego a33158d60d Convert printfs in aviprint.c to mp_msg and give the information printing
functions in this file a verbosity_level parameter.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17978 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-27 17:25:41 +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
rtognimp b2a5c98e76 Only MAX_STREAMS streams are allowed (cid 115)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17811 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-11 16:42:46 +00:00
rtognimp a2d1fa71e8 Fix potential read from an unitialized pointer (CID: 236)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17789 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-09 22:09:03 +00:00
reimar cd94e7a740 stream_id == MAX_STREAMS is invalid, since counting starts with 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17777 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-08 13:26:36 +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
rtognimp b7ee4aff72 Print some more useful data from header in verbose mode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17402 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-15 22:00:53 +00:00
reimar 65cbd8d81b Always try to parse index chunk, no reason to check for movi_end
Also check return value of parse_index_chunk


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17395 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-14 22:47:38 +00:00
rtognimp 7598f44833 Fix printing of audio fourcc in hex format
Add explicit cast to fourcc print


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17392 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-14 19:24:55 +00:00
rtognimp 864811be2c Print audio 4cc for every stream, print 4cc of selected audio track
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17389 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-14 16:57:52 +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 15bd7324c2 Don't leak memory (free audio reordering buffers)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17319 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-04 23:36:36 +00:00
rtognimp 3aa98b93f7 Remove assumption that all audio packets in a block have the same
timestamp; now the code stores timestamp for every packet and puts them
on reordered packets
Fixes ra10cook.rmvc


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17318 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-04 22:49:23 +00:00
rtognimp 6dafd56e2d 1000.0l timestamps are float
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17317 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-04 22:21:32 +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
wanderer a8235fce3f make demuxer seek and close functions return void, patch by Dominik Mierzejewski
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17175 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-11 17:21:02 +00:00
rtognimp bda32bc73a Move audio packets reordering from codec interface to demuxers for real
files (old and new format), pass only real extradata to the codec
Enable cook codec from lavc, prefer lavc codecs for 14_4 and 28_8
formats. Disable internal 28_8, it's broken now and will be removed soon


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17150 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-09 16:25:37 +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 c5563969ec Fix rm files with a really big index chunk.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14898 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-03 10:23:28 +00:00
rtognimp a6fbd6ca66 Do not read any more data at eof: if got eof in the middle of an audio
block, ad_realaudio requests more data even if sh->audio->eof
Fixes sig11 at eof of hotel_california_ra5.1_640x480_30s.rmvb


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14587 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-24 21:57:07 +00:00
rtognimp a2fcc5b550 Be less verbose with -v (do not print a line for each demuxed packet)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14586 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-24 21:52:24 +00:00
diego d601428b98 Reduce excessive verbosity.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14579 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-22 18:12:40 +00:00
rtognimp 3cee5fc691 Play RV30 with 8-elements cmsg24
Fixes rv30_cmsg24_test.rmvb (now in samples)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14569 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-22 00:06:59 +00:00
rtognimp 810a5a7236 Decode MP3 in rm files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14499 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-15 15:07:24 +00:00
rtognimp 06d4538217 Reduce index verbosity
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14404 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-06 17:08:52 +00:00
rtognimp 2b1dff428f Real multirate files support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14403 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-06 16:29:46 +00:00
reimar f3d075be77 Print waveheader only when verbose
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14396 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-06 13:10:10 +00:00
rtognimp a10c321342 Memleak fix: free index data at demuxer_close
Patch by Wei Jiang ( jiangw98 at yahoo dot com )


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13838 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-01 13:49:07 +00:00
reimar 2594c8a462 do not attempt to seek backward in stream on MDPR chunk with no codec data
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12993 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-10 20:13:44 +00:00
alex 8e421507c5 index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12666 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-25 18:45:56 +00:00
rtognimp 0a8fbf151e 100l for me. Header seek is not needed to fix 28_8 and can cause sig11
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12368 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-01 01:28:31 +00:00
rtognimp 777399eef0 Fix for 28_8 in rm files and header length != 0x4e
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12328 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-27 20:04:26 +00:00
mosu 57b55283ff Stop reading the file if an INDX chunk is found instead of a data packet.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12077 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-28 11:23:53 +00:00
rtognimp 845154b6b6 Support for v3 audio section (used with 14_4 codec) in real files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11990 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-22 23:28:03 +00:00
rfelker df5c60506d 1000000000l reported by Steven Schultz (thanks!)
when the hell was this c++ crap added?
why wasn't it noticed?
do all the competent developers --disable-real because we don't watch
crappy low-quality files?


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11887 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-30 03:44:00 +00:00
attila 5a69fab2f0 add support for aac in real media files
patch by Moritz Bunkus <moritz@bunkus.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11878 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-29 12:11:13 +00:00
attila 467d449f83 continue playing real files after errors
patch by Pekka Enberg <Pekka.Enberg@cs.helsinki.fi>
additionally changed all printfs to mp_msg


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11871 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-29 10:13:35 +00:00
rtognimp 0bb4974b4b Fix for Real files with header size == 0x10 (normally is 0x12)
(fixes sample file header_size_10.rmvb)
Patch by LR <hephooey (at) fastmail (dot) fm>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11798 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-16 22:38:55 +00:00
alex d94632d563 1000l to me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11607 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-09 09:15:08 +00:00
alex 40194b4ea7 Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11597 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 22:03:49 +00:00
luran 72f330c8a0 seek in realmedia files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11442 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-12 10:27:16 +00:00