vo: add video-target-params property

Kacper Michajłow committed 3 years ago

Commit da3bfc91 parent a6f661b5 files · +40 −1Browse files

Unified · Split

5 files

@@ -61,6 +61,7 @@ Interface changes · 60 unmodified lines
61	- remove `--alpha` and reintroduce `--background` option for better control	61	- remove `--alpha` and reintroduce `--background` option for better control
62	over blending alpha components into specific background types	62	over blending alpha components into specific background types
63	- add `--border-background` option	63	- add `--border-background` option
		64	- add `video-target-params` property
64	--- mpv 0.37.0 ---	65	--- mpv 0.37.0 ---
65	- `--save-position-on-quit` and its associated commands now store state files	66	- `--save-position-on-quit` and its associated commands now store state files
66	in %LOCALAPPDATA% instead of %APPDATA% directory by default on Windows.	67	in %LOCALAPPDATA% instead of %APPDATA% directory by default on Windows.

@@ -2647,6 +2647,11 @@ Property list · 2646 unmodified lines
2647		2647
2648	Has the same sub-properties as ``video-params``.	2648	Has the same sub-properties as ``video-params``.
2649		2649
		2650	``video-target-params``
		2651	Same as ``video-params``, but with the target properties that VO outputs to.
		2652
		2653	Has the same sub-properties as ``video-params``.
		2654
2650	``video-frame-info``	2655	``video-frame-info``
2651	Approximate information of the current frame. Note that if any of these	2656	Approximate information of the current frame. Note that if any of these
2652	are used on OSD, the information might be off by a few frames due to OSD	2657	are used on OSD, the information might be off by a few frames due to OSD

     return property_imgparams(&p, action, arg);
 }
+static int mp_property_tgt_imgparams(void *ctx, struct m_property *prop,
+                                     int action, void *arg)
+{
+    MPContext *mpctx = ctx;
+    struct vo *vo = mpctx->video_out;
+    if (!mpctx->video_out)
+        return M_PROPERTY_UNAVAILABLE;
+    int valid = m_property_read_sub_validate(ctx, prop, action, arg);
+    if (valid != M_PROPERTY_VALID)
+        return valid;
+    struct mp_image_params p = vo_get_target_params(vo);
+    return property_imgparams(&p, action, arg);
+}
 static int mp_property_dec_imgparams(void *ctx, struct m_property *prop,
                                     int action, void *arg)
 {
     {"current-ao", mp_property_ao},
     // Video
+    {"video-target-params", mp_property_tgt_imgparams},
     {"video-out-params", mp_property_vo_imgparams},
     {"video-dec-params", mp_property_dec_imgparams},
     {"video-params", mp_property_vd_imgparams},
       "decoder-frame-drop-count", "frame-drop-count", "video-frame-info",
       "vf-metadata", "af-metadata", "sub-start", "sub-end", "secondary-sub-start",
       "secondary-sub-end", "video-out-params", "video-dec-params", "video-params",
-      "deinterlace-active"),
+      "deinterlace-active", "video-target-params"),
     E(MP_EVENT_DURATION_UPDATE, "duration"),
     E(MPV_EVENT_VIDEO_RECONFIG, "video-out-params", "video-params",
       "video-format", "video-codec", "video-bitrate", "dwidth", "dheight",

@@ -614,6 +614,10 @@ static void run_reconfig(void *p) · 613 unmodified lines
614	mp_mutex_unlock(&vo->params_mutex);	614	mp_mutex_unlock(&vo->params_mutex);
615	}	615	}
616		616
		617	mp_mutex_lock(&vo->params_mutex);
		618	talloc_free(vo->target_params);
		619	vo->target_params = NULL;
		620	mp_mutex_unlock(&vo->params_mutex);
617	mp_mutex_lock(&in->lock);	621	mp_mutex_lock(&in->lock);
618	talloc_free(in->current_frame);	622	talloc_free(in->current_frame);
619	in->current_frame = NULL;	623	in->current_frame = NULL;
@@ -1480,3 +1484,13 @@ struct mp_image_params vo_get_current_params(struct vo *vo) · 860 unmodified lines
1480	mp_mutex_unlock(&vo->params_mutex);	1484	mp_mutex_unlock(&vo->params_mutex);
1481	return p;	1485	return p;
1482	}	1486	}
		1487
		1488	struct mp_image_params vo_get_target_params(struct vo *vo)
		1489	{
		1490	struct mp_image_params p = {0};
		1491	mp_mutex_lock(&vo->params_mutex);
		1492	if (vo->target_params)
		1493	p = *vo->target_params;
		1494	mp_mutex_unlock(&vo->params_mutex);
		1495	return p;
		1496	}

     //     generic getter is protected by params_mutex.
     mp_mutex params_mutex;
     struct mp_image_params *params; // Configured parameters (changed in vo_reconfig)
+    struct mp_image_params *target_params; // Target display parameters
     // --- The following fields can be accessed only by the VO thread, or from
     //     anywhere _if_ the VO thread is suspended (use vo->dispatch).
 struct vo_frame *vo_frame_ref(struct vo_frame *frame);
 struct mp_image_params vo_get_current_params(struct vo *vo);
+struct mp_image_params vo_get_target_params(struct vo *vo);
 #endif /* MPLAYER_VIDEO_OUT_H */

Keyboard shortcuts