[vlc-devel] [PATCH v2 17/18] video_output: Add PPAPI plugin

[Rémi Denis-Courmont]

Le maanantaina 13. maaliskuuta 2017, 12.37.03 EET Dennis Hamester a écrit :
> diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
> index 69a719bd2a..6f32a94e12 100644
> --- a/include/vlc_vout_window.h
> +++ b/include/vlc_vout_window.h
> @@ -43,6 +43,9 @@ typedef struct vout_window_sys_t vout_window_sys_t;
>  struct wl_display;
>  struct wl_surface;
> 
> +struct PPB_Graphics3D_1_0;
> +typedef struct PPB_Graphics3D_1_0 PPB_Graphics3D;

Doesn´t this conflict with PPAPI headers??

> +
>  /**
>   * Window handle type
>   */
> @@ -53,6 +56,7 @@ enum {
>      VOUT_WINDOW_TYPE_NSOBJECT,
>      VOUT_WINDOW_TYPE_ANDROID_NATIVE,
>      VOUT_WINDOW_TYPE_WAYLAND,
> +    VOUT_WINDOW_TYPE_PPAPI,
>  };
> 
>  /**
> @@ -133,12 +137,17 @@ struct vout_window_t {
>          void     *nsobject;      /* Mac OSX view object */
>          void     *anativewindow; /* Android native window. */
>          struct wl_surface *wl;   /* Wayland surface */
> +        int32_t  pp_context;     /* PPAPI context ID */
>      } handle;
> 
>      /* display server (mandatory) */
>      union {
>          char     *x11; /* X11 display (NULL = use default) */
>          struct wl_display *wl;   /* Wayland struct wl_display pointer */
> +        struct {
> +            int32_t pp_instance;           /* PPAPI instance ID */
> +            PPB_Graphics3D *pp_graphics3d; /* PPAPI graphics3d resource
> pointer */
> +        } ppapi;

Changing the structure layout on all platforms only for the benefit of PPAPI 
is not very appealing.

>      } display;
> 
>      /* Control on the module (mandatory)

-- 
雷米‧德尼-库尔蒙
https://www.remlab.net/