[vlc-devel] [PATCH 01/10] core: add viewpoint variables to change the yaw/pitch/roll view during playback
Steve Lhomme
robux4 at videolabs.io
Fri Sep 16 18:00:26 CEST 2016
--
replaces older patch using vout_display_cfg_t with VOUT_DISPLAY_CHANGE_VIEWPOINT
replaces older patch fixing the viewpoint values init
replaces older patch
* use a single viewpoint structure throughout the code
* only use the "viewpoint" string on init or when forced
* add a getter for the currently used display viewpoint under a lock
---
include/vlc_vout.h | 9 +++++++++
include/vlc_vout_display.h | 9 +++++++++
include/vlc_vout_wrapper.h | 3 +++
src/libvlccore.sym | 2 ++
src/video_output/control.h | 2 ++
src/video_output/display.c | 45 ++++++++++++++++++++++++++++++++++++++++-
src/video_output/video_output.c | 27 +++++++++++++++++++++++++
src/video_output/vout_intf.c | 30 +++++++++++++++++++++++++++
8 files changed, 126 insertions(+), 1 deletion(-)
diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 600cb56..baa2b9a 100644
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -82,6 +82,12 @@ struct vout_thread_t {
#define VOUT_ALIGN_BOTTOM 0x0008
#define VOUT_ALIGN_VMASK 0x000C
+typedef struct {
+ float f_yaw;
+ float f_pitch;
+ float f_roll;
+} vlc_viewpoint;
+
/*****************************************************************************
* Prototypes
*****************************************************************************/
@@ -156,6 +162,9 @@ VLC_API void vout_FlushSubpictureChannel( vout_thread_t *, int );
VLC_API void vout_EnableFilter( vout_thread_t *, const char *,bool , bool );
+VLC_API void vout_GetViewpoint( vout_thread_t *, vlc_viewpoint *p_viewpoint );
+VLC_API void vout_SetViewpoint( vout_thread_t *, const vlc_viewpoint *p_viewpoint );
+
/**@}*/
#endif /* _VLC_VIDEO_H */
diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 817f770..bf0a269 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -30,6 +30,7 @@
#include <vlc_subpicture.h>
#include <vlc_keys.h>
#include <vlc_mouse.h>
+#include <vlc_vout.h>
#include <vlc_vout_window.h>
/**
@@ -115,6 +116,10 @@ typedef struct {
int den;
} zoom;
+ vlc_viewpoint viewpoint;
+
+ projection_mode projection;
+
} vout_display_cfg_t;
/**
@@ -175,6 +180,10 @@ enum {
* The cropping requested is stored by video_format_t::i_x/y_offset and
* video_format_t::i_visible_width/height */
VOUT_DISPLAY_CHANGE_SOURCE_CROP, /* const video_format_t *p_source */
+
+ /* Ask the module to acknowledge/refuse VR/360° viewing direction after
+ * being requested externally */
+ VOUT_DISPLAY_CHANGE_VIEWPOINT, /* const vout_display_cfg_t *p_cfg */
};
/**
diff --git a/include/vlc_vout_wrapper.h b/include/vlc_vout_wrapper.h
index 419bfc8..d9d8669 100644
--- a/include/vlc_vout_wrapper.h
+++ b/include/vlc_vout_wrapper.h
@@ -24,6 +24,7 @@
#ifndef VLC_VOUT_WRAPPER_H
#define VLC_VOUT_WRAPPER_H 1
+#include <vlc_vout.h>
#include <vlc_vout_display.h>
/* XXX DO NOT use it outside the vout module wrapper XXX */
@@ -93,6 +94,8 @@ void vout_SetDisplayZoom(vout_display_t *, unsigned num, unsigned den);
void vout_SetDisplayAspect(vout_display_t *, unsigned num, unsigned den);
void vout_SetDisplayCrop(vout_display_t *, unsigned num, unsigned den,
unsigned left, unsigned top, int right, int bottom);
+void vout_GetDisplayViewpoint(vout_display_t *, vlc_viewpoint *p_viewpoint);
+void vout_SetDisplayViewpoint(vout_display_t *, const vlc_viewpoint *p_viewpoint);
#endif /* VLC_VOUT_WRAPPER_H */
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index cd56a3d..48355e6 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -732,6 +732,8 @@ vout_window_Delete
vout_display_GetDefaultDisplaySize
vout_display_PlacePicture
vout_display_SendMouseMovedDisplayCoordinates
+vout_GetViewpoint
+vout_SetViewpoint
xml_Create
text_style_Copy
text_style_Create
diff --git a/src/video_output/control.h b/src/video_output/control.h
index eff9aa1..a97ac3d 100644
--- a/src/video_output/control.h
+++ b/src/video_output/control.h
@@ -58,6 +58,7 @@ enum {
VOUT_CONTROL_CROP_BORDER, /* border */
VOUT_CONTROL_CROP_RATIO, /* pair */
VOUT_CONTROL_CROP_WINDOW, /* window */
+ VOUT_CONTROL_VIEWPOINT, /* viewpoint */
};
typedef struct {
@@ -93,6 +94,7 @@ typedef struct {
unsigned width;
unsigned height;
} window;
+ vlc_viewpoint viewpoint;
const vout_configuration_t *cfg;
subpicture_t *subpicture;
} u;
diff --git a/src/video_output/display.c b/src/video_output/display.c
index ecf661a..765e4ba 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -373,6 +373,10 @@ struct vout_display_owner_sys_t {
unsigned den;
} crop;
+ bool ch_viewpoint;
+ vlc_viewpoint viewpoint;
+ vlc_mutex_t viewpoint_lock;
+
/* */
video_format_t source;
filter_chain_t *filters;
@@ -850,7 +854,8 @@ bool vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
!ch_wm_state &&
#endif
!osys->ch_sar &&
- !osys->ch_crop) {
+ !osys->ch_crop &&
+ !osys->ch_viewpoint) {
if (!osys->cfg.is_fullscreen && osys->fit_window != 0) {
VoutDisplayFitWindow(vd, osys->fit_window == -1);
@@ -1034,6 +1039,18 @@ bool vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
osys->crop.den = crop_den;
osys->ch_crop = false;
}
+ if (osys->ch_viewpoint) {
+ vout_display_cfg_t cfg = osys->cfg;
+
+ cfg.viewpoint = osys->viewpoint;
+
+ if (vout_display_Control(vd, VOUT_DISPLAY_CHANGE_VIEWPOINT, &cfg)) {
+ msg_Err(vd, "Failed to change Viewpoint");
+ osys->viewpoint = cfg.viewpoint;
+ }
+ osys->cfg.viewpoint = osys->viewpoint;
+ osys->ch_viewpoint = false;
+ }
/* */
if (reset_pictures) {
@@ -1193,6 +1210,28 @@ void vout_SetDisplayCrop(vout_display_t *vd,
}
}
+void vout_GetDisplayViewpoint(vout_display_t *vd, vlc_viewpoint *p_viewpoint)
+{
+ vout_display_owner_sys_t *osys = vd->owner.sys;
+
+ vlc_mutex_lock(&osys->viewpoint_lock);
+ *p_viewpoint = osys->viewpoint;
+ vlc_mutex_unlock(&osys->viewpoint_lock);
+}
+
+void vout_SetDisplayViewpoint(vout_display_t *vd, const vlc_viewpoint *p_viewpoint)
+{
+ vout_display_owner_sys_t *osys = vd->owner.sys;
+
+ if (osys->viewpoint.f_yaw != p_viewpoint->f_yaw || osys->viewpoint.f_pitch != p_viewpoint->f_pitch ||
+ osys->viewpoint.f_roll != p_viewpoint->f_roll ) {
+
+ osys->viewpoint = *p_viewpoint;
+
+ osys->ch_viewpoint = true;
+ }
+}
+
static vout_display_t *DisplayNew(vout_thread_t *vout,
const video_format_t *source,
const vout_display_state_t *state,
@@ -1218,6 +1257,8 @@ static vout_display_t *DisplayNew(vout_thread_t *vout,
vlc_mutex_init(&osys->lock);
+ vlc_mutex_init(&osys->viewpoint_lock);
+
vlc_mouse_Init(&osys->mouse.state);
osys->mouse.last_moved = mdate();
osys->mouse.double_click_timeout = double_click_timeout;
@@ -1289,6 +1330,7 @@ static vout_display_t *DisplayNew(vout_thread_t *vout,
return p_display;
error:
+ vlc_mutex_destroy(&osys->viewpoint_lock);
vlc_mutex_destroy(&osys->lock);
free(osys);
return NULL;
@@ -1317,6 +1359,7 @@ void vout_DeleteDisplay(vout_display_t *vd, vout_display_state_t *state)
vlc_join(osys->event.thread, NULL);
block_FifoRelease(osys->event.fifo);
}
+ vlc_mutex_destroy(&osys->viewpoint_lock);
vlc_mutex_destroy(&osys->lock);
free(osys);
}
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 7994bec..2c0c8c9 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -540,12 +540,30 @@ void vout_ControlChangeSubMargin(vout_thread_t *vout, int margin)
margin);
}
+void vout_GetViewpoint( vout_thread_t *vout, vlc_viewpoint *p_viewpoint )
+{
+ vout_GetDisplayViewpoint(vout->p->display.vd, p_viewpoint);
+}
+
+void vout_SetViewpoint(vout_thread_t *vout, const vlc_viewpoint *p_viewpoint)
+{
+ vout_control_cmd_t cmd;
+ vout_control_cmd_Init(&cmd, VOUT_CONTROL_VIEWPOINT);
+ cmd.u.viewpoint = *p_viewpoint;
+
+ vout_control_Push(&vout->p->control, &cmd);
+}
+
/* */
static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, const char *title)
{
/* Load configuration */
cfg->is_fullscreen = var_CreateGetBool(vout, "fullscreen")
|| var_InheritBool(vout, "video-wallpaper");
+ cfg->projection = var_CreateGetInteger(vout, "projection");
+ cfg->viewpoint.f_yaw = 0.0f;
+ cfg->viewpoint.f_pitch = 0.0f;
+ cfg->viewpoint.f_roll = 0.0f;
cfg->display.title = title;
const int display_width = var_CreateGetInteger(vout, "width");
const int display_height = var_CreateGetInteger(vout, "height");
@@ -1289,6 +1307,12 @@ static void ThreadExecuteCropRatio(vout_thread_t *vout,
0, 0, 0, 0);
}
+static void ThreadExecuteViewpoint(vout_thread_t *vout, const vlc_viewpoint *p_viewpoint)
+{
+ msg_Dbg(vout, "ThreadExecuteViewpoint %f %f %f", p_viewpoint->f_yaw, p_viewpoint->f_pitch, p_viewpoint->f_roll);
+ vout_SetDisplayViewpoint(vout->p->display.vd, p_viewpoint);
+}
+
static int ThreadStart(vout_thread_t *vout, vout_display_state_t *state)
{
vlc_mouse_Init(&vout->p->mouse);
@@ -1548,6 +1572,9 @@ static int ThreadControl(vout_thread_t *vout, vout_control_cmd_t cmd)
cmd.u.border.left, cmd.u.border.top,
cmd.u.border.right, cmd.u.border.bottom);
break;
+ case VOUT_CONTROL_VIEWPOINT:
+ ThreadExecuteViewpoint(vout, &cmd.u.viewpoint);
+ break;
default:
break;
}
diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 11240c8..369c04e 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -57,6 +57,8 @@ static int AutoScaleCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int ZoomCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
+static int ViewpointCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
static int AboveCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int WallPaperCallback( vlc_object_t *, char const *,
@@ -252,6 +254,13 @@ void vout_IntfInit( vout_thread_t *p_vout )
var_Change( p_vout, "video-on-top", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_vout, "video-on-top", AboveCallback, NULL );
+ /* Add a variable to indicate if the viewpoint to use to display the video */
+ var_Create( p_vout, "viewpoint", VLC_VAR_STRING | VLC_VAR_DOINHERIT
+ | VLC_VAR_ISCOMMAND );
+ text.psz_string = _("Viewpoint");
+ var_Change( p_vout, "viewpoint", VLC_VAR_SETTEXT, &text, NULL );
+ var_AddCallback( p_vout, "viewpoint", ViewpointCallback, NULL );
+
/* Add a variable to indicate if the window should be below all others */
var_Create( p_vout, "video-wallpaper", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_AddCallback( p_vout, "video-wallpaper", WallPaperCallback,
@@ -309,6 +318,7 @@ void vout_IntfReinit( vout_thread_t *p_vout )
var_TriggerCallback( p_vout, "zoom" );
var_TriggerCallback( p_vout, "crop" );
var_TriggerCallback( p_vout, "aspect-ratio" );
+ var_TriggerCallback( p_vout, "viewpoint" );
var_TriggerCallback( p_vout, "video-on-top" );
var_TriggerCallback( p_vout, "video-wallpaper" );
@@ -602,6 +612,26 @@ static int ZoomCallback( vlc_object_t *obj, char const *name,
return VLC_SUCCESS;
}
+static int ViewpointCallback(vlc_object_t *obj, char const *cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *data)
+{
+ vlc_viewpoint viewpoint;
+ if (sscanf(newval.psz_string, "%f:%f:%f", &viewpoint.f_yaw, &viewpoint.f_pitch,
+ &viewpoint.f_roll) == 3) {
+ vout_SetViewpoint((vout_thread_t *)obj, &viewpoint);
+ } else if (!newval.psz_string || !newval.psz_string[0]) {
+ viewpoint.f_yaw = 0.0f;
+ viewpoint.f_pitch = 0.0f;
+ viewpoint.f_roll = 0.0f;
+ vout_SetViewpoint((vout_thread_t *)obj, &viewpoint);
+ } else {
+ msg_Err(obj, "Unknown viewpoint format (%s)", newval.psz_string);
+ }
+
+ VLC_UNUSED(cmd); VLC_UNUSED(oldval); VLC_UNUSED(data);
+ return VLC_SUCCESS;
+}
+
static int AboveCallback( vlc_object_t *obj, char const *name,
vlc_value_t prev, vlc_value_t cur, void *data )
{
More information about the vlc-devel
mailing list