Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
c2c6729b
Commit
c2c6729b
authored
Jun 28, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VLC_OBJECT_FILTER: remove
parent
2adfbf0c
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
10 additions
and
16 deletions
+10
-16
include/vlc_objects.h
include/vlc_objects.h
+0
-1
modules/gui/fbosd.c
modules/gui/fbosd.c
+2
-2
modules/misc/lua/libs/objects.c
modules/misc/lua/libs/objects.c
+0
-1
modules/video_filter/blendbench.c
modules/video_filter/blendbench.c
+1
-1
modules/video_filter/chain.c
modules/video_filter/chain.c
+1
-1
src/misc/filter_chain.c
src/misc/filter_chain.c
+1
-1
src/misc/image.c
src/misc/image.c
+1
-1
src/misc/objects.c
src/misc/objects.c
+0
-4
src/video_output/video_output.c
src/video_output/video_output.c
+1
-1
src/video_output/vout_subpictures.c
src/video_output/vout_subpictures.c
+3
-3
No files found.
include/vlc_objects.h
View file @
c2c6729b
...
@@ -44,7 +44,6 @@
...
@@ -44,7 +44,6 @@
#define VLC_OBJECT_ENCODER (-14)
#define VLC_OBJECT_ENCODER (-14)
#define VLC_OBJECT_ANNOUNCE (-17)
#define VLC_OBJECT_ANNOUNCE (-17)
#define VLC_OBJECT_OPENGL (-21)
#define VLC_OBJECT_OPENGL (-21)
#define VLC_OBJECT_FILTER (-22)
#define VLC_OBJECT_OSDMENU (-28)
#define VLC_OBJECT_OSDMENU (-28)
/* Please add new object types below -34 */
/* Please add new object types below -34 */
/* Please do not add new object types anyway */
/* Please do not add new object types anyway */
...
...
modules/gui/fbosd.c
View file @
c2c6729b
...
@@ -533,7 +533,7 @@ static int OpenBlending( intf_thread_t *p_intf )
...
@@ -533,7 +533,7 @@ static int OpenBlending( intf_thread_t *p_intf )
if
(
p_intf
->
p_sys
->
p_blend
)
return
VLC_EGENERIC
;
if
(
p_intf
->
p_sys
->
p_blend
)
return
VLC_EGENERIC
;
p_intf
->
p_sys
->
p_blend
=
p_intf
->
p_sys
->
p_blend
=
vlc_object_create
(
p_intf
,
VLC_OBJECT_FILTER
);
vlc_object_create
(
p_intf
,
sizeof
(
filter_t
)
);
vlc_object_attach
(
p_intf
->
p_sys
->
p_blend
,
p_intf
);
vlc_object_attach
(
p_intf
->
p_sys
->
p_blend
,
p_intf
);
p_intf
->
p_sys
->
p_blend
->
fmt_out
.
video
.
i_x_offset
=
p_intf
->
p_sys
->
p_blend
->
fmt_out
.
video
.
i_x_offset
=
p_intf
->
p_sys
->
p_blend
->
fmt_out
.
video
.
i_y_offset
=
0
;
p_intf
->
p_sys
->
p_blend
->
fmt_out
.
video
.
i_y_offset
=
0
;
...
@@ -578,7 +578,7 @@ static int OpenTextRenderer( intf_thread_t *p_intf )
...
@@ -578,7 +578,7 @@ static int OpenTextRenderer( intf_thread_t *p_intf )
if
(
p_intf
->
p_sys
->
p_text
)
return
VLC_EGENERIC
;
if
(
p_intf
->
p_sys
->
p_text
)
return
VLC_EGENERIC
;
p_intf
->
p_sys
->
p_text
=
p_intf
->
p_sys
->
p_text
=
vlc_object_create
(
p_intf
,
VLC_OBJECT_FILTER
);
vlc_object_create
(
p_intf
,
sizeof
(
filter_t
)
);
vlc_object_attach
(
p_intf
->
p_sys
->
p_text
,
p_intf
);
vlc_object_attach
(
p_intf
->
p_sys
->
p_text
,
p_intf
);
p_intf
->
p_sys
->
p_text
->
fmt_out
.
video
.
i_width
=
p_intf
->
p_sys
->
p_text
->
fmt_out
.
video
.
i_width
=
...
...
modules/misc/lua/libs/objects.c
View file @
c2c6729b
...
@@ -100,7 +100,6 @@ static int vlc_object_type_from_string( const char *psz_name )
...
@@ -100,7 +100,6 @@ static int vlc_object_type_from_string( const char *psz_name )
{
VLC_OBJECT_ENCODER
,
"encoder"
},
{
VLC_OBJECT_ENCODER
,
"encoder"
},
{
VLC_OBJECT_ANNOUNCE
,
"announce"
},
{
VLC_OBJECT_ANNOUNCE
,
"announce"
},
{
VLC_OBJECT_OPENGL
,
"opengl"
},
{
VLC_OBJECT_OPENGL
,
"opengl"
},
{
VLC_OBJECT_FILTER
,
"filter"
},
{
VLC_OBJECT_OSDMENU
,
"osdmenu"
},
{
VLC_OBJECT_OSDMENU
,
"osdmenu"
},
{
VLC_OBJECT_GENERIC
,
"generic"
},
{
VLC_OBJECT_GENERIC
,
"generic"
},
{
0
,
""
}
};
{
0
,
""
}
};
...
...
modules/video_filter/blendbench.c
View file @
c2c6729b
...
@@ -215,7 +215,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
...
@@ -215,7 +215,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
if
(
p_sys
->
b_done
)
if
(
p_sys
->
b_done
)
return
p_pic
;
return
p_pic
;
p_blend
=
vlc_object_create
(
p_filter
,
VLC_OBJECT_FILTER
);
p_blend
=
vlc_object_create
(
p_filter
,
sizeof
(
filter_t
)
);
if
(
!
p_blend
)
if
(
!
p_blend
)
{
{
p_pic
->
pf_release
(
p_pic
);
p_pic
->
pf_release
(
p_pic
);
...
...
modules/video_filter/chain.c
View file @
c2c6729b
...
@@ -87,7 +87,7 @@ static void DeleteFilter( filter_t *p_filter )
...
@@ -87,7 +87,7 @@ static void DeleteFilter( filter_t *p_filter )
static
filter_t
*
CreateFilter
(
vlc_object_t
*
p_this
,
video_format_t
*
fmt_in
,
static
filter_t
*
CreateFilter
(
vlc_object_t
*
p_this
,
video_format_t
*
fmt_in
,
video_format_t
*
fmt_out
)
video_format_t
*
fmt_out
)
{
{
filter_t
*
p_filter
=
vlc_object_create
(
p_this
,
VLC_OBJECT_FILTER
);
filter_t
*
p_filter
=
vlc_object_create
(
p_this
,
sizeof
(
filter_t
)
);
vlc_object_attach
(
p_filter
,
p_this
);
vlc_object_attach
(
p_filter
,
p_this
);
p_filter
->
pf_vout_buffer_new
=
get_pic
;
p_filter
->
pf_vout_buffer_new
=
get_pic
;
...
...
src/misc/filter_chain.c
View file @
c2c6729b
...
@@ -133,7 +133,7 @@ static filter_t *filter_chain_AppendFilterInternal( filter_chain_t *p_chain,
...
@@ -133,7 +133,7 @@ static filter_t *filter_chain_AppendFilterInternal( filter_chain_t *p_chain,
const
es_format_t
*
p_fmt_out
)
const
es_format_t
*
p_fmt_out
)
{
{
filter_t
*
p_filter
=
filter_t
*
p_filter
=
vlc_object_create
(
p_chain
->
p_this
,
VLC_OBJECT_FILTER
);
vlc_object_create
(
p_chain
->
p_this
,
sizeof
(
filter_t
)
);
if
(
!
p_filter
)
return
NULL
;
if
(
!
p_filter
)
return
NULL
;
vlc_object_attach
(
p_filter
,
p_chain
->
p_this
);
vlc_object_attach
(
p_filter
,
p_chain
->
p_this
);
...
...
src/misc/image.c
View file @
c2c6729b
...
@@ -751,7 +751,7 @@ static filter_t *CreateFilter( vlc_object_t *p_this, es_format_t *p_fmt_in,
...
@@ -751,7 +751,7 @@ static filter_t *CreateFilter( vlc_object_t *p_this, es_format_t *p_fmt_in,
{
{
filter_t
*
p_filter
;
filter_t
*
p_filter
;
p_filter
=
vlc_object_create
(
p_this
,
VLC_OBJECT_FILTER
);
p_filter
=
vlc_object_create
(
p_this
,
sizeof
(
filter_t
)
);
vlc_object_attach
(
p_filter
,
p_this
);
vlc_object_attach
(
p_filter
,
p_this
);
p_filter
->
pf_vout_buffer_new
=
p_filter
->
pf_vout_buffer_new
=
...
...
src/misc/objects.c
View file @
c2c6729b
...
@@ -242,10 +242,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
...
@@ -242,10 +242,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
i_size
=
sizeof
(
encoder_t
);
i_size
=
sizeof
(
encoder_t
);
psz_type
=
"encoder"
;
psz_type
=
"encoder"
;
break
;
break
;
case
VLC_OBJECT_FILTER
:
i_size
=
sizeof
(
filter_t
);
psz_type
=
"filter"
;
break
;
case
VLC_OBJECT_AOUT
:
case
VLC_OBJECT_AOUT
:
i_size
=
sizeof
(
aout_instance_t
);
i_size
=
sizeof
(
aout_instance_t
);
psz_type
=
"audio output"
;
psz_type
=
"audio output"
;
...
...
src/video_output/video_output.c
View file @
c2c6729b
...
@@ -655,7 +655,7 @@ static int InitThread( vout_thread_t *p_vout )
...
@@ -655,7 +655,7 @@ static int InitThread( vout_thread_t *p_vout )
p_vout
->
b_direct
=
0
;
p_vout
->
b_direct
=
0
;
/* Choose the best module */
/* Choose the best module */
p_vout
->
p_chroma
=
vlc_object_create
(
p_vout
,
VLC_OBJECT_FILTER
);
p_vout
->
p_chroma
=
vlc_object_create
(
p_vout
,
sizeof
(
filter_t
)
);
filter_t
*
p_chroma
=
p_vout
->
p_chroma
;
filter_t
*
p_chroma
=
p_vout
->
p_chroma
;
vlc_object_attach
(
p_chroma
,
p_vout
);
vlc_object_attach
(
p_chroma
,
p_vout
);
/* TODO: Set the fmt_in and fmt_out stuff here */
/* TODO: Set the fmt_in and fmt_out stuff here */
...
...
src/video_output/vout_subpictures.c
View file @
c2c6729b
...
@@ -527,7 +527,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
...
@@ -527,7 +527,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
/* Load the blending module */
/* Load the blending module */
if
(
!
p_spu
->
p_blend
&&
p_region
)
if
(
!
p_spu
->
p_blend
&&
p_region
)
{
{
p_spu
->
p_blend
=
vlc_object_create
(
p_spu
,
VLC_OBJECT_FILTER
);
p_spu
->
p_blend
=
vlc_object_create
(
p_spu
,
sizeof
(
filter_t
)
);
vlc_object_attach
(
p_spu
->
p_blend
,
p_spu
);
vlc_object_attach
(
p_spu
->
p_blend
,
p_spu
);
p_spu
->
p_blend
->
fmt_out
.
video
.
i_x_offset
=
p_spu
->
p_blend
->
fmt_out
.
video
.
i_x_offset
=
p_spu
->
p_blend
->
fmt_out
.
video
.
i_y_offset
=
0
;
p_spu
->
p_blend
->
fmt_out
.
video
.
i_y_offset
=
0
;
...
@@ -548,7 +548,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
...
@@ -548,7 +548,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
{
{
char
*
psz_modulename
=
NULL
;
char
*
psz_modulename
=
NULL
;
p_spu
->
p_text
=
vlc_object_create
(
p_spu
,
VLC_OBJECT_FILTER
);
p_spu
->
p_text
=
vlc_object_create
(
p_spu
,
sizeof
(
filter_t
)
);
vlc_object_attach
(
p_spu
->
p_text
,
p_spu
);
vlc_object_attach
(
p_spu
->
p_text
,
p_spu
);
p_spu
->
p_text
->
fmt_out
.
video
.
i_width
=
p_spu
->
p_text
->
fmt_out
.
video
.
i_width
=
...
@@ -690,7 +690,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
...
@@ -690,7 +690,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
(((
pi_scale_width
[
SCALE_DEFAULT
]
>
0
)
||
(
pi_scale_height
[
SCALE_DEFAULT
]
>
0
))
&&
(((
pi_scale_width
[
SCALE_DEFAULT
]
>
0
)
||
(
pi_scale_height
[
SCALE_DEFAULT
]
>
0
))
&&
((
pi_scale_width
[
SCALE_DEFAULT
]
!=
1000
)
||
(
pi_scale_height
[
SCALE_DEFAULT
]
!=
1000
))))
)
((
pi_scale_width
[
SCALE_DEFAULT
]
!=
1000
)
||
(
pi_scale_height
[
SCALE_DEFAULT
]
!=
1000
))))
)
{
{
p_spu
->
p_scale
=
vlc_object_create
(
p_spu
,
VLC_OBJECT_FILTER
);
p_spu
->
p_scale
=
vlc_object_create
(
p_spu
,
sizeof
(
filter_t
)
);
vlc_object_attach
(
p_spu
->
p_scale
,
p_spu
);
vlc_object_attach
(
p_spu
->
p_scale
,
p_spu
);
p_spu
->
p_scale
->
fmt_out
.
video
.
i_chroma
=
p_spu
->
p_scale
->
fmt_out
.
video
.
i_chroma
=
p_spu
->
p_scale
->
fmt_in
.
video
.
i_chroma
=
p_spu
->
p_scale
->
fmt_in
.
video
.
i_chroma
=
...
...
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