Commit Graph

33 Commits

Author SHA1 Message Date
eugeni 85413c62e8 Use malloc for codecdata. Fixes segfault in free_sh_sub.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25666 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-10 19:47:18 +00: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
diego 54c3a567e3 Fix unused variable warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24140 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-24 11:18:07 +00:00
reimar aac28cfe4c Move extern int audio_output_channels; to ad_internal.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23938 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-30 15:23:25 +00:00
nicodvb 8ada2d6b87 in case of errors after decoding quit the main decoding
loop before memmove() when sh_audio->in_buffer_len <= 0;
patch by Chandan Pitta chandan.pitta gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20001 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-27 21:45:15 +00:00
diego 4d82067c91 cosmetics: Rename some variables for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19354 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-07 08:57:43 +00:00
diego 60f223f766 Move #ifdefs around complete files into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18774 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-21 14:49:09 +00:00
gpoirier 92ae184367 fixes the infinite loop which occurs when there is a decode error in a frame.
Patch by Bryan Alton < balton AH eircom POIS net >
Original thread:
Date: Jun 6, 2006 10:52 AM
Subject: [MPlayer-dev-eng] [PATCH] fix for faad2 infinite loop after 
decoding error


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18645 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-08 06:56:13 +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
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
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
attila 9315260e76 * really keep track on how many samples were decoded last round (fix 10l)
* leave loop if more than 10 faad errors were detected since the last
  call of decode_audio


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16338 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-01 15:59:55 +00:00
attila 751ec931a7 stop trying to decode faad audio, when last decoded length is <0
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16337 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-01 15:25:03 +00:00
gpoirier d9a3f81b3e memcpy and memmove both copy memory, but when using memcpy the source and destination must not overlap, but here, they did overlap.
Committed with the kind blessing of Richard, patch by uau


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15979 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-15 22:09:30 +00:00
nicodvb cd627876a7 fixed wrong binary mask: it precluded the syncword of adts-4 from being recognized as valid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15709 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-12 13:30:40 +00:00
rfelker 9a873224f6 step 1 of fixing ad_faad:
use internal downmixing just like liba52 does if the output is <= 2 channels
actually this is broken since it makes it impossible to manually use
af_pan; however liba52 already has that limitation, and without this
patch, aac audio comes out TOTALLY wrong on 2-channel systems.
hopefully someone will find a better solution later.
next up: making ad_faad reorder the channels according to what mplayer
expects, so they won't all come out the wrong speakers...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15020 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-29 17:59:08 +00:00
aurel b6e4a79712 makes --enable-*-faad really enable without any further check and drop support for old external faad2 versions (<= 1.1)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14639 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-03 17:35:49 +00:00
nicodvb a37ebc9903 tries to sync to ADTS/ADIF header before initializing the decoder; implement SYNC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14565 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-21 20:50:09 +00:00
reimar 393924ff39 setting samplesize to 2 in decoders where neccessary.
Needed because initialization of sh_audio was moved from dec_audio to
demuxer.c, and some demuxers set samplesize incorrect or to 0.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13428 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-21 20:34:47 +00:00
reimar 9135ad6154 output faad error message in case of a decoder error
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13308 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-11 09:07:07 +00:00
rtognimp c29c6444cd If demuxer does not fill codecdata try to get if from waveformatex
(fixes audio format 0xff)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12474 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-14 18:47:17 +00:00
mosu 36a536128f Support for HE-AAC. Patch by Loren Merritt <lorenm at u dot washington anotherdot edu>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12096 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-01 20:14:59 +00:00
faust3 5565a1c43f 10l really disable faad if gcc is broken
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10922 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-21 17:05:51 +00:00
arpi 001d121dec use internal (included) libfaad2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10727 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-30 22:31:45 +00:00
arpi af229ffaea libfaad2 v1.0, v1.1, v1.2 detection, and API change workaround in ad_faad.c
based on patch by Andre Schulz <andre@0wnage.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9322 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-07 21:04:35 +00:00
arpi 1b19920692 I think libfaad2 changed recently. The functions faacDecInit() and
faacDecInit2() now return the number of channels through a pointer to char
(was: pointer to long).
patch by Uwe.Reder@3SOFT.de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7649 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-07 10:18:46 +00:00
arpi 09d8c4ddf0 -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7192 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-31 13:09:23 +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 26c9b4ee5e sync driver names with codec-cfg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7175 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-30 20:06:22 +00:00
arpi b94132a38a support for packetized aac streams (used in .mp4 files)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6895 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-04 15:33:41 +00:00
arpi aff40c7823 audio input buffer allocation/free cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5459 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-01 17:58:04 +00:00
atmos4 e62a51110c Don't kill me, pure indent change as I forgot to reindent when copy and pasting from dec_audio.c, as this is the first revision it doesn't break changelog!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5358 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-26 16:37:42 +00:00
atmos4 96b58cfa58 Port dec_audio.c faad aac decoder to libmpcodecs, cleaned up code, improved buffering scheme.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5357 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-26 15:53:18 +00:00