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
95cfb0e3
Commit
95cfb0e3
authored
Nov 08, 2013
by
Adrien Maglo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Vout: add a new vout_window type for android native windows
parent
348fbb56
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
include/vlc_vout_window.h
include/vlc_vout_window.h
+5
-3
src/video_output/window.c
src/video_output/window.c
+4
-0
No files found.
include/vlc_vout_window.h
View file @
95cfb0e3
...
@@ -45,6 +45,7 @@ enum {
...
@@ -45,6 +45,7 @@ enum {
VOUT_WINDOW_TYPE_XID
,
VOUT_WINDOW_TYPE_XID
,
VOUT_WINDOW_TYPE_HWND
,
VOUT_WINDOW_TYPE_HWND
,
VOUT_WINDOW_TYPE_NSOBJECT
,
VOUT_WINDOW_TYPE_NSOBJECT
,
VOUT_WINDOW_TYPE_ANDROID_NATIVE
,
};
};
/**
/**
...
@@ -87,9 +88,10 @@ struct vout_window_t {
...
@@ -87,9 +88,10 @@ struct vout_window_t {
* It must be filled in the open function.
* It must be filled in the open function.
*/
*/
union
{
union
{
void
*
hwnd
;
/* Win32 window handle */
void
*
hwnd
;
/* Win32 window handle */
uint32_t
xid
;
/* X11 windows ID */
uint32_t
xid
;
/* X11 windows ID */
void
*
nsobject
;
/* Mac OSX view object */
void
*
nsobject
;
/* Mac OSX view object */
void
*
anativewindow
;
/* Android native window. */
}
handle
;
}
handle
;
/* display server (mandatory) */
/* display server (mandatory) */
...
...
src/video_output/window.c
View file @
95cfb0e3
...
@@ -82,6 +82,10 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
...
@@ -82,6 +82,10 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
window
->
handle
.
xid
=
0
;
window
->
handle
.
xid
=
0
;
window
->
display
.
x11
=
NULL
;
window
->
display
.
x11
=
NULL
;
break
;
break
;
case
VOUT_WINDOW_TYPE_ANDROID_NATIVE
:
type
=
"vout window anative"
;
window
->
handle
.
anativewindow
=
NULL
;
break
;
default:
default:
assert
(
0
);
assert
(
0
);
}
}
...
...
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