Commit Graph

37 Commits

Author SHA1 Message Date
Uoti Urpala 1888e57af7 cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"
Change 'struct vf_instance' pointer arguments to more standard style
as in the subject. Also some other minor formatting fixes.

Patch by Diego Biurrun.
2010-05-29 17:20:44 +03:00
Uoti Urpala a47ef5fed6 ad_pcm: don't rely on demux packets staying valid
Change ad_pcm to copy input packet data into an internal buffer
instead of relying on the packet still existing at the next decode()
call. The extra memcpy could be avoided by improving the demuxer API a
bit but I don't feel like implementing that now. Also add a
ADCTRL_RESYNC_STREAM handler to drop buffered data from previous
stream position.
2010-05-15 06:08:44 +03:00
Uoti Urpala c1c68a6914 ad_pcm: fix crash at EOF
Fix use of unsigned type where negative values were needed. When
playing a file with multichannel PCM audio the bug could result in the
channel reorder function scrambling memory at the end of playback,
causing a crash.
2010-05-15 05:52:00 +03:00
Uoti Urpala 584b43e9f8 cosmetics: reindent ad_pcm.c 2010-05-15 05:45:02 +03:00
Uoti Urpala b0986b3760 Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
2010-03-09 18:59:15 +02:00
diego 23db422c3d Add missing license headers to all files in the libmpcodecs directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30463 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 16:57:40 +00:00
Uoti Urpala 6ece23f1b1 Merge svn changes up to r30437 2010-01-28 00:37:32 +02:00
reimar fb8c6688c9 Fail ad_pcm initialization of WAVEFORMATEX header is missing instead of crashing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30428 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 20:46:26 +00:00
diego 6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
Uoti Urpala 2ba9df3df3 ad_pcm: Track pts explicitly
ad_pcm used the old audio timestamp tracking system that calculated
timestamp at end of decoder output as
last_timestamp_in_input_decoder_has_read +
bytes_read_after_that_timestamp / input_bitrate.
For PCM this can be accurate as input bitrate is constant. However it
relies on input bitrate being known and actually set. At least in some
case with .mov input and libavformat demuxer it wasn't set. Instead of
special-casing PCM to make sure input bitrate is set (in general it
may not be known or constant at all) change ad_pcm to explicitly set
the pts information on the decoder output side.
2008-08-03 21:25:48 +03:00
Uoti Urpala 170d69a71e Make audio decoder description structs const
Make the per-decoder struct ad_functions and its ->info struct
constants. Same for the mpcodecs_ad_drivers[] table of pointers to
those structs.
2008-04-26 16:51:17 +03:00
ulion 1ed6e96cfb Fix all current known multi-channel wrong order problems by adding
common functions for channel reordering.
This fixes these modules by adding channel reordering code for 5.0/5.1 audio:
ao: pcm
ad: dmo, faad, ffmpeg(ac3, dca, libfaad, liba52), pcm
ae: faac, lavc(ac3, libfaac), pcm


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25343 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 16:53:30 +00:00
reimar 30bb00bf15 Fix comment, it's 'sowt', not 'swot' ('twos' reversed)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20720 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 18:40:16 +00:00
uau e9b1adff17 Change pcm decode_audio to return data based on minlen instead of maxlen
to avoid demuxing unnecessarily much at once.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19389 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-13 23:09:17 +00:00
rtognimp 0ba7f250d7 Remove twos workaround, this bug was fixed in mov demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17869 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-14 22:15:24 +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
rathann 7875c2e150 QuickTime in24 and in32 PCM audio support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17814 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-11 22:43: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 341e1c97e9 avoid reading more than maxlen bytes.
Has the sideeffect that the amount read will be close to maxlen instead
of minlen as before.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16308 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-25 19:46:20 +00:00
reimar 70c9aca23b lavf demuxer with raw PCM fix (and a related hang)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16135 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-28 13:43:24 +00:00
ivo 15bb88b706 Add support for 32-bit float WAV files and support for extended WAV files
with 4, 6, 8, ... channels of audio.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14834 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-26 23:02:09 +00:00
alex 507121f7fe removing AFMT_ dependancy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-27 17:30:15 +00:00
rtognimp 8f07e02737 fl32: BE float32 PCM audio in mov files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14056 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-27 15:39:38 +00:00
alex bbb3dc2b39 make use of 24bit afmt
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13554 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-04 20:21:05 +00:00
rtognimp bcd6cde4f0 More support for audio format 0x0
Patch by Reimar Doeffinger


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12540 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-06 21:18:49 +00:00
rtognimp 2e60c55a0f Fix "raw " audio in mov files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12499 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-23 21:45:29 +00:00
reimar 9a43e3adbe support for 24 bit pcm/wav files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12479 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-16 10:48:59 +00:00
reimar 12744612d9 fix bigendian problems (left-right swapped 8bit pcms), add 32bit support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12448 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-08 23:41:13 +00:00
rtognimp d37c2fad12 Revert my old twos fix, it seems to break more files than it fixed.
If your file sound wrong, please uncomment and test


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12081 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-28 22:03:37 +00:00
rtognimp f57af4a1d3 twos 16bit 2 channels fixed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11549 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-02 22:44:17 +00:00
alex 1c68e5af4b qt swot support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8103 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-04 20:28:21 +00:00
arpi 1b667f61ba -afm/-vfm migration from ID (int) to NAME (string) - simplifies code and makes dlopen()'ing possible
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7181 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-30 21:44:20 +00:00
arpi 346b7d622c 8bit 'twos' S8 pcm audio support - fixes MOTI1E.MOV
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6234 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-30 00:40:55 +00:00
arpi a8b78d5149 bigendian fix - thx to Rogério Brito <linuxconsult@yahoo.com.br>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5828 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-25 12:29:55 +00:00
arpi 1bd4364bc4 cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5456 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-01 15:45:45 +00:00
arpi 8b9eea7eb0 twos audio fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5454 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-01 15:25:50 +00:00
arpi 7c026066ea imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5341 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-25 21:06:01 +00:00