diff options
| author | Guido Cella <guido@guidocella.xyz> | 2022-05-12 17:12:31 +0200 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2022-05-14 14:51:34 +0000 |
| commit | fe9e074752da1352e970dce5afcfdc3d30bfb7e2 (patch) | |
| tree | 38fb09cfea34d49a4678af53192dca2c1b3ef519 /audio | |
| parent | d27c85b0a10b9f337db22ec426d9f7c4af0f60dc (diff) | |
| download | mpv-fe9e074752da1352e970dce5afcfdc3d30bfb7e2.tar.bz2 mpv-fe9e074752da1352e970dce5afcfdc3d30bfb7e2.tar.xz | |
various: remove trailing whitespace
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/filter/af_scaletempo2.c | 2 | ||||
| -rw-r--r-- | audio/filter/af_scaletempo2_internals.c | 4 | ||||
| -rw-r--r-- | audio/filter/af_scaletempo2_internals.h | 4 | ||||
| -rw-r--r-- | audio/out/ao_sndio.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/audio/filter/af_scaletempo2.c b/audio/filter/af_scaletempo2.c index ceac919d5d..1a822ecd50 100644 --- a/audio/filter/af_scaletempo2.c +++ b/audio/filter/af_scaletempo2.c @@ -230,7 +230,7 @@ const struct mp_user_filter_entry af_scaletempo2 = { .wsola_search_interval_ms = 30, }, .options = (const struct m_option[]) { - {"search-interval", + {"search-interval", OPT_FLOAT(wsola_search_interval_ms), M_RANGE(1, 1000)}, {"window-size", OPT_FLOAT(ola_window_size_ms), M_RANGE(1, 1000)}, diff --git a/audio/filter/af_scaletempo2_internals.c b/audio/filter/af_scaletempo2_internals.c index 1cee7e469f..d7c0677c45 100644 --- a/audio/filter/af_scaletempo2_internals.c +++ b/audio/filter/af_scaletempo2_internals.c @@ -743,9 +743,9 @@ void mp_scaletempo2_init(struct mp_scaletempo2 *p, int channels, int rate) p->channels = channels; p->samples_per_second = rate; - p->num_candidate_blocks = (int)(p->opts->wsola_search_interval_ms + p->num_candidate_blocks = (int)(p->opts->wsola_search_interval_ms * p->samples_per_second / 1000); - p->ola_window_size = (int)(p->opts->ola_window_size_ms + p->ola_window_size = (int)(p->opts->ola_window_size_ms * p->samples_per_second / 1000); // Make sure window size in an even number. p->ola_window_size += p->ola_window_size & 1; diff --git a/audio/filter/af_scaletempo2_internals.h b/audio/filter/af_scaletempo2_internals.h index 3557cd3bd1..c95256b199 100644 --- a/audio/filter/af_scaletempo2_internals.h +++ b/audio/filter/af_scaletempo2_internals.h @@ -1,4 +1,4 @@ -// This filter was ported from Chromium +// This filter was ported from Chromium // (https://chromium.googlesource.com/chromium/chromium/+/51ed77e3f37a9a9b80d6d0a8259e84a8ca635259/media/filters/audio_renderer_algorithm.cc) // // Copyright 2015 The Chromium Authors. All rights reserved. @@ -118,4 +118,4 @@ int mp_scaletempo2_fill_input_buffer(struct mp_scaletempo2 *p, uint8_t **planes, int frame_size, bool final); int mp_scaletempo2_fill_buffer(struct mp_scaletempo2 *p, float **dest, int dest_size, float playback_rate); -bool mp_scaletempo2_frames_available(struct mp_scaletempo2 *p);
\ No newline at end of file +bool mp_scaletempo2_frames_available(struct mp_scaletempo2 *p); diff --git a/audio/out/ao_sndio.c b/audio/out/ao_sndio.c index 76ba836e00..2233eadc93 100644 --- a/audio/out/ao_sndio.c +++ b/audio/out/ao_sndio.c @@ -3,7 +3,7 @@ * Copyright (c) 2013 Christian Neukirchen <chneukirchen@gmail.com> * Copyright (c) 2020 Rozhuk Ivan <rozhuk.im@gmail.com> * Copyright (c) 2021 Andrew Krasavin <noiseless-ak@yandex.ru> - * + * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. |