Commit Graph

147 Commits

Author SHA1 Message Date
atmos4 7d2486e71e Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19175 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-23 22:34:02 +00:00
reynaldo 32492483c0 drops casts from void * on malloc/calloc from libmpdemux code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19067 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 16:41:13 +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
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
nicodvb d96e0e658a support for vorbis in mp4/mov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18668 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-09 21:30:06 +00:00
rtogni 6f416d77ea Disable unsecure dumping of generic track with -v -v -v
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18584 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-05 19:00:23 +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
rathann 9ebd30010f missing argument for mp_msg, fixes:
demux_mov.c:1159: warning: too few arguments for format


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18492 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 21:12:43 +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
rtognimp c96851a3f0 Partially revert 1.140, restoring the old behaviour for all codecs
except for twos and sowt.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18219 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 11:38:06 +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
rtognimp 9c2deb1452 Fix passing qdm2 extradata to lavc decoder
It was broken in rev 1.142, that code does not behave the same as the
old one in some cases


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17983 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-27 21:37:18 +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
rathann a3570cb3d7 le2me_32 is not necessary, tested by Diego on BE machine
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17861 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-14 00:02:42 +00:00
rathann 68f49b8512 in24/in32/fl32 little/big-endian QuickTime PCM audio support
approved by rxt


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17859 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-13 23:32:36 +00:00
diego 30d06685ac Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17757 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-06 08:26:07 +00:00
rtognimp bf96c6033e This patch fixes pcm (twos, swot) in MOV.
This fix playing samples produced by ffmpeg(which set correct values),
and many samples in archive.

Patch by Baptiste COUDURIER | baptiste . coudurier )( smartjog . com |


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17717 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-02 22:28:12 +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
corey ffb7208370 Partial support for QuickTime sound atom version 2.
This doesn't add support for parsing the sound atom itself, but does
recognize the different offset at which the ESDS atom starts. Also,
this patch supports "3" in the channels field, which indicates
6-channel (5.1) audio. For more information, see this mail:

From: Corey Hickey <bugfood-ml@fatooh.org>
To: mplayer-dev-eng@mplayerhq.hu
Date: Wed, 28 Dec 2005 23:42:46 -0800
Subject: [PATCH] (partially) support QuickTime sound atom version 2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17284 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-02 06:56:22 +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 6880f9a572 10l, off by one error in last patch (codecdata length sanity check),
caused crashes with qdmc audio.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16680 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-05 14:55:06 +00:00
reimar 58b3c487ec Detect eof when seeking and do _not_ restart the video.
Also fixes some invalid reads.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16614 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-28 15:37:30 +00:00
reimar 47b5a39d38 Sanity-check codecdata_len, fixes crash in libfaad due to failed malloc for
http://images.apple.com/movies/us/hd_gallery/gl1800/480p/the_brothers_grimm_m480pa.mov


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16612 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-27 11:21:13 +00:00
reimar a6f6008e30 Wrong editlist handling: end pts must be included.
Fixes another BBC sample (why is it always BBC samples that break MPlayer??):
http://images.apple.com/movies/us/hd_gallery/gl1800/720p/bbc-africa_m720p.mov


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16497 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-16 11:05:29 +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 e1d1e3bc74 Fix move playlists (control must be returned to mplayer.c, with the demuxer
returning the real URL as a packet).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16327 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-31 13:04:22 +00:00
reimar c1f2df8f53 extra size checks for samples array to avoid crashes in some rare cases.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16321 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-30 23:24:47 +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 628236e0c0 Add missing range/length check for video trak desc (fixes bug #335).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15950 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-10 09:05:14 +00:00
reimar e795c4b11b cosmetic: split the lschunks function in two.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15949 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-10 08:57:31 +00:00
reimar 405c00b388 avoid bad memory access
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15784 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-20 14:32:51 +00:00
reimar a3e5eab301 fix memleak when playing mov files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15781 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-20 14:16:59 +00:00
nplourde 83ca336af6 The Quicktime headers have changed slightly from 10.3.x to 10.4. Steven Schultz <sms@2BSD.COM>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15509 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-18 14:44:56 +00:00
rtognimp 875908b14f Fix audio playback for no-sound-3gp.3gp (amr nb)
Patch by Richard van der Hoff * richardv * mxtelecom * com *


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15358 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-06 22:26:36 +00:00
rtognimp 92cc26d0f4 Decode "d263" and "damr" atoms in 3gp files
Patch by adland


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15357 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-05 21:40:33 +00:00
rtognimp a6d915256b Also '3g2a' can be used for 3GPP Profile 2
Based on patch by adland


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15287 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-28 18:25:50 +00:00
rtognimp af9950cd99 Fix alac from QTpro (in standard mov file, not in m4a file)
Extradata is in a different place
fixes samples/A-codecs/lossless/ALAC/alac.mov


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15023 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-30 22:10:07 +00:00
rtognimp d13d95f551 alac support via lavc decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14923 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-06 17:55:31 +00:00
reimar 9bc6e80972 set sh_audio->delay ins audio-only case so that correct time is displayed
after seeking.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14878 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-01 20:16:49 +00:00
rtognimp a6c469e97f Mp3On4 demuxer support
Patch by Larry Ruedisueli lwr at audioresearchlabs dot com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14707 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-15 21:04:33 +00:00
reimar 9a37723498 Reset stream eof after parsing header, fixes bug #218
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14582 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-23 21:39:51 +00:00
rtognimp dbbe18f450 Fix channels, sample rate and sample size for 3gp files
Patch by Richard van der Hoff [ richardv at mxtelecom dot com ]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14280 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-29 23:26:01 +00:00
reimar 12067f7a97 fix position bar and length display for mov files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14199 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-21 12:27:38 +00:00
diego a688341112 Handle raw yv12 video as I420 to fix some Broadcast 2000 created samples.
patch by Reza Jelveh, approval by Roberto


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14180 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-18 01:12:02 +00:00
mosu 6fcdde79ef Extended support for other object type IDs in the ESDS. This enables e.g. MPEG2 video in the MP4 container.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13955 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-15 15:04:57 +00:00
rtognimp 49bc246607 AVC support moved to libavcodec, avcC atom is now passed in extradata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13334 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-13 21:21:48 +00:00
rtognimp b026fd05ae AVC (fourcc avc1) in mp4 support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13191 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-29 13:52:19 +00:00