RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
26,746 Commits 41 Branches 85 Tags 159 MiB
Commit Graph

39 Commits

Author SHA1 Message Date
ulion 6b8b2a51e5 Fix ffvorbis decoder's output channel order with channel reordering function. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26164 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-05 02:46:50 +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
diego 835c654bb0 typo fix: inited --> initialized 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-14 14:23:55 +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
reimar 949880a056 Set sample_rate and bit_rate from sh_audio as fallback in case sh_audio->wf 
is not available.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24246 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-27 15:51:04 +00:00
reimar b7ce6217d6 Use new request_channels 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24128 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-23 20:29:57 +00:00
uau 3d0271ef40 Revert setting audio output channel count for FFmpeg 
The FFmpeg API needs to be fixed before this can be done sanely.
ffdca wants the desired output channel count to be set in
avctx->channels. Unfortunately it also completely fails if the requested
number of channels is not available rather than returning a different
amount (if 6 channels are requested we'd probably rather use stereo than
fail completely).
ffvorbis ignores caller-set values in avctx->channels. It writes the
channel count there once during init. This means the caller can only
set the count before init because later there would be no indication
whether the channel count in avctx reflects real output.
ffwma requires the caller to supply the encoded channel count
in avctx->channels during init or it fails. So it is not possible to
set a different number of desired output channels there before init
either.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23998 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-02 21:54:14 +00:00
reimar c16275939d Set lavc_context->channels before opening the codec, it is sufficient to 
select the desired number of codecs for ffdca and does not break other codecs
like ffvorbis that do not (re)set the channel number during decode.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23994 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-01 23:36:40 +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
reimar 80e0ec3e10 Indicate desired number of output channels to ffmpeg audio decoder. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23937 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-07-30 15:19:35 +00:00
reimar ac87b4a173 Use avcodec_decode_audio2 in ad_ffmpeg.c 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23474 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-05 14:12:37 +00:00
reimar 18004d2d98 Hack around libavutil/bswap.h compilation problems due to always_inline undefined. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-07 11:58:07 +00:00
diego cac6c0eea2 Remove bswap.h, use libavutil/bswap.h instead. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-29 15:02:45 +00:00
reimar e9e5d67d19 Do not use sh_audio->wf values if they are definitely invalid 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20334 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-21 17:01:45 +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
diego d4e9855511 Using channel count, samplerate and input bps values from the container 
instead of the decoder breaks some DTS samples where the container says
the audio has 6 channels but the decoder gives 2. In this case take the
number of channels from the decoder instead, the output will almost
certainly be badly garbled anyway if the number of channels is wrong.
patch by Uoti Urpala, uoti <<.>> urpala <<@>> pp1 <<.>> inet <<.>> fi


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18151 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-19 20:12:01 +00:00
diego dd32d03f3e Trust the demuxer instead of the decoder for samplerate detection. 
Fixes the ffmp3_bad_rate_detection.avi sample.
patch by qwen dux qwendu__at__gmail__.__com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17996 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-30 08:47:09 +00:00
diego 872a28cc57 Move conditional compilation out of the code and into the build system. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17524 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-31 23:36:12 +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
al bd342e463a Support new static libavcodec (depends on libavutil). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16166 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-08-01 20:16:56 +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
alex 43734534a4 pass wave extradata to the codec.. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14634 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-02-01 19:19:40 +00:00
reimar 479bdb2c08 change malloc and free to av_ variants where needed. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14432 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-01-08 19:16:21 +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
alex 2ae78ed799 inttypes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12143 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-04-06 16:15:57 +00:00
michael 14c5a7c333 flushing stuff after seeking (finally we can view MPEG without thouse blocks after seeking with -vc ffmpeg12) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11978 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-02-18 15:23:41 +00:00
michael ce6c56af7b merging fourcc with codec_tag 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9548 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-03-08 02:05:14 +00:00
arpi b20d743707 ffmp2 (with mpeg files) sig11 fixed 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8591 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-12-28 00:40:11 +00:00
rtognimp 36f33dcaa3 Fix stereo MACE files 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8109 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-11-04 23:15:01 +00:00
arpi 4f148b5f42 MACE fix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8102 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-11-04 18:46:53 +00:00
alex 94f5f95d31 10l - fixed wma version misdetection 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7959 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-10-29 16:40:45 +00:00
arpi 6fbb5c27a5 pass extradata to the codec 
patch by Fabrice Bellard <fabrice.bellard@free.fr>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7941 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-10-28 00:40:42 +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 c17e80d20f dynamic libavcodec.so support updated by 
Alexander.Gottwald@informatik.tu-chemnitz.de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7005 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-08-14 21:43:49 +00:00
arpi 0e69d0c69d removed useless contect struct -> code simplified 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5481 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-04-03 21:01:15 +00:00
alex 2870aa4331 using sh->context 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5448 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-04-01 13:10:03 +00:00
arpi a823205f9f argh... Nick messed up driver names too 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5344 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-03-25 22:03:33 +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