summaryrefslogtreecommitdiffstats
path: root/audio/filter/af_convertsignendian.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-13 20:16:10 +0100
committerwm4 <wm4@nowhere>2015-01-13 20:17:03 +0100
commit983f5efa3c3dfb8d8b36d48249cff11154b17fa3 (patch)
tree59af0a5e0b849a7b636c9ca54219ead709cc4b0b /audio/filter/af_convertsignendian.c
parent1fde40732eb7b5c79c2e10e41f72692d986781bb (diff)
downloadmpv-983f5efa3c3dfb8d8b36d48249cff11154b17fa3.tar.bz2
mpv-983f5efa3c3dfb8d8b36d48249cff11154b17fa3.tar.xz
audio/filters: use refcounted frames for some in-place filters
These are also quite simple, but require requesting write access to the frames. The error handling (for OOM) is a bit annoying.
Diffstat (limited to 'audio/filter/af_convertsignendian.c')
-rw-r--r--audio/filter/af_convertsignendian.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/audio/filter/af_convertsignendian.c b/audio/filter/af_convertsignendian.c
index 52ae8164df..abbd260a0f 100644
--- a/audio/filter/af_convertsignendian.c
+++ b/audio/filter/af_convertsignendian.c
@@ -71,8 +71,15 @@ static void si2us(void *data, int len, int bps)
} while (i += bps);
}
-static int filter(struct af_instance *af, struct mp_audio *data, int flags)
+static int filter(struct af_instance *af, struct mp_audio *data)
{
+ if (!data)
+ return 0;
+ if (af_make_writeable(af, data) < 0) {
+ talloc_free(data);
+ return -1;
+ }
+
int infmt = data->format;
int outfmt = af->data->format;
size_t len = data->samples * data->nch;
@@ -81,13 +88,14 @@ static int filter(struct af_instance *af, struct mp_audio *data, int flags)
si2us(data->planes[0], len, data->bps);
mp_audio_set_format(data, outfmt);
+ af_add_output_frame(af, data);
return 0;
}
static int af_open(struct af_instance *af)
{
af->control = control;
- af->filter = filter;
+ af->filter_frame = filter;
return AF_OK;
}