Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Java sauce
VLC
Commits
85f85230
Commit
85f85230
authored
3 years ago
by
Zhao Zhili
Committed by
Rémi Denis-Courmont
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
opengl: importer: fix crop handling
parent
e72ce2df
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/video_output/opengl/importer.c
+10
-6
10 additions, 6 deletions
modules/video_output/opengl/importer.c
with
10 additions
and
6 deletions
modules/video_output/opengl/importer.c
+
10
−
6
View file @
85f85230
...
...
@@ -236,12 +236,16 @@ vlc_gl_importer_New(struct vlc_gl_interop *interop)
/* Texture size */
for
(
unsigned
j
=
0
;
j
<
interop
->
tex_count
;
j
++
)
{
GLsizei
w
=
interop
->
fmt_out
.
i_visible_width
*
interop
->
texs
[
j
].
w
.
num
GLsizei
v
w
=
interop
->
fmt_out
.
i_visible_width
*
interop
->
texs
[
j
].
w
.
num
/
interop
->
texs
[
j
].
w
.
den
;
GLsizei
h
=
interop
->
fmt_out
.
i_visible_height
*
interop
->
texs
[
j
].
h
.
num
GLsizei
v
h
=
interop
->
fmt_out
.
i_visible_height
*
interop
->
texs
[
j
].
h
.
num
/
interop
->
texs
[
j
].
h
.
den
;
glfmt
->
visible_widths
[
j
]
=
w
;
glfmt
->
visible_heights
[
j
]
=
h
;
GLsizei
w
=
(
interop
->
fmt_out
.
i_visible_width
+
interop
->
fmt_out
.
i_x_offset
)
*
interop
->
texs
[
j
].
w
.
num
/
interop
->
texs
[
j
].
w
.
den
;
GLsizei
h
=
(
interop
->
fmt_out
.
i_visible_height
+
interop
->
fmt_out
.
i_y_offset
)
*
interop
->
texs
[
j
].
h
.
num
/
interop
->
texs
[
j
].
h
.
den
;
glfmt
->
visible_widths
[
j
]
=
vw
;
glfmt
->
visible_heights
[
j
]
=
vh
;
if
(
supports_npot
)
{
glfmt
->
tex_widths
[
j
]
=
w
;
glfmt
->
tex_heights
[
j
]
=
h
;
...
...
@@ -408,8 +412,8 @@ vlc_gl_importer_Update(struct vlc_gl_importer *importer, picture_t *picture)
/* Update the texture */
int
ret
=
interop
->
ops
->
update_textures
(
interop
,
pic
->
textures
,
glfmt
->
visible
_widths
,
glfmt
->
visible
_heights
,
picture
,
glfmt
->
tex
_widths
,
glfmt
->
tex
_heights
,
picture
,
NULL
);
const
float
*
tm
=
GetTransformMatrix
(
interop
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment