diff options
| author | wm4 <wm4@nowhere> | 2020-05-23 04:24:04 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2020-05-23 04:24:04 +0200 |
| commit | 502e7987d8d85cb1d9eb3b3d1af38a1a92cc04e8 (patch) | |
| tree | 0fb2e497ebbcb1e4898f565845065ad0902a7c63 /player | |
| parent | e822207ab4f860c062fce78ba75c5d32290f4163 (diff) | |
| download | mpv-502e7987d8d85cb1d9eb3b3d1af38a1a92cc04e8.tar.bz2 mpv-502e7987d8d85cb1d9eb3b3d1af38a1a92cc04e8.tar.xz | |
player: remove some display-adrop leftovers
Forgotten in one of the previous commits. Also undeprecates
display-adrop since it's out of sight now.
Diffstat (limited to 'player')
| -rw-r--r-- | player/audio.c | 5 | ||||
| -rw-r--r-- | player/core.h | 2 | ||||
| -rw-r--r-- | player/video.c | 6 |
3 files changed, 0 insertions, 13 deletions
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 || |