Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
a7b2500f
Commit
a7b2500f
authored
Sep 03, 2008
by
Laurent Aimar
Committed by
Jean-Baptiste Kempf
Sep 03, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not filter the same picture multiple times (close #1959).
parent
0c48f0d5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
40 deletions
+29
-40
src/misc/filter_chain.c
src/misc/filter_chain.c
+7
-22
src/video_output/video_output.c
src/video_output/video_output.c
+22
-18
No files found.
src/misc/filter_chain.c
View file @
a7b2500f
...
@@ -54,6 +54,7 @@ static int filter_chain_DeleteFilterInternal( filter_chain_t *, filter_t * );
...
@@ -54,6 +54,7 @@ static int filter_chain_DeleteFilterInternal( filter_chain_t *, filter_t * );
static
int
UpdateBufferFunctions
(
filter_chain_t
*
);
static
int
UpdateBufferFunctions
(
filter_chain_t
*
);
static
picture_t
*
VideoBufferNew
(
filter_t
*
);
static
picture_t
*
VideoBufferNew
(
filter_t
*
);
static
void
VideoBufferDelete
(
filter_t
*
,
picture_t
*
);
/**
/**
* Filter chain initialisation
* Filter chain initialisation
...
@@ -362,27 +363,6 @@ picture_t *filter_chain_VideoFilter( filter_chain_t *p_chain, picture_t *p_pic )
...
@@ -362,27 +363,6 @@ picture_t *filter_chain_VideoFilter( filter_chain_t *p_chain, picture_t *p_pic )
filter_t
*
p_filter
=
pp_filter
[
i
];
filter_t
*
p_filter
=
pp_filter
[
i
];
picture_t
*
p_newpic
=
p_filter
->
pf_video_filter
(
p_filter
,
p_pic
);
picture_t
*
p_newpic
=
p_filter
->
pf_video_filter
(
p_filter
,
p_pic
);
/* FIXME Ugly hack to make it work in picture core.
* FIXME Remove this code when the picture release API has been
* FIXME cleaned up (a git revert of the commit should work) */
if
(
p_chain
->
p_this
->
i_object_type
==
VLC_OBJECT_VOUT
)
{
vout_thread_t
*
p_vout
=
(
vout_thread_t
*
)
p_chain
->
p_this
;
vlc_mutex_lock
(
&
p_vout
->
picture_lock
);
if
(
p_pic
->
i_refcount
)
{
p_pic
->
i_status
=
DISPLAYED_PICTURE
;
}
else
{
p_pic
->
i_status
=
DESTROYED_PICTURE
;
p_vout
->
i_heap_size
--
;
}
vlc_mutex_unlock
(
&
p_vout
->
picture_lock
);
if
(
p_newpic
)
p_newpic
->
i_status
=
READY_PICTURE
;
}
if
(
!
p_newpic
)
if
(
!
p_newpic
)
return
NULL
;
return
NULL
;
...
@@ -451,7 +431,7 @@ static int UpdateBufferFunctions( filter_chain_t *p_chain )
...
@@ -451,7 +431,7 @@ static int UpdateBufferFunctions( filter_chain_t *p_chain )
if
(
p_chain
->
pf_buffer_allocation_clear
)
if
(
p_chain
->
pf_buffer_allocation_clear
)
p_chain
->
pf_buffer_allocation_clear
(
p_filter
);
p_chain
->
pf_buffer_allocation_clear
(
p_filter
);
p_filter
->
pf_vout_buffer_new
=
VideoBufferNew
;
p_filter
->
pf_vout_buffer_new
=
VideoBufferNew
;
p_filter
->
pf_vout_buffer_del
=
NULL
;
p_filter
->
pf_vout_buffer_del
=
VideoBufferDelete
;
}
}
}
}
if
(
p_chain
->
filters
.
i_count
>=
1
)
if
(
p_chain
->
filters
.
i_count
>=
1
)
...
@@ -460,6 +440,7 @@ static int UpdateBufferFunctions( filter_chain_t *p_chain )
...
@@ -460,6 +440,7 @@ static int UpdateBufferFunctions( filter_chain_t *p_chain )
if
(
p_filter
->
pf_vout_buffer_new
==
VideoBufferNew
)
if
(
p_filter
->
pf_vout_buffer_new
==
VideoBufferNew
)
{
{
p_filter
->
pf_vout_buffer_new
=
NULL
;
p_filter
->
pf_vout_buffer_new
=
NULL
;
p_filter
->
pf_vout_buffer_del
=
NULL
;
if
(
p_chain
->
pf_buffer_allocation_init
(
p_filter
,
if
(
p_chain
->
pf_buffer_allocation_init
(
p_filter
,
p_chain
->
p_buffer_allocation_data
)
!=
VLC_SUCCESS
)
p_chain
->
p_buffer_allocation_data
)
!=
VLC_SUCCESS
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
@@ -480,4 +461,8 @@ static picture_t *VideoBufferNew( filter_t *p_filter )
...
@@ -480,4 +461,8 @@ static picture_t *VideoBufferNew( filter_t *p_filter )
msg_Err
(
p_filter
,
"Failed to allocate picture
\n
"
);
msg_Err
(
p_filter
,
"Failed to allocate picture
\n
"
);
return
p_picture
;
return
p_picture
;
}
}
static
void
VideoBufferDelete
(
filter_t
*
p_filter
,
picture_t
*
p_picture
)
{
picture_Release
(
p_picture
);
}
src/video_output/video_output.c
View file @
a7b2500f
...
@@ -89,22 +89,27 @@ int vout_Snapshot( vout_thread_t *, picture_t * );
...
@@ -89,22 +89,27 @@ int vout_Snapshot( vout_thread_t *, picture_t * );
/* Display media title in OSD */
/* Display media title in OSD */
static
void
DisplayTitleOnOSD
(
vout_thread_t
*
p_vout
);
static
void
DisplayTitleOnOSD
(
vout_thread_t
*
p_vout
);
/* */
static
void
DropPicture
(
vout_thread_t
*
p_vout
,
picture_t
*
p_picture
);
/*****************************************************************************
/*****************************************************************************
* Video Filter2 functions
* Video Filter2 functions
*****************************************************************************/
*****************************************************************************/
static
picture_t
*
video_new_buffer_filter
(
filter_t
*
p_filter
)
static
picture_t
*
video_new_buffer_filter
(
filter_t
*
p_filter
)
{
{
picture_t
*
p_picture
;
vout_thread_t
*
p_vout
=
(
vout_thread_t
*
)
p_filter
->
p_owner
;
vout_thread_t
*
p_vout
=
(
vout_thread_t
*
)
p_filter
->
p_owner
;
picture_t
*
p_picture
=
vout_CreatePicture
(
p_vout
,
0
,
0
,
0
);
p_picture
=
vout_CreatePicture
(
p_vout
,
0
,
0
,
0
)
;
p_picture
->
i_status
=
READY_PICTURE
;
return
p_picture
;
return
p_picture
;
}
}
static
void
video_del_buffer_filter
(
filter_t
*
p_filter
,
picture_t
*
p_pic
)
static
void
video_del_buffer_filter
(
filter_t
*
p_filter
,
picture_t
*
p_pic
)
{
{
vout_DestroyPicture
(
(
vout_thread_t
*
)
p_filter
->
p_owner
,
p_pic
);
vout_thread_t
*
p_vout
=
(
vout_thread_t
*
)
p_filter
->
p_owner
;
DropPicture
(
p_vout
,
p_pic
);
}
}
static
int
video_filter_buffer_allocation_init
(
filter_t
*
p_filter
,
void
*
p_data
)
static
int
video_filter_buffer_allocation_init
(
filter_t
*
p_filter
,
void
*
p_data
)
...
@@ -518,7 +523,6 @@ static void vout_Destructor( vlc_object_t * p_this )
...
@@ -518,7 +523,6 @@ static void vout_Destructor( vlc_object_t * p_this )
*****************************************************************************/
*****************************************************************************/
static
int
ChromaCreate
(
vout_thread_t
*
p_vout
);
static
int
ChromaCreate
(
vout_thread_t
*
p_vout
);
static
void
ChromaDestroy
(
vout_thread_t
*
p_vout
);
static
void
ChromaDestroy
(
vout_thread_t
*
p_vout
);
static
void
DropPicture
(
vout_thread_t
*
p_vout
,
picture_t
*
p_picture
);
static
int
InitThread
(
vout_thread_t
*
p_vout
)
static
int
InitThread
(
vout_thread_t
*
p_vout
)
{
{
...
@@ -742,6 +746,7 @@ static void* RunThread( vlc_object_t *p_this )
...
@@ -742,6 +746,7 @@ static void* RunThread( vlc_object_t *p_this )
/* Initialize loop variables */
/* Initialize loop variables */
const
mtime_t
current_date
=
mdate
();
const
mtime_t
current_date
=
mdate
();
picture_t
*
p_picture
=
NULL
;
picture_t
*
p_picture
=
NULL
;
picture_t
*
p_filtered_picture
;
mtime_t
display_date
=
0
;
mtime_t
display_date
=
0
;
picture_t
*
p_directbuffer
;
picture_t
*
p_directbuffer
;
input_thread_t
*
p_input
;
input_thread_t
*
p_input
;
...
@@ -872,20 +877,17 @@ static void* RunThread( vlc_object_t *p_this )
...
@@ -872,20 +877,17 @@ static void* RunThread( vlc_object_t *p_this )
}
}
if
(
p_picture
==
NULL
)
if
(
p_picture
==
NULL
)
{
i_idle_loops
++
;
i_idle_loops
++
;
}
p_filtered_picture
=
NULL
;
if
(
p_picture
)
if
(
p_picture
)
{
p_filtered_picture
=
filter_chain_VideoFilter
(
p_vout
->
p_vf2_chain
,
p_picture
=
filter_chain_VideoFilter
(
p_vout
->
p_vf2_chain
,
p_picture
);
p_picture
);
}
if
(
p_picture
&&
p_vout
->
b_snapshot
)
if
(
p_
filtered_
picture
&&
p_vout
->
b_snapshot
)
{
{
p_vout
->
b_snapshot
=
false
;
p_vout
->
b_snapshot
=
false
;
vout_Snapshot
(
p_vout
,
p_picture
);
vout_Snapshot
(
p_vout
,
p_
filtered_
picture
);
}
}
/*
/*
...
@@ -904,12 +906,12 @@ static void* RunThread( vlc_object_t *p_this )
...
@@ -904,12 +906,12 @@ static void* RunThread( vlc_object_t *p_this )
* Perform rendering
* Perform rendering
*/
*/
i_displayed
++
;
i_displayed
++
;
p_directbuffer
=
vout_RenderPicture
(
p_vout
,
p_picture
,
p_subpic
);
p_directbuffer
=
vout_RenderPicture
(
p_vout
,
p_
filtered_
picture
,
p_subpic
);
/*
/*
* Call the plugin-specific rendering method if there is one
* Call the plugin-specific rendering method if there is one
*/
*/
if
(
p_picture
!=
NULL
&&
p_directbuffer
!=
NULL
&&
p_vout
->
pf_render
)
if
(
p_
filtered_
picture
!=
NULL
&&
p_directbuffer
!=
NULL
&&
p_vout
->
pf_render
)
{
{
/* Render the direct buffer returned by vout_RenderPicture */
/* Render the direct buffer returned by vout_RenderPicture */
p_vout
->
pf_render
(
p_vout
,
p_directbuffer
);
p_vout
->
pf_render
(
p_vout
,
p_directbuffer
);
...
@@ -963,20 +965,22 @@ static void* RunThread( vlc_object_t *p_this )
...
@@ -963,20 +965,22 @@ static void* RunThread( vlc_object_t *p_this )
/*
/*
* Display the previously rendered picture
* Display the previously rendered picture
*/
*/
if
(
p_picture
!=
NULL
&&
p_directbuffer
!=
NULL
)
if
(
p_
filtered_
picture
!=
NULL
&&
p_directbuffer
!=
NULL
)
{
{
/* Display the direct buffer returned by vout_RenderPicture */
/* Display the direct buffer returned by vout_RenderPicture */
if
(
p_vout
->
pf_display
)
if
(
p_vout
->
pf_display
)
{
p_vout
->
pf_display
(
p_vout
,
p_directbuffer
);
p_vout
->
pf_display
(
p_vout
,
p_directbuffer
);
}
/* Tell the vout this was the last picture and that it does not
/* Tell the vout this was the last picture and that it does not
* need to be forced anymore. */
* need to be forced anymore. */
p_last_picture
=
p_picture
;
p_last_picture
=
p_picture
;
p_last_picture
->
b_force
=
0
;
p_last_picture
->
b_force
=
false
;
}
}
/* Drop the filtered picture if created by video filters */
if
(
p_filtered_picture
!=
NULL
&&
p_filtered_picture
!=
p_picture
)
DropPicture
(
p_vout
,
p_filtered_picture
);
if
(
p_picture
!=
NULL
)
if
(
p_picture
!=
NULL
)
{
{
/* Reinitialize idle loop count */
/* Reinitialize idle loop count */
...
...
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