History

Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h

Also remove it in once case when it is not needed.

Paul B Mahol committed 14 years ago

Commit 1acd2f61 parent e97a24130 files · +31 −32Browse files

Unified · Split

30 files
  1. doc/filters.texi +3 −3
  2. libavcodec/dcaenc.c +1 −1
  3. libavcodec/vima.c +1 −1
  4. libavdevice/lavfi.c +1 −1
  5. libavfilter/af_aconvert.c +1 −1
  6. libavfilter/af_amerge.c +1 −1
  7. libavfilter/af_aresample.c +1 −1
  8. libavfilter/af_asetnsamples.c +1 −1
  9. libavfilter/af_atempo.c +1 −1
  10. libavfilter/af_earwax.c +1 −1
  11. libavfilter/af_pan.c +1 −1
  12. libavfilter/af_silencedetect.c +1 −1
  13. libavfilter/af_volume.c +1 −1
  14. libavfilter/af_volumedetect.c +1 −1
  15. libavfilter/asrc_aevalsrc.c +1 −1
  16. libavfilter/asrc_flite.c +1 −1
  17. libavfilter/avf_concat.c +1 −1
  18. libavfilter/avf_showspectrum.c +1 −1
  19. libavfilter/avf_showwaves.c +1 −1
  20. libavfilter/f_ebur128.c +1 −1
  21. libavfilter/formats.c +1 −1
  22. libavfilter/graphdump.c +1 −1
  23. libavfilter/sink_buffer.c +1 −1
  24. libavfilter/src_buffer.c +1 −1
  25. libswresample/audioconvert.h +0 −1
  26. libswresample/rematrix.c +1 −1
  27. libswresample/swresample-test.c +1 −1
  28. libswresample/swresample.c +1 −1
  29. libswresample/swresample_internal.h +1 −1
  30. tools/graph2dot.c +1 −1
doc/filters.texi+3−3
@@ -268,7 +268,7 @@ corresponding numeric value defined in @file{libavutil/samplefmt.h}. Use 'p' · 267 unmodified lines
268suffix for a planar sample format.268suffix for a planar sample format.
269 269
270@var{channel_layout} specifies the channel layout, and can be a string270@var{channel_layout} specifies the channel layout, and can be a string
271or the corresponding number value defined in @file{libavutil/audioconvert.h}.271or the corresponding number value defined in @file{libavutil/channel_layout.h}.
272 272
273The special parameter "auto", signifies that the filter will273The special parameter "auto", signifies that the filter will
274automatically select the output format depending on the output filter.274automatically select the output format depending on the output filter.
@@ -949,8 +949,8 @@ the enum AVSampleFormat in @file{libavutil/samplefmt.h} · 674 unmodified lines
949@item channel_layout949@item channel_layout
950The channel layout of the incoming audio buffers.950The channel layout of the incoming audio buffers.
951Either a channel layout name from channel_layout_map in951Either a channel layout name from channel_layout_map in
952@file{libavutil/audioconvert.c} or its corresponding integer representation952@file{libavutil/channel_layout.c} or its corresponding integer representation
953from the AV_CH_LAYOUT_* macros in @file{libavutil/audioconvert.h}953from the AV_CH_LAYOUT_* macros in @file{libavutil/channel_layout.h}
954 954
955@end table955@end table
956 956
libavcodec/dcaenc.c+1−1
@@ -21,9 +21,9 @@ · 20 unmodified lines
21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 */22 */
23 23
24#include "libavutil/channel_layout.h"
24#include "libavutil/common.h"25#include "libavutil/common.h"
25#include "libavutil/avassert.h"26#include "libavutil/avassert.h"
26#include "libavutil/audioconvert.h"
27#include "avcodec.h"27#include "avcodec.h"
28#include "get_bits.h"28#include "get_bits.h"
29#include "internal.h"29#include "internal.h"
libavcodec/vima.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */20 */
21 21
22#include "libavutil/audioconvert.h"22#include "libavutil/channel_layout.h"
23#include "avcodec.h"23#include "avcodec.h"
24#include "get_bits.h"24#include "get_bits.h"
25#include "adpcm_data.h"25#include "adpcm_data.h"
libavdevice/lavfi.c+1−1
@@ -28,13 +28,13 @@ · 27 unmodified lines
28#include "float.h" /* DBL_MIN, DBL_MAX */28#include "float.h" /* DBL_MIN, DBL_MAX */
29 29
30#include "libavutil/bprint.h"30#include "libavutil/bprint.h"
31#include "libavutil/channel_layout.h"
31#include "libavutil/file.h"32#include "libavutil/file.h"
32#include "libavutil/log.h"33#include "libavutil/log.h"
33#include "libavutil/mem.h"34#include "libavutil/mem.h"
34#include "libavutil/opt.h"35#include "libavutil/opt.h"
35#include "libavutil/parseutils.h"36#include "libavutil/parseutils.h"
36#include "libavutil/pixdesc.h"37#include "libavutil/pixdesc.h"
37#include "libavutil/audioconvert.h"
38#include "libavfilter/avfilter.h"38#include "libavfilter/avfilter.h"
39#include "libavfilter/avfiltergraph.h"39#include "libavfilter/avfiltergraph.h"
40#include "libavfilter/buffersink.h"40#include "libavfilter/buffersink.h"
libavfilter/af_aconvert.c+1−1
@@ -25,8 +25,8 @@ · 24 unmodified lines
25 * sample format and channel layout conversion audio filter25 * sample format and channel layout conversion audio filter
26 */26 */
27 27
28#include "libavutil/audioconvert.h"
29#include "libavutil/avstring.h"28#include "libavutil/avstring.h"
29#include "libavutil/channel_layout.h"
30#include "libswresample/swresample.h"30#include "libswresample/swresample.h"
31#include "avfilter.h"31#include "avfilter.h"
32#include "audio.h"32#include "audio.h"
libavfilter/af_amerge.c+1−1
@@ -23,9 +23,9 @@ · 22 unmodified lines
23 * Audio merging filter23 * Audio merging filter
24 */24 */
25 25
26#include "libavutil/audioconvert.h"
27#include "libavutil/avstring.h"26#include "libavutil/avstring.h"
28#include "libavutil/bprint.h"27#include "libavutil/bprint.h"
28#include "libavutil/channel_layout.h"
29#include "libavutil/opt.h"29#include "libavutil/opt.h"
30#include "libswresample/swresample.h" // only for SWR_CH_MAX30#include "libswresample/swresample.h" // only for SWR_CH_MAX
31#include "avfilter.h"31#include "avfilter.h"
libavfilter/af_aresample.c+1−1
@@ -24,8 +24,8 @@ · 23 unmodified lines
24 * resampling audio filter24 * resampling audio filter
25 */25 */
26 26
27#include "libavutil/audioconvert.h"
28#include "libavutil/avstring.h"27#include "libavutil/avstring.h"
28#include "libavutil/channel_layout.h"
29#include "libavutil/opt.h"29#include "libavutil/opt.h"
30#include "libavutil/samplefmt.h"30#include "libavutil/samplefmt.h"
31#include "libavutil/avassert.h"31#include "libavutil/avassert.h"
libavfilter/af_asetnsamples.c+1−1
@@ -25,8 +25,8 @@ · 24 unmodified lines
25 */25 */
26 26
27#include "libavutil/audio_fifo.h"27#include "libavutil/audio_fifo.h"
28#include "libavutil/audioconvert.h"
29#include "libavutil/avassert.h"28#include "libavutil/avassert.h"
29#include "libavutil/channel_layout.h"
30#include "libavutil/opt.h"30#include "libavutil/opt.h"
31#include "avfilter.h"31#include "avfilter.h"
32#include "audio.h"32#include "audio.h"
libavfilter/af_atempo.c+1−1
@@ -40,9 +40,9 @@ · 39 unmodified lines
40 40
41#include <float.h>41#include <float.h>
42#include "libavcodec/avfft.h"42#include "libavcodec/avfft.h"
43#include "libavutil/audioconvert.h"
44#include "libavutil/avassert.h"43#include "libavutil/avassert.h"
45#include "libavutil/avstring.h"44#include "libavutil/avstring.h"
45#include "libavutil/channel_layout.h"
46#include "libavutil/eval.h"46#include "libavutil/eval.h"
47#include "libavutil/opt.h"47#include "libavutil/opt.h"
48#include "libavutil/samplefmt.h"48#include "libavutil/samplefmt.h"
libavfilter/af_earwax.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29 * front of the listener. Adapted from the libsox earwax effect.29 * front of the listener. Adapted from the libsox earwax effect.
30 */30 */
31 31
32#include "libavutil/audioconvert.h"32#include "libavutil/channel_layout.h"
33#include "avfilter.h"33#include "avfilter.h"
34#include "audio.h"34#include "audio.h"
35#include "formats.h"35#include "formats.h"
libavfilter/af_pan.c+1−1
@@ -28,8 +28,8 @@ · 27 unmodified lines
28 */28 */
29 29
30#include <stdio.h>30#include <stdio.h>
31#include "libavutil/audioconvert.h"
32#include "libavutil/avstring.h"31#include "libavutil/avstring.h"
32#include "libavutil/channel_layout.h"
33#include "libavutil/opt.h"33#include "libavutil/opt.h"
34#include "libswresample/swresample.h"34#include "libswresample/swresample.h"
35#include "audio.h"35#include "audio.h"
libavfilter/af_silencedetect.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
23 * Audio silence detector23 * Audio silence detector
24 */24 */
25 25
26#include "libavutil/audioconvert.h"26#include "libavutil/channel_layout.h"
27#include "libavutil/opt.h"27#include "libavutil/opt.h"
28#include "libavutil/timestamp.h"28#include "libavutil/timestamp.h"
29#include "audio.h"29#include "audio.h"
libavfilter/af_volume.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
24 * based on ffmpeg.c code24 * based on ffmpeg.c code
25 */25 */
26 26
27#include "libavutil/audioconvert.h"27#include "libavutil/channel_layout.h"
28#include "libavutil/eval.h"28#include "libavutil/eval.h"
29#include "audio.h"29#include "audio.h"
30#include "avfilter.h"30#include "avfilter.h"
libavfilter/af_volumedetect.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 */19 */
20 20
21#include "libavutil/audioconvert.h"21#include "libavutil/channel_layout.h"
22#include "libavutil/avassert.h"22#include "libavutil/avassert.h"
23#include "audio.h"23#include "audio.h"
24#include "avfilter.h"24#include "avfilter.h"
libavfilter/asrc_aevalsrc.c+1−1
@@ -23,9 +23,9 @@ · 22 unmodified lines
23 * eval audio source23 * eval audio source
24 */24 */
25 25
26#include "libavutil/audioconvert.h"
27#include "libavutil/avassert.h"26#include "libavutil/avassert.h"
28#include "libavutil/avstring.h"27#include "libavutil/avstring.h"
28#include "libavutil/channel_layout.h"
29#include "libavutil/eval.h"29#include "libavutil/eval.h"
30#include "libavutil/opt.h"30#include "libavutil/opt.h"
31#include "libavutil/parseutils.h"31#include "libavutil/parseutils.h"
libavfilter/asrc_flite.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
24 */24 */
25 25
26#include <flite/flite.h>26#include <flite/flite.h>
27#include "libavutil/audioconvert.h"27#include "libavutil/channel_layout.h"
28#include "libavutil/file.h"28#include "libavutil/file.h"
29#include "libavutil/opt.h"29#include "libavutil/opt.h"
30#include "avfilter.h"30#include "avfilter.h"
libavfilter/avf_concat.c+1−1
@@ -23,8 +23,8 @@ · 22 unmodified lines
23 * concat audio-video filter23 * concat audio-video filter
24 */24 */
25 25
26#include "libavutil/audioconvert.h"
27#include "libavutil/avassert.h"26#include "libavutil/avassert.h"
27#include "libavutil/channel_layout.h"
28#include "libavutil/opt.h"28#include "libavutil/opt.h"
29#include "avfilter.h"29#include "avfilter.h"
30#define FF_BUFQUEUE_SIZE 25630#define FF_BUFQUEUE_SIZE 256
libavfilter/avf_showspectrum.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
27#include <math.h>27#include <math.h>
28 28
29#include "libavcodec/avfft.h"29#include "libavcodec/avfft.h"
30#include "libavutil/audioconvert.h"30#include "libavutil/channel_layout.h"
31#include "libavutil/opt.h"31#include "libavutil/opt.h"
32#include "avfilter.h"32#include "avfilter.h"
33#include "internal.h"33#include "internal.h"
libavfilter/avf_showwaves.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
23 * audio to video multimedia filter23 * audio to video multimedia filter
24 */24 */
25 25
26#include "libavutil/audioconvert.h"26#include "libavutil/channel_layout.h"
27#include "libavutil/opt.h"27#include "libavutil/opt.h"
28#include "libavutil/parseutils.h"28#include "libavutil/parseutils.h"
29#include "avfilter.h"29#include "avfilter.h"
libavfilter/f_ebur128.c+1−1
@@ -30,9 +30,9 @@ · 29 unmodified lines
30 30
31#include <math.h>31#include <math.h>
32 32
33#include "libavutil/audioconvert.h"
34#include "libavutil/avassert.h"33#include "libavutil/avassert.h"
35#include "libavutil/avstring.h"34#include "libavutil/avstring.h"
35#include "libavutil/channel_layout.h"
36#include "libavutil/xga_font_data.h"36#include "libavutil/xga_font_data.h"
37#include "libavutil/opt.h"37#include "libavutil/opt.h"
38#include "libavutil/timestamp.h"38#include "libavutil/timestamp.h"
libavfilter/formats.c+1−1
@@ -19,11 +19,11 @@ · 18 unmodified lines
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */20 */
21 21
22#include "libavutil/channel_layout.h"
22#include "libavutil/common.h"23#include "libavutil/common.h"
23#include "libavutil/eval.h"24#include "libavutil/eval.h"
24#include "libavutil/pixdesc.h"25#include "libavutil/pixdesc.h"
25#include "libavutil/parseutils.h"26#include "libavutil/parseutils.h"
26#include "libavutil/audioconvert.h"
27#include "avfilter.h"27#include "avfilter.h"
28#include "internal.h"28#include "internal.h"
29#include "formats.h"29#include "formats.h"
libavfilter/graphdump.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
21 21
22#include <string.h>22#include <string.h>
23 23
24#include "libavutil/audioconvert.h"24#include "libavutil/channel_layout.h"
25#include "libavutil/bprint.h"25#include "libavutil/bprint.h"
26#include "libavutil/pixdesc.h"26#include "libavutil/pixdesc.h"
27#include "avfilter.h"27#include "avfilter.h"
libavfilter/sink_buffer.c+1−1
@@ -23,8 +23,8 @@ · 22 unmodified lines
23 * buffer sink23 * buffer sink
24 */24 */
25 25
26#include "libavutil/audioconvert.h"
27#include "libavutil/avassert.h"26#include "libavutil/avassert.h"
27#include "libavutil/channel_layout.h"
28#include "libavutil/fifo.h"28#include "libavutil/fifo.h"
29#include "avfilter.h"29#include "avfilter.h"
30#include "buffersink.h"30#include "buffersink.h"
libavfilter/src_buffer.c+1−1
@@ -31,8 +31,8 @@ · 30 unmodified lines
31#include "avcodec.h"31#include "avcodec.h"
32#include "buffersrc.h"32#include "buffersrc.h"
33#include "asrc_abuffer.h"33#include "asrc_abuffer.h"
34#include "libavutil/audioconvert.h"
35#include "libavutil/avstring.h"34#include "libavutil/avstring.h"
35#include "libavutil/channel_layout.h"
36#include "libavutil/fifo.h"36#include "libavutil/fifo.h"
37#include "libavutil/imgutils.h"37#include "libavutil/imgutils.h"
38 38
libswresample/audioconvert.h+0−1
@@ -31,7 +31,6 @@ · 30 unmodified lines
31 31
32#include "swresample_internal.h"32#include "swresample_internal.h"
33#include "libavutil/cpu.h"33#include "libavutil/cpu.h"
34#include "libavutil/audioconvert.h"
35 34
36 35
37typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end);36typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end);
libswresample/rematrix.c+1−1
@@ -19,8 +19,8 @@ · 18 unmodified lines
19 */19 */
20 20
21#include "swresample_internal.h"21#include "swresample_internal.h"
22#include "libavutil/audioconvert.h"
23#include "libavutil/avassert.h"22#include "libavutil/avassert.h"
23#include "libavutil/channel_layout.h"
24 24
25#define ONE (1.0)25#define ONE (1.0)
26#define R(x) x26#define R(x) x
libswresample/swresample-test.c+1−1
@@ -20,8 +20,8 @@ · 19 unmodified lines
20 */20 */
21 21
22#include "libavutil/avassert.h"22#include "libavutil/avassert.h"
23#include "libavutil/channel_layout.h"
23#include "libavutil/common.h"24#include "libavutil/common.h"
24#include "libavutil/audioconvert.h"
25#include "libavutil/opt.h"25#include "libavutil/opt.h"
26#include "swresample.h"26#include "swresample.h"
27 27
libswresample/swresample.c+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
22#include "swresample_internal.h"22#include "swresample_internal.h"
23#include "audioconvert.h"23#include "audioconvert.h"
24#include "libavutil/avassert.h"24#include "libavutil/avassert.h"
25#include "libavutil/audioconvert.h"25#include "libavutil/channel_layout.h"
26 26
27#include <float.h>27#include <float.h>
28 28
libswresample/swresample_internal.h+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
22#define SWR_INTERNAL_H22#define SWR_INTERNAL_H
23 23
24#include "swresample.h"24#include "swresample.h"
25#include "libavutil/audioconvert.h"25#include "libavutil/channel_layout.h"
26#include "config.h"26#include "config.h"
27 27
28#define SQRT3_2 1.22474487139158904909 /* sqrt(3/2) */28#define SQRT3_2 1.22474487139158904909 /* sqrt(3/2) */
tools/graph2dot.c+1−1
@@ -25,9 +25,9 @@ · 24 unmodified lines
25#include <stdio.h>25#include <stdio.h>
26#include <string.h>26#include <string.h>
27 27
28#include "libavutil/channel_layout.h"
28#include "libavutil/mem.h"29#include "libavutil/mem.h"
29#include "libavutil/pixdesc.h"30#include "libavutil/pixdesc.h"
30#include "libavutil/audioconvert.h"
31#include "libavfilter/avfiltergraph.h"31#include "libavfilter/avfiltergraph.h"
32 32
33#if !HAVE_GETOPT33#if !HAVE_GETOPT

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t