summaryrefslogtreecommitdiffstats
path: root/audio/filter
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-15 21:25:05 +0100
committerwm4 <wm4@nowhere>2013-11-15 21:25:05 +0100
commit514c4547702a01adb6f9e6274c40a77c7c511339 (patch)
treec307d2d60094521cee703cbe9510f0ff9037e96b /audio/filter
parent2289a479b174efa062fab84a66075b49f27c804d (diff)
downloadmpv-514c4547702a01adb6f9e6274c40a77c7c511339.tar.bz2
mpv-514c4547702a01adb6f9e6274c40a77c7c511339.tar.xz
audio: drop "_NE"/"ne" suffix from audio formats
You get the native format by not appending any suffix to the format. This change includes user-facing names, e.g. for the --format option.
Diffstat (limited to 'audio/filter')
-rw-r--r--audio/filter/af_bs2b.c2
-rw-r--r--audio/filter/af_center.c2
-rw-r--r--audio/filter/af_convert24.c8
-rw-r--r--audio/filter/af_drc.c8
-rw-r--r--audio/filter/af_equalizer.c2
-rw-r--r--audio/filter/af_export.c2
-rw-r--r--audio/filter/af_extrastereo.c4
-rw-r--r--audio/filter/af_hrtf.c2
-rw-r--r--audio/filter/af_karaoke.c2
-rw-r--r--audio/filter/af_ladspa.c2
-rw-r--r--audio/filter/af_lavfi.c2
-rw-r--r--audio/filter/af_lavrresample.c2
-rw-r--r--audio/filter/af_pan.c2
-rw-r--r--audio/filter/af_scaletempo.c4
-rw-r--r--audio/filter/af_sinesuppress.c6
-rw-r--r--audio/filter/af_sub.c2
-rw-r--r--audio/filter/af_surround.c2
-rw-r--r--audio/filter/af_sweep.c2
-rw-r--r--audio/filter/af_volume.c10
19 files changed, 33 insertions, 33 deletions
diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c
index 769a2b4577..c4f826e856 100644
--- a/audio/filter/af_bs2b.c
+++ b/audio/filter/af_bs2b.c
@@ -135,7 +135,7 @@ static int control(struct af_instance *af, int cmd, void *arg)
break;
default:
af->play = play_f;
- mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_FLOAT);
break;
}
diff --git a/audio/filter/af_center.c b/audio/filter/af_center.c
index ed482c7a6b..b64d5b54bd 100644
--- a/audio/filter/af_center.c
+++ b/audio/filter/af_center.c
@@ -50,7 +50,7 @@ static int control(struct af_instance* af, int cmd, void* arg)
af->data->rate = ((struct mp_audio*)arg)->rate;
mp_audio_set_channels_old(af->data, MPMAX(s->ch+1,((struct mp_audio*)arg)->nch));
- mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_FLOAT);
return af_test_output(af,(struct mp_audio*)arg);
}
diff --git a/audio/filter/af_convert24.c b/audio/filter/af_convert24.c
index ee8aff5afc..0c3e6f8497 100644
--- a/audio/filter/af_convert24.c
+++ b/audio/filter/af_convert24.c
@@ -23,10 +23,10 @@
static bool test_conversion(int src_format, int dst_format)
{
- return (src_format == AF_FORMAT_U24_NE && dst_format == AF_FORMAT_U32_NE) ||
- (src_format == AF_FORMAT_S24_NE && dst_format == AF_FORMAT_S32_NE) ||
- (src_format == AF_FORMAT_U32_NE && dst_format == AF_FORMAT_U24_NE) ||
- (src_format == AF_FORMAT_S32_NE && dst_format == AF_FORMAT_S24_NE);
+ return (src_format == AF_FORMAT_U24 && dst_format == AF_FORMAT_U32) ||
+ (src_format == AF_FORMAT_S24 && dst_format == AF_FORMAT_S32) ||
+ (src_format == AF_FORMAT_U32 && dst_format == AF_FORMAT_U24) ||
+ (src_format == AF_FORMAT_S32 && dst_format == AF_FORMAT_S24);
}
static int control(struct af_instance *af, int cmd, void *arg)
diff --git a/audio/filter/af_drc.c b/audio/filter/af_drc.c
index 17c4a12a95..685dbcd8d5 100644
--- a/audio/filter/af_drc.c
+++ b/audio/filter/af_drc.c
@@ -91,8 +91,8 @@ static int control(struct af_instance* af, int cmd, void* arg)
mp_audio_force_interleaved_format((struct mp_audio*)arg);
mp_audio_copy_config(af->data, (struct mp_audio*)arg);
- if(((struct mp_audio*)arg)->format != (AF_FORMAT_S16_NE)){
- mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE);
+ if(((struct mp_audio*)arg)->format != (AF_FORMAT_S16)){
+ mp_audio_set_format(af->data, AF_FORMAT_FLOAT);
}
return af_test_output(af,(struct mp_audio*)arg);
case AF_CONTROL_COMMAND_LINE:{
@@ -296,14 +296,14 @@ static struct mp_audio* play(struct af_instance* af, struct mp_audio* data)
{
af_drc_t *s = af->setup;
- if(af->data->format == (AF_FORMAT_S16_NE))
+ if(af->data->format == (AF_FORMAT_S16))
{
if (s->method)
method2_int16(s, data);
else
method1_int16(s, data);
}
- else if(af->data->format == (AF_FORMAT_FLOAT_NE))
+ else if(af->data->format == (AF_FORMAT_FLOAT))
{
if (s->method)
method2_float(s, data);
diff --git a/audio/filter/af_equalizer.c b/audio/filter/af_equalizer.c
index 75a489d867..6aff565607 100644
--- a/audio/filter/af_equalizer.c
+++ b/audio/filter/af_equalizer.c
@@ -98,7 +98,7 @@ static int control(struct af_instance* af, int cmd, void* arg)
if(!arg) return AF_ERROR;
mp_audio_copy_config(af->data, (struct mp_audio*)arg);
- mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_FLOAT);
// Calculate number of active filters
s->K=KM;
diff --git a/audio/filter/af_export.c b/audio/filter/af_export.c
index 5e1096f85a..6c1ea6459b 100644
--- a/audio/filter/af_export.c
+++ b/audio/filter/af_export.c
@@ -88,7 +88,7 @@ static int control(struct af_instance* af, int cmd, void* arg)
// Accept only int16_t as input format (which sucks)
mp_audio_copy_config(af->data, (struct mp_audio*)arg);
- mp_audio_set_format(af->data, AF_FORMAT_S16_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_S16);
// If buffer length isn't set, set it to the default value
if(s->sz == 0)
diff --git a/audio/filter/af_extrastereo.c b/audio/filter/af_extrastereo.c
index 4561b60690..6a00fb7e65 100644
--- a/audio/filter/af_extrastereo.c
+++ b/audio/filter/af_extrastereo.c
@@ -51,12 +51,12 @@ static int control(struct af_instance* af, int cmd, void* arg)
mp_audio_copy_config(af->data, (struct mp_audio*)arg);
mp_audio_force_interleaved_format(af->data);
mp_audio_set_num_channels(af->data, 2);
- if (af->data->format == AF_FORMAT_FLOAT_NE)
+ if (af->data->format == AF_FORMAT_FLOAT)
{
af->play = play_float;
}// else
{
- mp_audio_set_format(af->data, AF_FORMAT_S16_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_S16);
af->play = play_s16;
}
diff --git a/audio/filter/af_hrtf.c b/audio/filter/af_hrtf.c
index ed51351750..bfb619b040 100644
--- a/audio/filter/af_hrtf.c
+++ b/audio/filter/af_hrtf.c
@@ -311,7 +311,7 @@ static int control(struct af_instance *af, int cmd, void* arg)
}
else if (af->data->nch < 5)
mp_audio_set_channels_old(af->data, 5);
- mp_audio_set_format(af->data, AF_FORMAT_S16_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_S16);
test_output_res = af_test_output(af, (struct mp_audio*)arg);
// after testing input set the real output format
mp_audio_set_num_channels(af->data, 2);
diff --git a/audio/filter/af_karaoke.c b/audio/filter/af_karaoke.c
index 8c633b136c..07ef0579bc 100644
--- a/audio/filter/af_karaoke.c
+++ b/audio/filter/af_karaoke.c
@@ -35,7 +35,7 @@ static int control(struct af_instance* af, int cmd, void* arg)
switch(cmd){
case AF_CONTROL_REINIT:
mp_audio_copy_config(af->data, (struct mp_audio*)arg);
- mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_FLOAT);
return af_test_output(af,(struct mp_audio*)arg);
}
return AF_UNKNOWN;
diff --git a/audio/filter/af_ladspa.c b/audio/filter/af_ladspa.c
index df88c06ab2..50d0bb5d85 100644
--- a/audio/filter/af_ladspa.c
+++ b/audio/filter/af_ladspa.c
@@ -495,7 +495,7 @@ static int control(struct af_instance *af, int cmd, void *arg) {
/* accept FLOAT, let af_format do conversion */
mp_audio_copy_config(af->data, (struct mp_audio*)arg);
- mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_FLOAT);
return af_test_output(af, (struct mp_audio*)arg);
case AF_CONTROL_COMMAND_LINE: {
diff --git a/audio/filter/af_lavfi.c b/audio/filter/af_lavfi.c
index 24ff8c5985..57a1055149 100644
--- a/audio/filter/af_lavfi.c
+++ b/audio/filter/af_lavfi.c
@@ -175,7 +175,7 @@ static int control(struct af_instance *af, int cmd, void *arg)
struct mp_audio *out = af->data;
if (af_to_avformat(in->format) == AV_SAMPLE_FMT_NONE)
- mp_audio_set_format(in, AF_FORMAT_FLOAT_NE);
+ mp_audio_set_format(in, AF_FORMAT_FLOAT);
if (!mp_chmap_is_lavc(&in->channels))
mp_chmap_reorder_to_lavc(&in->channels); // will always work
diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c
index 2e298a3f39..9b4d8ca586 100644
--- a/audio/filter/af_lavrresample.c
+++ b/audio/filter/af_lavrresample.c
@@ -245,7 +245,7 @@ static int control(struct af_instance *af, int cmd, void *arg)
mp_audio_set_channels(out, &in->channels);
if (af_to_avformat(in->format) == AV_SAMPLE_FMT_NONE)
- mp_audio_set_format(in, AF_FORMAT_FLOAT_NE);
+ mp_audio_set_format(in, AF_FORMAT_FLOAT);
if (af_to_avformat(out->format) == AV_SAMPLE_FMT_NONE)
mp_audio_set_format(out, in->format);
diff --git a/audio/filter/af_pan.c b/audio/filter/af_pan.c
index 3d8c6045d0..29d38c3860 100644
--- a/audio/filter/af_pan.c
+++ b/audio/filter/af_pan.c
@@ -55,7 +55,7 @@ static int control(struct af_instance* af, int cmd, void* arg)
if(!arg) return AF_ERROR;
af->data->rate = ((struct mp_audio*)arg)->rate;
- mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_FLOAT);
set_channels(af->data, s->nch ? s->nch: ((struct mp_audio*)arg)->nch);
if((af->data->format != ((struct mp_audio*)arg)->format) ||
diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c
index c8560af502..659b7971f5 100644
--- a/audio/filter/af_scaletempo.c
+++ b/audio/filter/af_scaletempo.c
@@ -290,10 +290,10 @@ static int control(struct af_instance *af, int cmd, void *arg)
return af_test_output(af, data);
}
- if (data->format == AF_FORMAT_S16_NE) {
+ if (data->format == AF_FORMAT_S16) {
use_int = 1;
} else {
- mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_FLOAT);
}
int bps = af->data->bps;
diff --git a/audio/filter/af_sinesuppress.c b/audio/filter/af_sinesuppress.c
index ef6fd7d37b..f241c5475a 100644
--- a/audio/filter/af_sinesuppress.c
+++ b/audio/filter/af_sinesuppress.c
@@ -57,15 +57,15 @@ static int control(struct af_instance* af, int cmd, void* arg)
mp_audio_copy_config(af->data, (struct mp_audio*)arg);
mp_audio_set_num_channels(af->data, 1);
#if 0
- if (((struct mp_audio*)arg)->format == AF_FORMAT_FLOAT_NE)
+ if (((struct mp_audio*)arg)->format == AF_FORMAT_FLOAT)
{
- af->data->format = AF_FORMAT_FLOAT_NE;
+ af->data->format = AF_FORMAT_FLOAT;
af->data->bps = 4;
af->play = play_float;
}// else
#endif
{
- mp_audio_set_format(af->data, AF_FORMAT_S16_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_S16);
af->play = play_s16;
}
diff --git a/audio/filter/af_sub.c b/audio/filter/af_sub.c
index 4fd16904c9..cdb4c04ea3 100644
--- a/audio/filter/af_sub.c
+++ b/audio/filter/af_sub.c
@@ -72,7 +72,7 @@ static int control(struct af_instance* af, int cmd, void* arg)
af->data->rate = ((struct mp_audio*)arg)->rate;
mp_audio_set_channels_old(af->data, MPMAX(s->ch+1,((struct mp_audio*)arg)->nch));
- mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_FLOAT);
// Design low-pass filter
s->k = 1.0;
diff --git a/audio/filter/af_surround.c b/audio/filter/af_surround.c
index efeecdc1e3..f06789eabe 100644
--- a/audio/filter/af_surround.c
+++ b/audio/filter/af_surround.c
@@ -98,7 +98,7 @@ static int control(struct af_instance* af, int cmd, void* arg)
return AF_DETACH;
}
- mp_audio_set_format(in, AF_FORMAT_FLOAT_NE);
+ mp_audio_set_format(in, AF_FORMAT_FLOAT);
mp_audio_copy_config(af->data, in);
mp_audio_set_channels_old(af->data, in->nch * 2);
diff --git a/audio/filter/af_sweep.c b/audio/filter/af_sweep.c
index c153d4261a..a06cad7600 100644
--- a/audio/filter/af_sweep.c
+++ b/audio/filter/af_sweep.c
@@ -42,7 +42,7 @@ static int control(struct af_instance* af, int cmd, void* arg)
switch(cmd){
case AF_CONTROL_REINIT:
mp_audio_copy_config(af->data, data);
- mp_audio_set_format(af->data, AF_FORMAT_S16_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_S16);
return af_test_output(af, data);
case AF_CONTROL_COMMAND_LINE:
diff --git a/audio/filter/af_volume.c b/audio/filter/af_volume.c
index b0eef1865c..edf29d00f2 100644
--- a/audio/filter/af_volume.c
+++ b/audio/filter/af_volume.c
@@ -47,10 +47,10 @@ static int control(struct af_instance *af, int cmd, void *arg)
mp_audio_copy_config(af->data, in);
mp_audio_force_interleaved_format(af->data);
- if (s->fast && af_fmt_from_planar(in->format) != AF_FORMAT_FLOAT_NE) {
- mp_audio_set_format(af->data, AF_FORMAT_S16_NE);
+ if (s->fast && af_fmt_from_planar(in->format) != AF_FORMAT_FLOAT) {
+ mp_audio_set_format(af->data, AF_FORMAT_S16);
} else {
- mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE);
+ mp_audio_set_format(af->data, AF_FORMAT_FLOAT);
}
if (af_fmt_is_planar(in->format))
mp_audio_set_format(af->data, af_fmt_to_planar(af->data->format));
@@ -70,7 +70,7 @@ static void filter_plane(struct af_instance *af, void *ptr, int num_samples)
{
struct priv *s = af->priv;
- if (af_fmt_from_planar(af->data->format) == AF_FORMAT_S16_NE) {
+ if (af_fmt_from_planar(af->data->format) == AF_FORMAT_S16) {
int16_t *a = ptr;
int vol = 256.0 * s->level;
if (vol != 256) {
@@ -79,7 +79,7 @@ static void filter_plane(struct af_instance *af, void *ptr, int num_samples)
a[i] = MPCLAMP(x, SHRT_MIN, SHRT_MAX);
}
}
- } else if (af_fmt_from_planar(af->data->format) == AF_FORMAT_FLOAT_NE) {
+ } else if (af_fmt_from_planar(af->data->format) == AF_FORMAT_FLOAT) {
float *a = ptr;
float vol = s->level;
if (vol != 1.0) {