diff options
| -rw-r--r-- | DOCS/interface-changes.rst | 3 | ||||
| -rw-r--r-- | DOCS/man/input.rst | 9 | ||||
| -rw-r--r-- | player/command.c | 27 |
3 files changed, 10 insertions, 29 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 6029917de5..2c2681b833 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -76,6 +76,9 @@ Interface changes - remove deprecated `--profile=opengl-hq` - remove several legacy fallbacks for old deprecated options (now they will just error out like normal) + - remove deprecated `drop-frame-count` and `vo-drop-frame-count` property aliases + - remove the ability to write to the `display-fps` property (use `override-display-fps` + instead) --- mpv 0.36.0 --- - add `--target-contrast` - Target luminance value is now also applied when ICC profile is used. diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst index 5de39d78e8..9e0e08fff8 100644 --- a/DOCS/man/input.rst +++ b/DOCS/man/input.rst @@ -1939,13 +1939,9 @@ Property list situations, e.g. when video packets are damaged, or the decoder doesn't follow the usual rules. Unavailable if video is disabled. - ``drop-frame-count`` is a deprecated alias. - ``frame-drop-count`` Frames dropped by VO (when using ``--framedrop=vo``). - ``vo-drop-frame-count`` is a deprecated alias. - ``mistimed-frame-count`` Number of video frames that were not timed correctly in display-sync mode for the sake of keeping A/V sync. This does not include external @@ -2645,11 +2641,6 @@ Property list available on all platforms. Note that any of the listed facts may change any time without a warning. - Writing to this property is deprecated. It has the same effect as writing to - ``override-display-fps``. Since mpv 0.31.0, this property is unavailable - if no display FPS was reported (e.g. if no video is active), while in older - versions, it returned the ``--display-fps`` option value. - ``estimated-display-fps`` The actual rate at which display refreshes seem to occur, measured by system time. Only available if display-sync mode (as selected by diff --git a/player/command.c b/player/command.c index 15177ca67c..0511b1cef5 100644 --- a/player/command.c +++ b/player/command.c @@ -2472,17 +2472,6 @@ static int mp_property_display_fps(void *ctx, struct m_property *prop, MPContext *mpctx = ctx; double fps = mpctx->video_out ? vo_get_display_fps(mpctx->video_out) : 0; switch (action) { - case M_PROPERTY_SET: { - MP_WARN(mpctx, "Setting the display-fps property is deprecated; set " - "the override-display-fps property instead.\n"); - struct mpv_node val = { - .format = MPV_FORMAT_DOUBLE, - .u.double_ = *(double *)arg, - }; - return m_config_set_option_node(mpctx->mconfig, - bstr0("override-display-fps"), &val, 0) - >= 0 ? M_PROPERTY_OK : M_PROPERTY_ERROR; - } case M_PROPERTY_GET: if (fps <= 0) return M_PROPERTY_UNAVAILABLE; @@ -4031,8 +4020,6 @@ static const struct m_property mp_properties_base[] = { M_PROPERTY_ALIAS("colormatrix-gamma", "video-params/gamma"), M_PROPERTY_DEPRECATED_ALIAS("sub-forced-only-cur", "sub-forced-events-only"), - M_PROPERTY_DEPRECATED_ALIAS("drop-frame-count", "decoder-frame-drop-count"), - M_PROPERTY_DEPRECATED_ALIAS("vo-drop-frame-count", "frame-drop-count"), }; // Each entry describes which properties an event (possibly) changes. @@ -4047,13 +4034,13 @@ static const char *const *const mp_event_property_change[] = { E(MPV_EVENT_IDLE, "*"), E(MPV_EVENT_TICK, "time-pos", "audio-pts", "stream-pos", "avsync", "percent-pos", "time-remaining", "playtime-remaining", "playback-time", - "estimated-vf-fps", "drop-frame-count", "vo-drop-frame-count", - "total-avsync-change", "audio-speed-correction", "video-speed-correction", - "vo-delayed-frame-count", "mistimed-frame-count", "vsync-ratio", - "estimated-display-fps", "vsync-jitter", "sub-text", "secondary-sub-text", - "audio-bitrate", "video-bitrate", "sub-bitrate", "decoder-frame-drop-count", - "frame-drop-count", "video-frame-info", "vf-metadata", "af-metadata", - "sub-start", "sub-end", "secondary-sub-start", "secondary-sub-end"), + "estimated-vf-fps", "total-avsync-change", "audio-speed-correction", + "video-speed-correction", "vo-delayed-frame-count", "mistimed-frame-count", + "vsync-ratio", "estimated-display-fps", "vsync-jitter", "sub-text", + "secondary-sub-text", "audio-bitrate", "video-bitrate", "sub-bitrate", + "decoder-frame-drop-count", "frame-drop-count", "video-frame-info", + "vf-metadata", "af-metadata", "sub-start", "sub-end", "secondary-sub-start", + "secondary-sub-end"), E(MP_EVENT_DURATION_UPDATE, "duration"), E(MPV_EVENT_VIDEO_RECONFIG, "video-out-params", "video-params", "video-format", "video-codec", "video-bitrate", "dwidth", "dheight", |