summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-03-28 22:40:13 +0100
committerwm4 <wm4@nowhere>2013-04-13 04:21:28 +0200
commit08eecf070e12d58f3f9e4f7c65b8b1f6c815cc7f (patch)
tree6420ea90950990bb063093e61adb06cda9c5d299
parentf9a6b1c3f8b82f809429ea61396a89bd0aeb64b6 (diff)
downloadmpv-08eecf070e12d58f3f9e4f7c65b8b1f6c815cc7f.tar.bz2
mpv-08eecf070e12d58f3f9e4f7c65b8b1f6c815cc7f.tar.xz
af: remove accuracy option
All this option did was deciding whether the resample filter was to be insert at the beginning or end of the filter chain. Always do what the option set for accuracy did. I doubt it makes much of a difference. libavresample does most things in just one go anyway, so it won't matter.
-rw-r--r--audio/filter/af.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/audio/filter/af.c b/audio/filter/af.c
index 46e7108273..ec247fb017 100644
--- a/audio/filter/af.c
+++ b/audio/filter/af.c
@@ -523,10 +523,6 @@ int af_init(struct af_stream *s)
s->input.audio = s->output.audio = NULL;
s->input.len = s->output.len = 0;
- // Figure out how fast the machine is
- if (AF_INIT_AUTO == (AF_INIT_TYPE_MASK & s->cfg.force))
- s->cfg.force = (s->cfg.force & ~AF_INIT_TYPE_MASK) | AF_INIT_TYPE;
-
// Check if this is the first call
if (!s->first) {
// Add all filters in the list (if there are any)
@@ -553,17 +549,10 @@ int af_init(struct af_stream *s)
&(s->output.rate));
if (!af) {
char *resampler = "lavrresample";
- if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW) {
- if (af_is_conversion_filter(s->first))
- af = af_append(s, s->first, resampler);
- else
- af = af_prepend(s, s->first, resampler);
- } else {
- if (af_is_conversion_filter(s->last))
- af = af_prepend(s, s->last, resampler);
- else
- af = af_append(s, s->last, resampler);
- }
+ if (af_is_conversion_filter(s->first))
+ af = af_append(s, s->first, resampler);
+ else
+ af = af_prepend(s, s->first, resampler);
// Init the new filter
if (!af)
return -1;