diff options
| -rw-r--r-- | DOCS/interface-changes.rst | 3 | ||||
| -rw-r--r-- | DOCS/man/options.rst | 7 | ||||
| -rw-r--r-- | options/options.c | 3 | ||||
| -rw-r--r-- | options/options.h | 1 | ||||
| -rw-r--r-- | player/audio.c | 5 | ||||
| -rw-r--r-- | player/core.h | 2 | ||||
| -rw-r--r-- | player/video.c | 6 |
7 files changed, 3 insertions, 24 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index ad1e5b47d1..4cbeb98cce 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -69,6 +69,9 @@ Interface changes "inf" instead of boolean true (also affects loop option) - remove some --vo-direct3d-... options (it got dumbed down; use --vo=gpu) - remove video-params/plane-depth property (was too vaguely defined) + - remove --video-sync-adrop-size option (implementation was changed, no + replacement for what this option did) + - undeprecate --video-sync=display-adrop --- mpv 0.32.0 --- - change behavior when using legacy option syntax with options that start with two dashes (``--`` instead of a ``-``). Now, using the recommended diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 4ed5944956..9410ebd2fa 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -6447,13 +6447,6 @@ Miscellaneous frame dropping due to the audio "overshooting" and skipping multiple video frames before the sync logic can react. -``--video-sync-adrop-size=<value>`` - For the ``--video-sync=display-adrop`` mode. This mode duplicates/drops - audio data to keep audio in sync with video. To avoid audio artifacts on - jitter (which would add/remove samples all the time), this is done in - relatively large, fixed units, controlled by this option. The unit is - seconds. - ``--mf-fps=<value>`` Framerate used when decoding from multiple PNG or JPEG files with ``mf://`` (default: 1). diff --git a/options/options.c b/options/options.c index 08c9a7247f..0194ebed08 100644 --- a/options/options.c +++ b/options/options.c @@ -690,8 +690,6 @@ static const m_option_t mp_opts[] = { M_RANGE(0, DBL_MAX)}, {"video-sync-max-audio-change", OPT_DOUBLE(sync_max_audio_change), M_RANGE(0, 1)}, - {"video-sync-adrop-size", OPT_DOUBLE(sync_audio_drop_size), - M_RANGE(0, 1)}, {"video-sync-max-factor", OPT_INT(sync_max_factor), M_RANGE(1, 10)}, {"hr-seek", OPT_CHOICE(hr_seek, {"no", -1}, {"absolute", 0}, {"yes", 1}, {"always", 1}, {"default", 2})}, @@ -951,7 +949,6 @@ static const struct MPOpts mp_default_opts = { .hr_seek_framedrop = 1, .sync_max_video_change = 1, .sync_max_audio_change = 0.125, - .sync_audio_drop_size = 0.020, .sync_max_factor = 5, .load_config = 1, .position_resume = 1, diff --git a/options/options.h b/options/options.h index 548edf70c3..ce94d766a7 100644 --- a/options/options.h +++ b/options/options.h @@ -205,7 +205,6 @@ typedef struct MPOpts { int video_sync; double sync_max_video_change; double sync_max_audio_change; - double sync_audio_drop_size; int sync_max_factor; int hr_seek; float hr_seek_demuxer_offset; diff --git a/player/audio.c b/player/audio.c index 7bc1b8ac86..c6a0af4e54 100644 --- a/player/audio.c +++ b/player/audio.c @@ -200,7 +200,6 @@ void reset_audio_state(struct MPContext *mpctx) } mpctx->audio_status = mpctx->ao_chain ? STATUS_SYNCING : STATUS_EOF; mpctx->delay = 0; - mpctx->audio_drop_throttle = 0; mpctx->audio_stat_start = 0; } @@ -854,7 +853,6 @@ void fill_audio_out_buffers(struct MPContext *mpctx) int ao_format; struct mp_chmap ao_channels; ao_get_format(mpctx->ao, &ao_rate, &ao_format, &ao_channels); - double play_samplerate = ao_rate / mpctx->audio_speed; int align = af_format_sample_alignment(ao_format); // If audio is infinitely fast, somehow try keeping approximate A/V sync. @@ -985,9 +983,6 @@ void fill_audio_out_buffers(struct MPContext *mpctx) assert(played >= 0 && played <= samples); mp_audio_buffer_skip(ao_c->ao_buffer, played); - mpctx->audio_drop_throttle = - MPMAX(0, mpctx->audio_drop_throttle - played / play_samplerate); - dump_audio_stats(mpctx); mpctx->audio_status = STATUS_PLAYING; diff --git a/player/core.h b/player/core.h index 6882246942..55c8f514db 100644 --- a/player/core.h +++ b/player/core.h @@ -347,8 +347,6 @@ typedef struct MPContext { int display_sync_drift_dir; // Timing error (in seconds) due to rounding on vsync boundaries double display_sync_error; - double audio_drop_throttle; - bool audio_drop_deprecated_msg; // Number of mistimed frames. int mistimed_frames_total; bool hrseek_active; // skip all data until hrseek_pts diff --git a/player/video.c b/player/video.c index b82999f403..7b4cd86444 100644 --- a/player/video.c +++ b/player/video.c @@ -800,12 +800,6 @@ static void handle_display_sync_frame(struct MPContext *mpctx, mpctx->display_sync_active = false; - if (mode == VS_DISP_ADROP && !mpctx->audio_drop_deprecated_msg) { - MP_WARN(mpctx, "video-sync=display-adrop mode is deprecated and will " - "be removed in the future.\n"); - mpctx->audio_drop_deprecated_msg = true; - } - if (!VS_IS_DISP(mode)) return; bool resample = mode == VS_DISP_RESAMPLE || mode == VS_DISP_RESAMPLE_VDROP || |