diff options
| author | wm4 <wm4@nowhere> | 2013-11-15 21:25:05 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-15 21:25:05 +0100 |
| commit | 514c4547702a01adb6f9e6274c40a77c7c511339 (patch) | |
| tree | c307d2d60094521cee703cbe9510f0ff9037e96b /audio/filter/af_volume.c | |
| parent | 2289a479b174efa062fab84a66075b49f27c804d (diff) | |
| download | mpv-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/af_volume.c')
| -rw-r--r-- | audio/filter/af_volume.c | 10 |
1 files changed, 5 insertions, 5 deletions
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) { |