Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
446263ea
Commit
446263ea
authored
Jan 05, 2012
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed rendering of subpictures with non 0 offset in opengl.
It is needed for DVD menu support.
parent
4343ec78
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
modules/video_output/opengl.c
modules/video_output/opengl.c
+4
-2
No files found.
modules/video_output/opengl.c
View file @
446263ea
...
...
@@ -569,13 +569,15 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
}
}
const
int
pixels_offset
=
r
->
fmt
.
i_y_offset
*
r
->
p_picture
->
p
->
i_pitch
+
r
->
fmt
.
i_x_offset
*
r
->
p_picture
->
p
->
i_pixel_pitch
;
if
(
glr
->
texture
)
{
glBindTexture
(
GL_TEXTURE_2D
,
glr
->
texture
);
/* TODO set GL_UNPACK_ALIGNMENT */
glPixelStorei
(
GL_UNPACK_ROW_LENGTH
,
r
->
p_picture
->
p
->
i_pitch
/
r
->
p_picture
->
p
->
i_pixel_pitch
);
glTexSubImage2D
(
GL_TEXTURE_2D
,
0
,
0
,
0
,
glr
->
width
,
glr
->
height
,
glr
->
format
,
glr
->
type
,
r
->
p_picture
->
p
->
p_pixels
);
glr
->
format
,
glr
->
type
,
&
r
->
p_picture
->
p
->
p_pixels
[
pixels_offset
]
);
}
else
{
glGenTextures
(
1
,
&
glr
->
texture
);
glBindTexture
(
GL_TEXTURE_2D
,
glr
->
texture
);
...
...
@@ -589,7 +591,7 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
glPixelStorei
(
GL_UNPACK_ROW_LENGTH
,
r
->
p_picture
->
p
->
i_pitch
/
r
->
p_picture
->
p
->
i_pixel_pitch
);
glTexImage2D
(
GL_TEXTURE_2D
,
0
,
glr
->
format
,
glr
->
width
,
glr
->
height
,
0
,
glr
->
format
,
glr
->
type
,
r
->
p_picture
->
p
->
p_pixels
);
&
r
->
p_picture
->
p
->
p_pixels
[
pixels_offset
]
);
}
}
}
...
...
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