1. ffmpeg
  2. Commit 1acd2f6ba7bc85d4aab6f0ebdc56c8d21785640e
Browse code

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>

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