summaryrefslogtreecommitdiff
path: root/libavfilter/af_aresample.c
Commit message (Collapse)AuthorAge
* avfilter/aresample: use init_dict system and set child AVOption context ↵Michael Niedermayer2013-04-11
| | | | | | | | correctly Parts of this commit are based on: 4fa1f52e Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter: avoid direct access to AVFrame.channelsMichael Niedermayer2013-03-15
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi/aresample: raise filter_frame() error.Clément Bœsch2013-03-13
|
* Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e350379f87e7f74420b4813170fe808e2313911': lavfi: switch to AVFrame. Conflicts: doc/filters.texi libavfilter/af_ashowinfo.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersink.c libavfilter/buffersrc.c libavfilter/buffersrc.h libavfilter/f_select.c libavfilter/f_setpts.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/version.h libavfilter/vf_aspect.c libavfilter/vf_bbox.c libavfilter/vf_blackframe.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hqdn3d.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavfilter/yadif.h Following are notes about the merge authorship and various technical details. Michael Niedermayer: * Main merge operation, notably avfilter.c and video.c * Switch to AVFrame: - afade - anullsrc - apad - aresample - blackframe - deshake - idet - il - mandelbrot - mptestsrc - noise - setfield - smartblur - tinterlace * various merge changes and fixes in: - ashowinfo - blackdetect - field - fps - select - testsrc - yadif Nicolas George: * Switch to AVFrame: - make rawdec work with refcounted frames. Adapted from commit 759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov. Also, fix the use of || instead of | in a flags check. - make buffer sink and src, audio and video work all together Clément Bœsch: * Switch to AVFrame: - aevalsrc - alphaextract - blend - cellauto - colormatrix - concat - earwax - ebur128 - edgedetect - geq - histeq - histogram - hue - kerndeint - life - movie - mp (with the help of Michael) - overlay - pad - pan - pp - pp - removelogo - sendcmd - showspectrum - showwaves - silencedetect - stereo3d - subtitles - super2xsai - swapuv - thumbnail - tile Hendrik Leppkes: * Switch to AVFrame: - aconvert - amerge - asetnsamples - atempo - biquads Matthieu Bouron: * Switch to AVFrame - alphamerge - decimate - volumedetect Stefano Sabatini: * Switch to AVFrame: - astreamsync - flite - framestep Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Clément Bœsch <ubitux@gmail.com> Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi/af_aresample: fix info log for unknown layouts.Nicolas George2013-02-28
|
* lavfi/af_aresample: fix layout consistency check.Nicolas George2013-02-28
| | | | | If the channel layout is unknown, lswr will internally use the default one for the corresponding number of channels.
* lavfi/af_aresample: accept unknown channel layouts.Nicolas George2013-01-26
|
* lavfi/aresample: fix styleStefano Sabatini2012-12-26
| | | | Improve overall consistency/improve readability.
* lavfi: add a channels field to AVFilterLink.Nicolas George2012-12-20
| | | | | Also: fix af_pan and af_aresample, that forgot to update audio->channels.
* aresample: increase n_out buffer size a bit to reduce delay in some corner casesMichael Niedermayer2012-12-13
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi: convert remaining input/output list compound literals to named objects.Clément Bœsch2012-11-28
| | | | This is following 568c70e79ee267426c15ef4603c69703f6a5884a.
* lavfi: replace filter_samples by filter_frameMichael Niedermayer2012-11-28
| | | | | Based on patch by Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* af_aresample: consistently use ROUNDED_DIVMichael Niedermayer2012-11-26
| | | | | | This fixes issues with negative timestamps Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* af_aresample: fix rounding of negative timestampsMichael Niedermayer2012-11-26
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* af_aresample: check ff_get_audio_buffer() failureMichael Niedermayer2012-11-24
| | | | | | Fixes null pointer dereference Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* af_aresample: allocate at least 1 sample buffer. Fix null ptr dereference.Michael Niedermayer2012-11-19
| | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.hPaul B Mahol2012-11-13
| | | | | | Also remove it in once case when it is not needed. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* af_aresample: fix leak on alloc failureMichael Niedermayer2012-10-11
| | | | | Fixes CID733798 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi/aresample: set buffer properties after copy.Nicolas George2012-09-13
| | | | | | | The aresample filter changes the format, layout and/or sample rate, it can not copy them blindly from its input. Related to trac ticket #1671.
* lavfi: decrease logging level of message showing initial parametersStefano Sabatini2012-07-15
| | | | Reduce log clutter, consistent with 1a49a169eb74a97.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mss3: use standard zigzag table mss3: split DSP functions that are used in MTS2(MSS4) into separate file motion-test: do not use getopt() tcp: add initial timeout limit for incoming connections configure: Change the rdtsc check to a linker check avconv: propagate fatal errors from lavfi. lavfi: add error handling to filter_samples(). fate-run: make avconv() properly deal with multiple inputs. asplit: don't leak the input buffer. af_resample: fix request_frame() behavior. af_asyncts: fix request_frame() behavior. libx264: support aspect ratio switching matroskadec: honor error_recognition when encountering unknown elements. lavr: resampling: add support for s32p, fltp, and dblp internal sample formats lavr: resampling: add filter type and Kaiser window beta to AVOptions lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format lavr: mix: validate internal sample format in ff_audio_mix_init() Conflicts: ffmpeg.c ffplay.c libavcodec/libx264.c libavfilter/audio.c libavfilter/split.c libavformat/tcp.c tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'Michael Niedermayer2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | * commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a': lavfi: remove 'opaque' parameter from AVFilter.init() mov: do not try to read total disc/track number if data atom is too short. avconv: fix -force_key_frames dxva2_h264: fix signaling of mbaff frames x86: fft: elf64: fix PIC build Conflicts: ffmpeg.c libavcodec/v210dec.h libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_overlay.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.hStefano Sabatini2012-06-25
| | | | | | | | | | | | libavfilter API was designed in order to be clarly distinguished from the libavcodec API, including avcodec.h in avfilter.h is not going to help to stick to this principle. The inclusion of libavutil/audioconvert.h in many files was required because avcodec.h includes audioconvert.h. libavfilter/avcodec.h is where the lavc/lavfi interface should be entirely placed.
* af_aresample: fix sample_rate type.Michael Niedermayer2012-06-24
| | | | | | should fix fate failures on 32bit x86 linux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: Only use optimizations with cmov if the CPU supports the instruction x86: Add CPU flag for the i686 cmov instruction x86: remove unused inline asm macros from dsputil_mmx.h x86: move some inline asm macros to the only places they are used lavfi: Add the af_channelmap audio channel mapping filter. lavfi: add join audio filter. lavfi: allow audio filters to request a given number of samples. lavfi: support automatically inserting the fifo filter when needed. lavfi/audio: eliminate ff_default_filter_samples(). Conflicts: Changelog libavcodec/x86/h264dsp_mmx.c libavfilter/Makefile libavfilter/allfilters.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/version.h libavutil/x86/cpu.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi: update some deprecated functionsPaul B Mahol2012-06-16
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* af_aresample: fix pts, they where off by a packet in the -async >0 case.Michael Niedermayer2012-05-26
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* af_aresample: fix request_frame()Michael Niedermayer2012-05-26
| | | | | | Fixes part of Ticket1341 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi/aresample: print channel layouts and formats along with the rate.Clément Bœsch2012-05-25
|
* af_aresample: use new swr API to pass and compensate PTSMichael Niedermayer2012-05-19
| | | | | | This code is not only much more powerfull its also simpler Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* af_aresample: allocate a larger buffer so accumulated data can be returned ↵Michael Niedermayer2012-05-19
| | | | | | quicker Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* af_aresample: use extended_dataMichael Niedermayer2012-05-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* af_aresample: Consider the swresample delay during calculating timestamps.Michael Niedermayer2012-05-18
| | | | | | The difference from this should be pretty small. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* af_aresample: fix rounding that led to sample accumulation in the buffers.Michael Niedermayer2012-05-18
| | | | | | | This fixes a regression that apparently was missed when switching to the in af resampler Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* af_aresample: 10l fix, wrong timebase for next_pts.Michael Niedermayer2012-05-18
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* aresample: add code to flush the internal swr buffer.Michael Niedermayer2012-05-17
| | | | | | Inspired-by code from af_resample.c written by Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* aresample: check return code of swr_convert()Michael Niedermayer2012-05-17
| | | | | | Issue found by comparing af_resample.c and af_aresample.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* av_aresample: Allow changing sample format and channel layout as wellMichael Niedermayer2012-05-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* af_aresample: support all swresample parameters.Michael Niedermayer2012-05-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* af_aresample: fix typo in query formatsMichael Niedermayer2012-05-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi: fix pts rescaling in the resamplerMichael Niedermayer2012-05-16
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi: fix resample with differing formatsMichael Niedermayer2012-05-16
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (26 commits) fate: use diff -b in oneline comparison Add missing version bumps and APIchanges/Changelog entries. lavfi: move buffer management function to a separate file. lavfi: move formats-related functions from default.c to formats.c lavfi: move video-related functions to a separate file. fate: make smjpeg a demux test fate: separate sierra-vmd audio and video tests fate: separate smacker audio and video tests libmp3lame: set supported channel layouts. avconv: automatically insert asyncts when -async is used. avconv: add support for audio filters. lavfi: add asyncts filter. lavfi: add aformat filter lavfi: add an audio buffer sink. lavfi: add an audio buffer source. buffersrc: add av_buffersrc_write_frame(). buffersrc: fix invalid read in uninit if the fifo hasn't been allocated lavfi: rename vsrc_buffer.c to buffersrc.c avfiltergraph: reindent lavfi: add channel layout/sample rate negotiation. ... Conflicts: Changelog doc/APIchanges doc/filters.texi ffmpeg.c ffprobe.c libavcodec/libmp3lame.c libavfilter/Makefile libavfilter/af_aformat.c libavfilter/allfilters.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/defaults.c libavfilter/formats.c libavfilter/src_buffer.c libavfilter/version.h libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c libavfilter/vsrc_buffer.h libavutil/avutil.h tests/fate/audio.mak tests/fate/demux.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi: remove audio.h include from avfilter.h.Clément Bœsch2012-05-12
| | | | | avfilter.h is a public header and the unexported audio.h header contains only internal prototypes.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) rv40dsp x86: MMX/MMX2/3DNow/SSE2/SSSE3 implementations of MC ape: Use unsigned integer maths arm: dsputil: fix overreads in put/avg_pixels functions h264: K&R formatting cosmetics for header files (part II/II) h264: K&R formatting cosmetics for header files (part I/II) rtmp: Implement check bandwidth notification. rtmp: Support 'rtmp_swfurl', an option which specifies the URL of the SWF player. rtmp: Support 'rtmp_flashver', an option which overrides the version of the Flash plugin. rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target stream. cmdutils: Add fallback case to switch in check_stream_specifier(). sctp: be consistent with socket option level configure: Add _XOPEN_SOURCE=600 to Solaris preprocessor flags. vcr1enc: drop pointless empty encode_init() wrapper function vcr1: drop pointless write-only AVCodecContext member from VCR1Context vcr1: group encoder code together to save #ifdefs vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments mov: make one comment slightly more specific lavr: replace the SSE version of ff_conv_fltp_to_flt_6ch() with SSE4 and AVX lavfi: move audio-related functions to a separate file. lavfi: remove some audio-related function from public API. ... Conflicts: cmdutils.c libavcodec/h264.h libavcodec/h264_mvpred.h libavcodec/vcr1.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c libavfilter/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi/aresample: properly propagate pts == AV_NOPTS_VALUE;Robert Nagy2012-04-16
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavfi/aresample: use libswresample.Clément Bœsch2012-02-02
|
* Mark AVFilterPad[] compound literals as const.Reimar Döffinger2011-11-06
| | | | | | | GCC 4.6.2 at least still seems to fail to put them in .rodata though, see also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37303 Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* af_aresample: fix properties setting in the output bufferStefano Sabatini2011-10-16
| | | | | | In particular: set output timebase to 1/output_sample_rate, fix output PTS computation, and do not forget to copy properties values from the input buffer.
* af_aresample: do not request a buffer with AV_PERM_REUSE2 permissions in ↵Stefano Sabatini2011-09-17
| | | | | | filter_samples() That was pointless. Simplify.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 20:18:57 +0000