RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

audio: remove --audiodrop 

This would play some silence in case video was slower than audio. If
framedropping is already enabled, there's no other way to keep A/V
sync, short of changing audio playback speed (which would give worse
results). The --audiodrop option inserted silence if there was more
than 500ms desync.

This worked somewhat, but I think it was a silly idea after all. Whether
the playback experience is really bad or slightly worse doesn't really
matter. There also was a subtle bug with PTS handling, that apparently
caused A/V desync anyway at ridiculous playback speeds.

Just remove this feature; nobody is going to use it anyway.
This commit is contained in:
wm4 2014-09-30 18:05:55 +02:00
parent f23827d557
commit 4ea05577bd
5 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DOCS/man/options.rst
View File

@ -976,11 +976,6 @@ Audio
maximum amplification, i.e. amplify by 200%. The default volume (no
change in volume) will be ``50`` in this case.
``--audiodrop``
If video is by more than 500 ms behind, insert 500 ms of silence, to make up
for audio getting ahead. Might help if video decoding is too slow beyond
help.
``--volume-restore-data=<string>``
Used internally for use by playback resume (e.g. with ``quit_watch_later``).
Restoring value has to be done carefully, because different AOs as well as

2
options/options.c
View File

@ -471,8 +471,6 @@ const m_option_t mp_opts[] = {
OPT_DOUBLE("display-fps", frame_drop_fps, M_OPT_MIN, .min = 0),
OPT_FLAG("audiodrop", insert_silence, 0),
OPT_FLAG("untimed", untimed, M_OPT_FIXED),
OPT_STRING("stream-capture", stream_capture, M_OPT_FIXED | M_OPT_FILE),

1
options/options.h
View File

@ -139,7 +139,6 @@ typedef struct MPOpts {
int autosync;
int frame_dropping;
double frame_drop_fps;
int insert_silence;
int term_osd;
int term_osd_bar;
char *term_osd_bar_chars;

14
player/audio.c
View File

@ -406,20 +406,6 @@ void fill_audio_out_buffers(struct MPContext *mpctx, double endpts)
playsize = MPMAX(1, playsize + skip); // silence will be prepended
}
if (opts->insert_silence) {
float S = 0.5;
if (!mpctx->paused && mpctx->audio_status == STATUS_PLAYING &&
mpctx->video_status == STATUS_PLAYING &&
mpctx->last_av_difference - mpctx->insert_silence > S)
mpctx->insert_silence += S;
if (mpctx->insert_silence > 0) {
int samples = MPMIN(playsize, play_samplerate * mpctx->insert_silence);
mp_audio_buffer_prepend_silence(mpctx->ao_buffer, samples);
mpctx->insert_silence -= samples / play_samplerate;
}
}
int status = AD_OK;
if (playsize > mp_audio_buffer_samples(mpctx->ao_buffer)) {
status = audio_decode(d_audio, mpctx->ao_buffer, playsize);

2
player/core.h
View File

@ -260,8 +260,6 @@ typedef struct MPContext {
double delay;
// AV sync: time in seconds until next frame should be shown
double time_frame;
// Optional/additional AV sync compensation if video is too slow.
double insert_silence;
// How much video timing has been changed to make it match the audio
// timeline. Used for status line information only.
double total_avsync_change;