summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Yan <tom.ty89@gmail.com>2018-03-13 03:30:54 +0800
committerJan Ekström <jeebjp@gmail.com>2018-04-05 04:35:49 +0300
commite3b3e28deb354830d682863c5086f86790653f7e (patch)
tree9491b78e124392bc8cea0a63b0128938564639d5
parent14b429de8da30f1c83d14ffd4568ac8fa9687869 (diff)
downloadmpv-e3b3e28deb354830d682863c5086f86790653f7e.tar.bz2
mpv-e3b3e28deb354830d682863c5086f86790653f7e.tar.xz
ao_opensles: remove useless cfg_sample_rate
We should always use the ao-neutral --audio-samplerate option.
-rw-r--r--DOCS/interface-changes.rst1
-rw-r--r--audio/out/ao_opensles.c5
2 files changed, 1 insertions, 5 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 4aae43db7a..eb929e7481 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -20,6 +20,7 @@ Interface changes
::
--- mpv 0.29.0 ---
+ - drop --opensles-sample-rate, as --audio-samplerate should be used if desired
- drop deprecated --videotoolbox-format, --ff-aid, --ff-vid, --ff-sid,
--ad-spdif-dtshd, --softvol options
- fix --external-files: strictly never select any tracks from them, unless
diff --git a/audio/out/ao_opensles.c b/audio/out/ao_opensles.c
index 559f3f201e..4c411a87ef 100644
--- a/audio/out/ao_opensles.c
+++ b/audio/out/ao_opensles.c
@@ -41,7 +41,6 @@ struct priv {
double audio_latency;
int cfg_frames_per_buffer;
- int cfg_sample_rate;
};
static const int fmtmap[][2] = {
@@ -153,9 +152,6 @@ static int init(struct ao *ao)
pcm.channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
pcm.endianness = SL_BYTEORDER_LITTLEENDIAN;
- if (p->cfg_sample_rate)
- ao->samplerate = p->cfg_sample_rate;
-
// samplesPerSec is misnamed, actually it's samples per ms
pcm.samplesPerSec = ao->samplerate * 1000;
@@ -254,7 +250,6 @@ const struct ao_driver audio_out_opensles = {
.priv_size = sizeof(struct priv),
.options = (const struct m_option[]) {
OPT_INTRANGE("frames-per-buffer", cfg_frames_per_buffer, 0, 1, 10000),
- OPT_INTRANGE("sample-rate", cfg_sample_rate, 0, 1000, 100000),
{0}
},
.options_prefix = "opensles",