[vlc-devel] [PATCH 1/2] core: add viewpoint to change the yaw/pitch/roll/fow/zoom view during playback

Thomas Guillem thomas at gllm.fr
Thu Nov 10 18:24:17 CET 2016


From: Steve Lhomme <robux4 at videolabs.io>

These changes allow for us to change the viewpoint for a given vout, which is
the foundation required in order to play, and navigate, the contents of 360
videos.

Five new arguments has been added so that a user can decide where to start
playing within the 360 globe.

Signed-off-by: Thomas Guillem <thomas at gllm.fr>
---
 include/vlc_common.h            |  1 +
 include/vlc_vout.h              | 16 +++++++++++++++
 include/vlc_vout_display.h      |  7 +++++++
 include/vlc_vout_wrapper.h      |  1 +
 src/libvlccore.sym              |  1 +
 src/video_output/control.h      |  2 ++
 src/video_output/display.c      | 43 ++++++++++++++++++++++++++++++++++++++++-
 src/video_output/video_output.c | 19 ++++++++++++++++++
 8 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index a9683d6..0b1db73 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -249,6 +249,7 @@ typedef audio_format_t audio_sample_format_t;
 
 /* Video */
 typedef struct vout_thread_t vout_thread_t;
+typedef struct vlc_viewpoint_t vlc_viewpoint_t;
 
 typedef video_format_t video_frame_format_t;
 typedef struct picture_t picture_t;
diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 600cb56..baf9b15 100644
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -82,6 +82,19 @@ struct vout_thread_t {
 #define VOUT_ALIGN_BOTTOM       0x0008
 #define VOUT_ALIGN_VMASK        0x000C
 
+struct vlc_viewpoint_t {
+    int32_t yaw;   /* yaw in 0.001 degrees */
+    int32_t pitch; /* pitch in 0.001 degrees */
+    int32_t roll;  /* roll in 0.001 degrees */
+    int32_t fov;   /* field of view in 0.001 degrees */
+    int32_t zoom;  /* zoom factor, default to 0 */
+};
+
+static inline void vlc_viewpoint_init( vlc_viewpoint_t *p_vp )
+{
+    memset( p_vp, 0, sizeof(*p_vp) );
+}
+
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
@@ -156,6 +169,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_SetViewpoint( vout_thread_t *,
+                                const vlc_viewpoint_t *p_viewpoint );
+
 /**@}*/
 
 #endif /* _VLC_VIDEO_H */
diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 817f770..e1efe00 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,8 @@ typedef struct {
         int den;
     } zoom;
 
+    vlc_viewpoint_t viewpoint;
+
 } vout_display_cfg_t;
 
 /**
@@ -175,6 +178,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..ce019a8 100644
--- a/include/vlc_vout_wrapper.h
+++ b/include/vlc_vout_wrapper.h
@@ -93,6 +93,7 @@ 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_SetDisplayViewpoint(vout_display_t *, const vlc_viewpoint_t *);
 
 #endif /* VLC_VOUT_WRAPPER_H */
 
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 8bb2dac..ad2cc90 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -734,6 +734,7 @@ vout_window_Delete
 vout_display_GetDefaultDisplaySize
 vout_display_PlacePicture
 vout_display_SendMouseMovedDisplayCoordinates
+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..9fdfd85 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 {
@@ -95,6 +96,7 @@ typedef struct {
         } window;
         const vout_configuration_t *cfg;
         subpicture_t *subpicture;
+        vlc_viewpoint_t viewpoint;
     } u;
 } vout_control_cmd_t;
 
diff --git a/src/video_output/display.c b/src/video_output/display.c
index ecf661a..42fca34 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_t 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,20 @@ 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;
+
+            vlc_mutex_lock(&osys->viewpoint_lock);
+            cfg.viewpoint = osys->viewpoint;
+
+            if (vout_display_Control(vd, VOUT_DISPLAY_CHANGE_VIEWPOINT, &cfg)) {
+                msg_Err(vd, "Failed to change Viewpoint");
+                osys->viewpoint = osys->cfg.viewpoint;
+            }
+            osys->cfg.viewpoint = osys->viewpoint;
+            osys->ch_viewpoint  = false;
+            vlc_mutex_unlock(&osys->viewpoint_lock);
+        }
 
         /* */
         if (reset_pictures) {
@@ -1193,6 +1212,24 @@ void vout_SetDisplayCrop(vout_display_t *vd,
     }
 }
 
+void vout_SetDisplayViewpoint(vout_display_t *vd,
+                              const vlc_viewpoint_t *p_viewpoint)
+{
+    vout_display_owner_sys_t *osys = vd->owner.sys;
+
+    vlc_mutex_lock(&osys->viewpoint_lock);
+    if (osys->viewpoint.yaw   != p_viewpoint->yaw ||
+        osys->viewpoint.pitch != p_viewpoint->pitch ||
+        osys->viewpoint.roll  != p_viewpoint->roll ||
+        osys->viewpoint.zoom  != p_viewpoint->zoom ||
+        osys->viewpoint.fov   != p_viewpoint->fov) {
+        osys->viewpoint = *p_viewpoint;
+
+        osys->ch_viewpoint = true;
+    }
+    vlc_mutex_unlock(&osys->viewpoint_lock);
+}
+
 static vout_display_t *DisplayNew(vout_thread_t *vout,
                                   const video_format_t *source,
                                   const vout_display_state_t *state,
@@ -1218,6 +1255,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 +1328,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 +1357,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..391538d 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -540,12 +540,22 @@ void vout_ControlChangeSubMargin(vout_thread_t *vout, int margin)
                              margin);
 }
 
+void vout_SetViewpoint(vout_thread_t *vout,
+                       const vlc_viewpoint_t *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");
+    vlc_viewpoint_init(&cfg->viewpoint);
     cfg->display.title = title;
     const int display_width = var_CreateGetInteger(vout, "width");
     const int display_height = var_CreateGetInteger(vout, "height");
@@ -1289,6 +1299,12 @@ static void ThreadExecuteCropRatio(vout_thread_t *vout,
                         0, 0, 0, 0);
 }
 
+static void ThreadExecuteViewpoint(vout_thread_t *vout,
+                                   const vlc_viewpoint_t *p_viewpoint)
+{
+    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 +1564,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;
     }
-- 
2.9.3



More information about the vlc-devel mailing list