diff options
author | wm4 <wm4@nowhere> | 2019-11-17 02:11:28 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2019-11-17 02:11:45 +0100 |
commit | 78cf974375dee0334288697723022514403f81a6 (patch) | |
tree | 0142f6d0741c1e24491c5905e7783c8a5abf089a | |
parent | d92395d205dc9638c354c4bc7e58a969f889ebec (diff) | |
download | mpv-78cf974375dee0334288697723022514403f81a6.tar.bz2 mpv-78cf974375dee0334288697723022514403f81a6.tar.xz |
options: deprecate --video-sync=display-adrop
A stupid thing that will probably be in the way.
-rw-r--r-- | DOCS/interface-changes.rst | 2 | ||||
-rw-r--r-- | player/core.h | 1 | ||||
-rw-r--r-- | player/video.c | 6 |
3 files changed, 9 insertions, 0 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 187f64bb50..48c6372bf5 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -36,6 +36,8 @@ Interface changes outputs like vo_x11 and vo_drm, and screenshots, but not much else. - deprecate --input-file (there are no plans to remove this short-term, but it will probably eventually go away) + - deprecate --video-sync=display-adrop (might be removed if it's in the way; + undeprecated or readded if it's not too much of a problem) --- mpv 0.30.0 --- - add `--d3d11-output-format` to enable explicit selection of a D3D11 swap chain format. diff --git a/player/core.h b/player/core.h index 7827490f73..ffe3905765 100644 --- a/player/core.h +++ b/player/core.h @@ -341,6 +341,7 @@ typedef struct MPContext { // 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 e0353700f0..b5f27e77d6 100644 --- a/player/video.c +++ b/player/video.c @@ -784,6 +784,12 @@ 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 || |