diff options
| author |  wm4 <wm4@nowhere> | 2018-03-13 12:54:48 +0100 |
|---|---|---|
| committer |  Kevin Mitchell <kevmitch@gmail.com> | 2018-03-15 23:13:53 -0700 |
| commit | 290341c77765ecbd44beedbd50f18f45638b78db (patch) | |
| tree | 1fab9f538f903ad3856393be11f90654703efac1 /player | |
| parent | e42a194062cb29e538f19d12902c1610c1b30aef (diff) | |
vo: pass through framedrop flag differently
There is some sort-of awkwardness here, because option access needs to
happen in a synchronized manner, and the framedrop flag is not in the VO
option struct. Remove the mp_read_option_raw() call and the awkward
change notification via VO_EVENT_WIN_STATE from command.c, and pass it
through as new vo_frame flag.
Diffstat (limited to 'player')
| -rw-r--r-- | player/command.c | 11 | ||||
| -rw-r--r-- | player/video.c | 3 |
2 files changed, 2 insertions, 12 deletions
diff --git a/player/command.c b/player/command.c index 628dc98a34..7b532cc0c6 100644 --- a/player/command.c +++ b/player/command.c @@ -2730,16 +2730,6 @@ static int mp_property_display_fps(void *ctx, struct m_property *prop, return mp_property_generic_option(mpctx, prop, action, arg); } -static int mp_property_framedrop(void *ctx, struct m_property *prop, - int action, void *arg) -{ - MPContext *mpctx = ctx; - int ret = mp_property_generic_option(mpctx, prop, action, arg); - if (action == M_PROPERTY_SET && ret == M_PROPERTY_OK && mpctx->video_out) - vo_event(mpctx->video_out, VO_EVENT_WIN_STATE); - return ret; -} - static int mp_property_estimated_display_fps(void *ctx, struct m_property *prop, int action, void *arg) { @@ -4001,7 +3991,6 @@ static const struct m_property mp_properties_base[] = { {"display-fps", mp_property_display_fps}, {"estimated-display-fps", mp_property_estimated_display_fps}, {"vsync-jitter", mp_property_vsync_jitter}, - {"framedrop", mp_property_framedrop}, {"working-directory", mp_property_cwd}, diff --git a/player/video.c b/player/video.c index e91c4ce631..7ec05e0f6d 100644 --- a/player/video.c +++ b/player/video.c @@ -777,7 +777,7 @@ static void handle_display_sync_frame(struct MPContext *mpctx, mode == VS_DISP_RESAMPLE_NONE; bool drop = mode == VS_DISP_VDROP || mode == VS_DISP_RESAMPLE || mode == VS_DISP_ADROP || mode == VS_DISP_RESAMPLE_VDROP; - drop &= (opts->frame_dropping & 1); + drop &= frame->can_drop; if (resample && using_spdif_passthrough(mpctx)) return; @@ -1109,6 +1109,7 @@ void write_video(struct MPContext *mpctx) .pts = pts, .duration = -1, .still = mpctx->step_frames > 0, + .can_drop = opts->frame_dropping & 1, .num_frames = MPMIN(mpctx->num_next_frames, req), .num_vsyncs = 1, }; |