Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

player: make audio-channels etc. runtime settable

Browse Source 
If one of the audio output format options is set, brually reinit the
audio chain.

Since the audio-channels property is still mapped to the deprecated
read-only property, "options/audio-channels" currently has to be used,
e.g. "cycle-values options/audio-channels 2 7.1".
This commit is contained in:
wm4
2016-09-22 20:56:34 +02:00
parent 2ac74977c5
commit 075edc6fee
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
options/m_option.h
View File

@@ -388,7 +388,8 @@ struct m_option {
#define UPDATE_BUILTIN_SCRIPTS (1 << 11) // osc/ytdl
#define UPDATE_IMGPAR (1 << 12) // video image params overrides
#define UPDATE_INPUT (1 << 13) // mostly --input-* options
#define UPDATE_OPT_LAST (1 << 13)
#define UPDATE_AUDIO (1 << 14) // --audio-channels etc.
#define UPDATE_OPT_LAST (1 << 14)
// All bits between _FIRST and _LAST (inclusive)
#define UPDATE_OPTS_MASK \

8
options/options.c
View File

@@ -384,10 +384,10 @@ const m_option_t mp_opts[] = {
// force video/audio rate:
OPT_DOUBLE("fps", force_fps, CONF_MIN, .min = 0),
OPT_INTRANGE("audio-samplerate", force_srate, 0, 1000, 16*48000),
OPT_CHANNELS("audio-channels", audio_output_channels, 0),
OPT_AUDIOFORMAT("audio-format", audio_output_format, 0),
OPT_FLAG("audio-normalize-downmix", audio_normalize, 0),
OPT_INTRANGE("audio-samplerate", force_srate, UPDATE_AUDIO, 1000, 16*48000),
OPT_CHANNELS("audio-channels", audio_output_channels, UPDATE_AUDIO),
OPT_AUDIOFORMAT("audio-format", audio_output_format, UPDATE_AUDIO),
OPT_FLAG("audio-normalize-downmix", audio_normalize, UPDATE_AUDIO),
OPT_DOUBLE("speed", playback_speed, M_OPT_RANGE, .min = 0.01, .max = 100.0),
OPT_FLAG("audio-pitch-correction", pitch_correction, 0),

7
player/command.c
View File

@@ -5624,6 +5624,13 @@ void mp_option_change_callback(void *ctx, struct m_config_option *co, int flags)
mpctx->ipc_ctx = mp_init_ipc(mpctx->clients, mpctx->global);
}
}
if ((flags & UPDATE_AUDIO) && mpctx->ao_chain) {
// Force full mid-stream reinit.
reinit_audio_filters(mpctx);
uninit_audio_out(mpctx);
mp_wakeup_core(mpctx);
}
}
void mp_notify_property(struct MPContext *mpctx, const char *property)