Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
c5ae5a73
Commit
c5ae5a73
authored
Nov 15, 2016
by
Steve Lhomme
Committed by
Thomas Guillem
Nov 15, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout: opengl: initialize viewpoint on creation
Signed-off-by:
Thomas Guillem
<
thomas@gllm.fr
>
parent
142bedc3
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
23 additions
and
8 deletions
+23
-8
modules/video_output/caopengllayer.m
modules/video_output/caopengllayer.m
+2
-1
modules/video_output/gl.c
modules/video_output/gl.c
+2
-1
modules/video_output/ios2.m
modules/video_output/ios2.m
+2
-1
modules/video_output/macosx.m
modules/video_output/macosx.m
+2
-1
modules/video_output/opengl.c
modules/video_output/opengl.c
+9
-1
modules/video_output/opengl.h
modules/video_output/opengl.h
+2
-1
modules/video_output/win32/glwin32.c
modules/video_output/win32/glwin32.c
+2
-1
modules/video_output/xcb/glx.c
modules/video_output/xcb/glx.c
+2
-1
No files found.
modules/video_output/caopengllayer.m
View file @
c5ae5a73
...
...
@@ -179,7 +179,8 @@ static int Open (vlc_object_t *p_this)
const
vlc_fourcc_t
*
subpicture_chromas
;
video_format_t
fmt
=
vd
->
fmt
;
sys
->
vgl
=
vout_display_opengl_New
(
&
vd
->
fmt
,
&
subpicture_chromas
,
&
sys
->
gl
);
sys
->
vgl
=
vout_display_opengl_New
(
&
vd
->
fmt
,
&
subpicture_chromas
,
&
sys
->
gl
,
&
vd
->
cfg
->
viewpoint
);
if
(
!
sys
->
vgl
)
{
msg_Err
(
vd
,
"Error while initializing opengl display."
);
sys
->
gl
.
sys
=
NULL
;
...
...
modules/video_output/gl.c
View file @
c5ae5a73
...
...
@@ -125,7 +125,8 @@ static int Open (vlc_object_t *obj)
if
(
vlc_gl_MakeCurrent
(
sys
->
gl
))
goto
error
;
sys
->
vgl
=
vout_display_opengl_New
(
&
vd
->
fmt
,
&
spu_chromas
,
sys
->
gl
);
sys
->
vgl
=
vout_display_opengl_New
(
&
vd
->
fmt
,
&
spu_chromas
,
sys
->
gl
,
&
vd
->
cfg
->
viewpoint
);
vlc_gl_ReleaseCurrent
(
sys
->
gl
);
if
(
sys
->
vgl
==
NULL
)
...
...
modules/video_output/ios2.m
View file @
c5ae5a73
...
...
@@ -262,7 +262,8 @@ static int Open(vlc_object_t *this)
sys
->
gl
.
getProcAddress
=
OurGetProcAddress
;
sys
->
gl
.
sys
=
sys
;
sys
->
vgl
=
vout_display_opengl_New
(
&
vd
->
fmt
,
&
subpicture_chromas
,
&
sys
->
gl
);
sys
->
vgl
=
vout_display_opengl_New
(
&
vd
->
fmt
,
&
subpicture_chromas
,
&
sys
->
gl
,
&
vd
->
cfg
->
viewpoint
);
if
(
!
sys
->
vgl
)
{
sys
->
gl
.
sys
=
NULL
;
goto
bailout
;
...
...
modules/video_output/macosx.m
View file @
c5ae5a73
...
...
@@ -260,7 +260,8 @@ static int Open (vlc_object_t *this)
sys
->
gl
.
sys
=
sys
;
const
vlc_fourcc_t
*
subpicture_chromas
;
sys
->
vgl
=
vout_display_opengl_New
(
&
vd
->
fmt
,
&
subpicture_chromas
,
&
sys
->
gl
);
sys
->
vgl
=
vout_display_opengl_New
(
&
vd
->
fmt
,
&
subpicture_chromas
,
&
sys
->
gl
,
&
vd
->
cfg
->
viewpoint
);
if
(
!
sys
->
vgl
)
{
msg_Err
(
vd
,
"Error while initializing opengl display."
);
sys
->
gl
.
sys
=
NULL
;
...
...
modules/video_output/opengl.c
View file @
c5ae5a73
...
...
@@ -427,7 +427,8 @@ static void BuildXYZFragmentShader(vout_display_opengl_t *vgl,
vout_display_opengl_t
*
vout_display_opengl_New
(
video_format_t
*
fmt
,
const
vlc_fourcc_t
**
subpicture_chromas
,
vlc_gl_t
*
gl
)
vlc_gl_t
*
gl
,
const
vlc_viewpoint_t
*
viewpoint
)
{
vout_display_opengl_t
*
vgl
=
calloc
(
1
,
sizeof
(
*
vgl
));
if
(
!
vgl
)
...
...
@@ -739,6 +740,13 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
vgl
->
region
=
NULL
;
vgl
->
pool
=
NULL
;
if
(
vgl
->
fmt
.
projection_mode
!=
PROJECTION_MODE_RECTANGULAR
&&
vout_display_opengl_SetViewpoint
(
vgl
,
viewpoint
)
!=
VLC_SUCCESS
)
{
vout_display_opengl_Delete
(
vgl
);
return
NULL
;
}
*
fmt
=
vgl
->
fmt
;
if
(
subpicture_chromas
)
{
*
subpicture_chromas
=
gl_subpicture_chromas
;
...
...
modules/video_output/opengl.h
View file @
c5ae5a73
...
...
@@ -91,7 +91,8 @@ typedef struct vout_display_opengl_t vout_display_opengl_t;
vout_display_opengl_t
*
vout_display_opengl_New
(
video_format_t
*
fmt
,
const
vlc_fourcc_t
**
subpicture_chromas
,
vlc_gl_t
*
gl
);
vlc_gl_t
*
gl
,
const
vlc_viewpoint_t
*
viewpoint
);
void
vout_display_opengl_Delete
(
vout_display_opengl_t
*
vgl
);
picture_pool_t
*
vout_display_opengl_GetPool
(
vout_display_opengl_t
*
vgl
,
unsigned
);
...
...
modules/video_output/win32/glwin32.c
View file @
c5ae5a73
...
...
@@ -210,7 +210,8 @@ static int Open(vlc_object_t *object)
video_format_t
fmt
=
vd
->
fmt
;
const
vlc_fourcc_t
*
subpicture_chromas
;
sys
->
vgl
=
vout_display_opengl_New
(
&
fmt
,
&
subpicture_chromas
,
&
sys
->
gl
);
sys
->
vgl
=
vout_display_opengl_New
(
&
fmt
,
&
subpicture_chromas
,
&
sys
->
gl
,
&
vd
->
cfg
->
viewpoint
);
if
(
!
sys
->
vgl
)
goto
error
;
...
...
modules/video_output/xcb/glx.c
View file @
c5ae5a73
...
...
@@ -109,7 +109,8 @@ static int Open (vlc_object_t *obj)
if
(
vlc_gl_MakeCurrent
(
sys
->
gl
))
goto
error
;
sys
->
vgl
=
vout_display_opengl_New
(
&
vd
->
fmt
,
&
spu_chromas
,
sys
->
gl
);
sys
->
vgl
=
vout_display_opengl_New
(
&
vd
->
fmt
,
&
spu_chromas
,
sys
->
gl
,
&
vd
->
cfg
->
viewpoint
);
vlc_gl_ReleaseCurrent
(
sys
->
gl
);
if
(
sys
->
vgl
==
NULL
)
goto
error
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment