Nicolas George
bf9908c627
lavfi/af_amerge: use av_make_q.
11 years ago
Paul B Mahol
b211607b5c
avfilter: various cosmetics
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Clément Bœsch
73180f5b0e
lavfi: flag more dynamic i/o filters.
12 years ago
Michael Niedermayer
fd6228e657
lavfi: remove now unused args parameter from AVFilter.init and init_opaque
This is mostly automated global search and replace
The deprecated aconvert filter is disabled, if it still has users
it should be updated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
c74b0eda34
lavfi/amerge: switch to an AVOptions-based system.
12 years ago
Stefano Sabatini
e62fca11a8
lavfi/amerge: drop duplicated "Buffer queue overflow" message
The same message is shown already by the called function
ff_bufqueue_is_full().
12 years ago
Paul B Mahol
ed8373e7db
lavfi: always check return value of ff_get_{audio,video}_buffer()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Nicolas George
00da527b44
lavfi/af_amerge: return EAGAIN if the input layouts are not known.
Also downgrade the error to a warning.
12 years ago
Michael Niedermayer
cd5f50a255
avfilter: avoid direct access to AVFrame.channels
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Nicolas George
bf0712c2f8
libavfilter/af_amerge: fix segfault if init fails.
12 years ago
Paul B Mahol
8160864b00
lavfi/amerge: make description consistent with documentation
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Nicolas George
dcce43340f
lavfi/af_amerge: set outbuf->audio->channels.
The value is lost because of avfilter_copy_buffer_ref_props().
Fix trac ticket #2217 .
12 years ago
Nicolas George
ae14887ee7
lavfi/af_amerge: check for buffer queue overflows.
Without that test, ff_bufqueue_add silently discards the
oldest buffer, that leaves in[i].nb_samples inconsistent,
and causes later a segfault.
12 years ago
Clément Bœsch
2d9d444051
lavfi: convert remaining input/output list compound literals to named objects.
This is following 568c70e79e
.
12 years ago
Michael Niedermayer
cd7febd33f
lavfi: replace filter_samples by filter_frame
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
1acd2f6ba7
Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h
Also remove it in once case when it is not needed.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Stefano Sabatini
3015194448
lavfi/amerge: clarify the error message in case of input overlap
12 years ago
Clément Bœsch
bbae8cdf4d
lavfi/amerge: avoid a forward declaration.
12 years ago
Clément Bœsch
7b56dddd56
lavfi/amerge: fix input pad name behaviour.
This fixes two problems:
- the invalid pad.name stack pointer after init() ends
- the duplicated name for all inputs
12 years ago
Stefano Sabatini
42d621d131
lavfi: add priv class to filter definitions and flags to filter internal options
This allows the iteration callbacks to discover the internal class and
options, and show them when required.
12 years ago
Nicolas George
752344dada
amerge/astreamsync/pan: fix license boilerplate.
The boilerplate states that the files are under LGPL,
but refer the user to the GPL at one place.
These files were (re)implemented specifically for FFmpeg.
12 years ago
William Yu
d5d5e3dabe
lavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output pts
12 years ago
Stefano Sabatini
fda968aa8f
lavfi: decrease logging level of message showing initial parameters
Reduce log clutter, consistent with 1a49a169eb
.
13 years ago
Paul B Mahol
3f59bbf5b6
lavfi/amerge: silence warnings
The warning silenced was: libavfilter/af_amerge.c:144:29: warning: conversion specifies type 'long long' but the argument has type 'int' [-Wformat]
The warning was introduced after FF_API_SAMPLERATE64 removal.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 years ago
Stefano Sabatini
972cad77fa
lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h
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.
13 years ago
Stefano Sabatini
c17808cebd
lavfi: define macro AVFILTER_DEFINE_CLASS
The macro can be used to define consistently the internal class of a
filter, save some typing and factorize.
13 years ago
Paul B Mahol
54101214d8
lavfi: use designated initializers for AVClass
While here:
- add missing .version and .category,
- make .class_name consistent across filters,
- align declarations.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 years ago
Paul B Mahol
c9e183b490
lavfi: update some deprecated functions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 years ago
William Yu
f77a695d2e
lavfi: af_amerge options array was not ended with NULL
Add a NULL to prevent undefined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Nicolas George
e0545262a2
amerge: accept multiple inputs.
13 years ago
Nicolas George
e8e492b302
af_amerge: move nb_in_ch into the in structure.
With that change, there is only one array for the inputs,
it will make easier to implement a variable number of inputs.
13 years ago
Nicolas George
7f17f4f1a7
af_amerge: use the buferqueue API.
13 years ago
Nicolas George
0da28d689c
af_amerge: compute output timestamp.
Use the timestamps from the first input.
13 years ago
Nicolas George
e6aee46760
af_amerge: set samples rate in query_formats.
13 years ago
Stefano Sabatini
4d4098da00
lavfi: drop planar/packed negotiation support
The planar/packed switch and the packing_formats list is no longer
required, since the planar/packed information is now stored in the sample
format enum.
This is technically a major API break, possibly it should be not too
painful as we marked the audio filtering API as unstable.
13 years ago
Clément Bœsch
4522df52aa
lavfi: remove audio.h include from avfilter.h.
avfilter.h is a public header and the unexported audio.h header contains
only internal prototypes.
13 years ago
Matthieu Bouron
5473a98e45
af_amerge: return errors from subfilters when requesting a frame
13 years ago
Clément Bœsch
d50a4c4a5b
lavfi/amerge: copy ref props after filtering samples.
This fixes various issues with ffmpeg -ss and -t.
13 years ago
Nicolas George
4962edf889
lavfi: add amerge audio filter.
13 years ago