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
a4903675
Commit
a4903675
authored
Jun 24, 2011
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Split internal format from format for opengl texture creation.
No functionnal changes.
parent
0021f7a1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
modules/video_output/opengl.c
modules/video_output/opengl.c
+6
-1
No files found.
modules/video_output/opengl.c
View file @
a4903675
...
@@ -109,6 +109,7 @@ struct vout_display_opengl_t {
...
@@ -109,6 +109,7 @@ struct vout_display_opengl_t {
int
tex_target
;
int
tex_target
;
int
tex_format
;
int
tex_format
;
int
tex_internal
;
int
tex_type
;
int
tex_type
;
int
tex_width
[
PICTURE_PLANE_MAX
];
int
tex_width
[
PICTURE_PLANE_MAX
];
...
@@ -205,6 +206,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -205,6 +206,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
# endif
# endif
vgl
->
tex_target
=
GL_TEXTURE_2D
;
vgl
->
tex_target
=
GL_TEXTURE_2D
;
vgl
->
tex_format
=
GL_RGB
;
vgl
->
tex_format
=
GL_RGB
;
vgl
->
tex_internal
=
GL_RGB
;
vgl
->
tex_type
=
GL_UNSIGNED_SHORT_5_6_5
;
vgl
->
tex_type
=
GL_UNSIGNED_SHORT_5_6_5
;
#elif defined(MACOS_OPENGL)
#elif defined(MACOS_OPENGL)
# if defined(WORDS_BIGENDIAN)
# if defined(WORDS_BIGENDIAN)
...
@@ -214,6 +216,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -214,6 +216,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
# endif
# endif
vgl
->
tex_target
=
GL_TEXTURE_RECTANGLE_EXT
;
vgl
->
tex_target
=
GL_TEXTURE_RECTANGLE_EXT
;
vgl
->
tex_format
=
GL_YCBCR_422_APPLE
;
vgl
->
tex_format
=
GL_YCBCR_422_APPLE
;
vgl
->
tex_internal
=
GL_YCBCR_422_APPLE
;
vgl
->
tex_type
=
GL_UNSIGNED_SHORT_8_8_APPLE
;
vgl
->
tex_type
=
GL_UNSIGNED_SHORT_8_8_APPLE
;
#else
#else
vgl
->
fmt
.
i_chroma
=
VLC_CODEC_RGB32
;
vgl
->
fmt
.
i_chroma
=
VLC_CODEC_RGB32
;
...
@@ -228,6 +231,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -228,6 +231,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
# endif
# endif
vgl
->
tex_target
=
GL_TEXTURE_2D
;
vgl
->
tex_target
=
GL_TEXTURE_2D
;
vgl
->
tex_format
=
GL_RGBA
;
vgl
->
tex_format
=
GL_RGBA
;
vgl
->
tex_internal
=
GL_RGBA
;
vgl
->
tex_type
=
GL_UNSIGNED_BYTE
;
vgl
->
tex_type
=
GL_UNSIGNED_BYTE
;
#endif
#endif
/* Use YUV if possible and needed */
/* Use YUV if possible and needed */
...
@@ -242,6 +246,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -242,6 +246,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
vgl
->
fmt
=
*
fmt
;
vgl
->
fmt
=
*
fmt
;
vgl
->
fmt
.
i_chroma
=
*
list
;
vgl
->
fmt
.
i_chroma
=
*
list
;
vgl
->
tex_format
=
GL_LUMINANCE
;
vgl
->
tex_format
=
GL_LUMINANCE
;
vgl
->
tex_internal
=
GL_LUMINANCE
;
vgl
->
tex_type
=
GL_UNSIGNED_BYTE
;
vgl
->
tex_type
=
GL_UNSIGNED_BYTE
;
break
;
break
;
}
}
...
@@ -515,7 +520,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
...
@@ -515,7 +520,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
/* Call glTexImage2D only once, and use glTexSubImage2D later */
/* Call glTexImage2D only once, and use glTexSubImage2D later */
glTexImage2D
(
vgl
->
tex_target
,
0
,
glTexImage2D
(
vgl
->
tex_target
,
0
,
vgl
->
tex_
format
,
vgl
->
tex_width
[
j
],
vgl
->
tex_height
[
j
],
vgl
->
tex_
internal
,
vgl
->
tex_width
[
j
],
vgl
->
tex_height
[
j
],
0
,
vgl
->
tex_format
,
vgl
->
tex_type
,
NULL
);
0
,
vgl
->
tex_format
,
vgl
->
tex_type
,
NULL
);
}
}
}
}
...
...
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