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.

2 files changed, 3 insertions, 5 deletions

diff --git a/video/out/vo.c b/video/out/vo.c
index 7db43eaa44..a221ed9bb9 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -164,7 +164,6 @@ struct vo_internal {
 
     double display_fps;
     double reported_display_fps;
-    int opt_framedrop;
 };
 
 extern const struct m_sub_options gl_video_conf;
@@ -531,9 +530,6 @@ static void update_display_fps(struct vo *vo)
 
         pthread_mutex_unlock(&in->lock);
 
-        mp_read_option_raw(vo->global, "framedrop", &m_option_type_choice,
-                           &in->opt_framedrop);
-
         double fps = 0;
         vo->driver->control(vo, VOCTRL_GET_DISPLAY_FPS, &fps);
 
@@ -851,7 +847,7 @@ bool vo_render_frame_external(struct vo *vo)
 
     in->dropped_frame &= !frame->display_synced;
     in->dropped_frame &= !(vo->driver->caps & VO_CAP_FRAMEDROP);
-    in->dropped_frame &= (in->opt_framedrop & 1);
+    in->dropped_frame &= frame->can_drop;
     // Even if we're hopelessly behind, rather degrade to 10 FPS playback,
     // instead of just freezing the display forever.
     in->dropped_frame &= now - in->prev_vsync < 100 * 1000;
diff --git a/video/out/vo.h b/video/out/vo.h
index 4e21221c74..4a54914962 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -236,6 +236,8 @@ struct vo_frame {
     bool still;
     // Frames are output as fast as possible, with implied vsync blocking.
     bool display_synced;
+    // Dropping the frame is allowed if the VO is behind.
+    bool can_drop;
     // The current frame to be drawn.
     // Warning: When OSD should be redrawn in --force-window --idle mode, this
     //          can be NULL. The VO should draw a black background, OSD on top.