aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpcodecs/ad_ffmpeg.c
Commit message (Collapse)AuthorAge
* Fix all current known multi-channel wrong order problems by addingGravatar ulion2007-12-10
| | | | | | | | | | | 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
* Set sample_rate and bit_rate from sh_audio as fallback in case sh_audio->wfGravatar reimar2007-08-27
| | | | | | | is not available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24246 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use new request_channelsGravatar reimar2007-08-23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24128 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert setting audio output channel count for FFmpegGravatar uau2007-08-02
| | | | | | | | | | | | | | | | | | | | 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
* Set lavc_context->channels before opening the codec, it is sufficient toGravatar reimar2007-08-01
| | | | | | | | 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
* Move extern int audio_output_channels; to ad_internal.hGravatar reimar2007-07-30
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23938 b3059339-0415-0410-9bf9-f77b7e298cf2
* Indicate desired number of output channels to ffmpeg audio decoder.Gravatar reimar2007-07-30
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23937 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use avcodec_decode_audio2 in ad_ffmpeg.cGravatar reimar2007-06-05
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23474 b3059339-0415-0410-9bf9-f77b7e298cf2
* Hack around libavutil/bswap.h compilation problems due to always_inline ↵Gravatar reimar2006-12-07
| | | | | | undefined. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove bswap.h, use libavutil/bswap.h instead.Gravatar diego2006-11-29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use sh_audio->wf values if they are definitely invalidGravatar reimar2006-10-21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20334 b3059339-0415-0410-9bf9-f77b7e298cf2
* 4 - Implement a better way to calculate current audio pts and use it forGravatar rtognimp2006-04-24
| | | | | | | | | 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
* Using channel count, samplerate and input bps values from the containerGravatar diego2006-04-19
| | | | | | | | | | | 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
* Trust the demuxer instead of the decoder for samplerate detection.Gravatar diego2006-03-30
| | | | | | | | 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
* Move conditional compilation out of the code and into the build system.Gravatar diego2006-01-31
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17524 b3059339-0415-0410-9bf9-f77b7e298cf2
* malloc padding to avoid access beyond allocated memoryGravatar henry2005-12-19
| | | | | | | 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
* Support new static libavcodec (depends on libavutil).Gravatar al2005-08-01
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16166 b3059339-0415-0410-9bf9-f77b7e298cf2
* alac support via lavc decoderGravatar rtognimp2005-03-06
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14923 b3059339-0415-0410-9bf9-f77b7e298cf2
* pass wave extradata to the codec..Gravatar alex2005-02-01
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14634 b3059339-0415-0410-9bf9-f77b7e298cf2
* change malloc and free to av_ variants where needed.Gravatar reimar2005-01-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14432 b3059339-0415-0410-9bf9-f77b7e298cf2
* setting samplesize to 2 in decoders where neccessary.Gravatar reimar2004-09-21
| | | | | | | | 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
* inttypesGravatar alex2004-04-06
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12143 b3059339-0415-0410-9bf9-f77b7e298cf2
* flushing stuff after seeking (finally we can view MPEG without thouse blocks ↵Gravatar michael2004-02-18
| | | | | | after seeking with -vc ffmpeg12) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11978 b3059339-0415-0410-9bf9-f77b7e298cf2
* merging fourcc with codec_tagGravatar michael2003-03-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9548 b3059339-0415-0410-9bf9-f77b7e298cf2
* ffmp2 (with mpeg files) sig11 fixedGravatar arpi2002-12-28
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8591 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix stereo MACE filesGravatar rtognimp2002-11-04
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8109 b3059339-0415-0410-9bf9-f77b7e298cf2
* MACE fixGravatar arpi2002-11-04
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8102 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l - fixed wma version misdetectionGravatar alex2002-10-29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7959 b3059339-0415-0410-9bf9-f77b7e298cf2
* pass extradata to the codecGravatar arpi2002-10-28
| | | | | | | patch by Fabrice Bellard <fabrice.bellard@free.fr> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7941 b3059339-0415-0410-9bf9-f77b7e298cf2
* -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/commentsGravatar arpi2002-08-31
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7192 b3059339-0415-0410-9bf9-f77b7e298cf2
* -afm/-vfm migration from ID (int) to NAME (string) - simplifies code and ↵Gravatar arpi2002-08-30
| | | | | | makes dlopen()'ing possible git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7181 b3059339-0415-0410-9bf9-f77b7e298cf2
* dynamic libavcodec.so support updated byGravatar arpi2002-08-14
| | | | | | | Alexander.Gottwald@informatik.tu-chemnitz.de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7005 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed useless contect struct -> code simplifiedGravatar arpi2002-04-03
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5481 b3059339-0415-0410-9bf9-f77b7e298cf2
* using sh->contextGravatar alex2002-04-01
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5448 b3059339-0415-0410-9bf9-f77b7e298cf2
* argh... Nick messed up driver names tooGravatar arpi2002-03-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5344 b3059339-0415-0410-9bf9-f77b7e298cf2
* imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface ↵Gravatar arpi2002-03-25
functions changed to static, info->author field added git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5341 b3059339-0415-0410-9bf9-f77b7e298cf2