summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/ad_ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30463Uoti Urpala2010-03-091-0/+18
|\ | | | | | | | | | | 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.
| * Add missing license headers to all files in the libmpcodecs directory.diego2010-01-301-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30463 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30437Uoti Urpala2010-01-281-0/+1
|\|
| * Reset the parser on seek. Should fix some cases of audio "blips" after seeking.reimar2010-01-241-0/+1
| | | | | | | | | | | | | | AC3 is still broken due to the libavcodec parser being broken. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30421 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30322Uoti Urpala2010-01-251-1/+1
|\|
| * We only need to disable seeking back in ad_ffmpeg when we actually _use_reimar2010-01-151-1/+1
| | | | | | | | | | | | | | | | a parser, not when just needs_parsing is set. Fixes playback of e.g. ADPCM in AVI like http://samples.mplayerhq.hu/avi/imaadpcm.avi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30314 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30136Uoti Urpala2009-12-301-2/+13
|\| | | | | | | Ignore another broken correct-pts change in 30134.
| * Add support for parsing audio streams (though should be easy to extend to video)reimar2009-12-271-2/+13
| | | | | | | | | | | | | | | | | | | | | | via libavcodec. Parsing can be done at the demuxer stage (currently disabled) or at the decoder (ad_ffmpeg, enabled). Should allow using the libavcodec AAC, DTS, ... decoders independent of container format. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30130 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29971Uoti Urpala2009-11-291-1/+1
|\|
| * when using -v, print also which lavc codec has been used, notattila2009-11-281-1/+1
| | | | | | | | | | | | | | just that the init was ok git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29970 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29962Uoti Urpala2009-11-231-1/+5
|\|
| * Switch ad_ffmpeg to avcodec_decode_audio3reimar2009-11-221-1/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29955 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused variable.reimar2009-11-221-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29954 b3059339-0415-0410-9bf9-f77b7e298cf2
* | cosmetics: remove some unused variablesUoti Urpala2009-11-171-1/+0
| |
* | Merge svn changes up to r29912Uoti Urpala2009-11-161-8/+1
|\|
| * ad_ffmpeg: Fix channel layout for ffvorbis and ffaactack2009-11-041-8/+1
| | | | | | | | | | | | | | | | | | | | | | Patch submitted by Nicolas George, nicolas.george normalesup org The layout exceptions removed by this patch were rendered unnecessary by changes in ffmpeg which normalize channel layout for aac (r20067) and vorbis (r20148). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29821 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29752Uoti Urpala2009-10-061-0/+1
|\| | | | | | | | | | | | | | | | | As part of merging subtitle-in-terminal changes make update_subtitles() only clear existing subtitles if called with the reset argument, and not try to set new ones. Later calls should set the needed new subtitles, and this change avoids some problems with trying to set subtitles when mp_property_sub() in command.c gets called from initialization code before full initialization.
| * Make sure avctx->codec_type and codec_id are set, since libavcodecreimar2009-09-231-0/+1
| | | | | | | | | | | | | | | | | | currently requires that. That probably is an unintended API change and should be fixed/reverted in lavc but it hurts little to workaround here. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29709 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29644Uoti Urpala2009-09-041-1/+4
|\|
| * Reindentreimar2009-08-261-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29554 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Retry deciding to get audio parameters several times on errors, this avoidsreimar2009-08-261-0/+3
| | | | | | | | | | | | | | failing to init the decoder completely just because the first packet is broken. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29553 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29544Uoti Urpala2009-08-221-14/+6
|\|
| * Fix incorrect channel ordering for lavc audio codecs (specifically ffac3,tack2009-08-181-14/+6
| | | | | | | | | | | | | | | | | | ffdca, ffflac, ffaac, fftruehd). In the process, adds support for 32-bit samples. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29533 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-7/+7
| |
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-3/+3
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-3/+3
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Merge svn changes up to r29277Uoti Urpala2009-05-081-1/+2
|\|
| * Fix E-AC-3 channel ordering. E-AC-3 needs to use the same ordering as AC-3,diego2009-04-121-1/+2
| | | | | | | | | | | | | | | | not the standard ordering. patch by Andrew de Quincey, adq_dvb lidskialf net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29173 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29117Uoti Urpala2009-04-011-1/+10
|\|
| * Support FFmpeg codecs that decode to other formats than S16.reimar2009-03-181-1/+10
| | | | | | | | | | | | | | Double format is currently not supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28990 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to 27824Uoti Urpala2008-10-251-0/+2
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * Fix channel order for ffmpeg flac codec.ulion2008-10-091-0/+2
| | | | | | | | | | | | | | This patch comes from Andrew de Quincey <adq_dvb at lidskialf dot net>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27732 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27573Uoti Urpala2008-09-101-1/+1
|\| | | | | | | | | Conflicts: libmpcodecs/vd_ffmpeg.c
| * Fix compilation after libavcodec major version 52 changesuau2008-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | Some symbols were dropped or renamed, requiring corresponding changes in MPlayer. - Use AVCodecContext->bits_per_coded_sample instead of ->bits_per_sample. - Use AVCodecContext->trellis instead of ->flags&CODEC_FLAG_TRELLIS_QUANT. - Don't set AVCodecContext->rtp_mode (already marked unused before). - Use ff_eval2() instead of ff_eval(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27548 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27025Uoti Urpala2008-06-071-1/+1
|\| | | | | | | | | | | | | | | | | Conflicts: command.c libvo/vosub_vidix.c libvo/vosub_vidix.h mplayer.c
| * rename AF_CHANNEL_LAYOUT_LAVC_VORBIS* => AF_CHANNEL_LAYOUT_VORBIS*.ulion2008-06-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27019 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Make audio decoder description structs constUoti Urpala2008-04-261-1/+1
|/ | | | | | Make the per-decoder struct ad_functions and its ->info struct constants. Same for the mpcodecs_ad_drivers[] table of pointers to those structs.
* Fix ffvorbis decoder's output channel order with channel reordering function.ulion2008-03-051-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26164 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg now uses different (unified) #include paths.diego2008-02-251-5/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo fix: inited --> initializeddiego2008-02-141-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix all current known multi-channel wrong order problems by addingulion2007-12-101-0/+20
| | | | | | | | | | | 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->wfreimar2007-08-271-0/+2
| | | | | | | is not available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24246 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use new request_channelsreimar2007-08-231-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24128 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert setting audio output channel count for FFmpeguau2007-08-021-2/+0
| | | | | | | | | | | | | | | | | | | | 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 toreimar2007-08-011-2/+2
| | | | | | | | 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.hreimar2007-07-301-1/+0
| | | | 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.reimar2007-07-301-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23937 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use avcodec_decode_audio2 in ad_ffmpeg.creimar2007-06-051-2/+3
| | | | 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 ↵reimar2006-12-071-1/+1
| | | | | | undefined. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove bswap.h, use libavutil/bswap.h instead.diego2006-11-291-1/+1
| | | | 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 invalidreimar2006-10-211-0/+2
| | | | 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 forrtognimp2006-04-241-1/+7
| | | | | | | | | 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 containerdiego2006-04-191-1/+2
| | | | | | | | | | | 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.diego2006-03-301-6/+5
| | | | | | | | 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.diego2006-01-311-6/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17524 b3059339-0415-0410-9bf9-f77b7e298cf2
* malloc padding to avoid access beyond allocated memoryhenry2005-12-191-1/+1
| | | | | | | 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).al2005-08-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16166 b3059339-0415-0410-9bf9-f77b7e298cf2
* alac support via lavc decoderrtognimp2005-03-061-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14923 b3059339-0415-0410-9bf9-f77b7e298cf2
* pass wave extradata to the codec..alex2005-02-011-0/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14634 b3059339-0415-0410-9bf9-f77b7e298cf2
* change malloc and free to av_ variants where needed.reimar2005-01-081-4/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14432 b3059339-0415-0410-9bf9-f77b7e298cf2
* setting samplesize to 2 in decoders where neccessary.reimar2004-09-211-0/+1
| | | | | | | | Needed because initialization of sh_audio was moved from dec_audio to demuxer.c, and some demuxers set samplesize incorrec