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
11ac4b09
Commit
11ac4b09
authored
Apr 23, 2010
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed now useless vout_CountPictureAvailable.
parent
de67c3f7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
25 deletions
+3
-25
src/input/decoder.c
src/input/decoder.c
+3
-16
src/video_output/vout_control.h
src/video_output/vout_control.h
+0
-3
src/video_output/vout_pictures.c
src/video_output/vout_pictures.c
+0
-6
No files found.
src/input/decoder.c
View file @
11ac4b09
...
@@ -2252,9 +2252,6 @@ static void aout_del_buffer( decoder_t *p_dec, aout_buffer_t *p_buffer )
...
@@ -2252,9 +2252,6 @@ static void aout_del_buffer( decoder_t *p_dec, aout_buffer_t *p_buffer )
p_owner
->
p_aout_input
,
p_buffer
);
p_owner
->
p_aout_input
,
p_buffer
);
}
}
int
vout_CountPictureAvailable
(
vout_thread_t
*
p_vout
);
static
picture_t
*
vout_new_buffer
(
decoder_t
*
p_dec
)
static
picture_t
*
vout_new_buffer
(
decoder_t
*
p_dec
)
{
{
decoder_owner_sys_t
*
p_owner
=
p_dec
->
p_owner
;
decoder_owner_sys_t
*
p_owner
=
p_dec
->
p_owner
;
...
@@ -2353,22 +2350,12 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
...
@@ -2353,22 +2350,12 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
*/
*/
for
(
;;
)
for
(
;;
)
{
{
picture_t
*
p_picture
;
if
(
p_dec
->
b_die
||
p_dec
->
b_error
)
if
(
p_dec
->
b_die
||
p_dec
->
b_error
)
return
NULL
;
return
NULL
;
/* The video filter chain required that there is always 1 free buffer
picture_t
*
p_picture
=
vout_CreatePicture
(
p_owner
->
p_vout
,
0
,
0
,
0
);
* that it will use as temporary one. It will release the temporary
if
(
p_picture
)
* buffer once its work is done, so this check is safe even if we don't
return
p_picture
;
* lock around both count() and create().
*/
if
(
vout_CountPictureAvailable
(
p_owner
->
p_vout
)
>=
2
)
{
p_picture
=
vout_CreatePicture
(
p_owner
->
p_vout
,
0
,
0
,
0
);
if
(
p_picture
)
return
p_picture
;
}
if
(
DecoderIsFlushing
(
p_dec
)
)
if
(
DecoderIsFlushing
(
p_dec
)
)
return
NULL
;
return
NULL
;
...
...
src/video_output/vout_control.h
View file @
11ac4b09
...
@@ -30,9 +30,6 @@
...
@@ -30,9 +30,6 @@
#ifndef _VOUT_CONTROL_H
#ifndef _VOUT_CONTROL_H
#define _VOUT_CONTROL_H 1
#define _VOUT_CONTROL_H 1
/* DO NOT use vout_CountPictureAvailable unless your are in src/input/decoder.c (no exception) */
int
vout_CountPictureAvailable
(
vout_thread_t
*
);
/**
/**
* This function will (un)pause the display of pictures.
* This function will (un)pause the display of pictures.
* It is thread safe
* It is thread safe
...
...
src/video_output/vout_pictures.c
View file @
11ac4b09
...
@@ -70,12 +70,6 @@ void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -70,12 +70,6 @@ void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
* It needs locking since several pictures can be created by several producers
* It needs locking since several pictures can be created by several producers
* threads.
* threads.
*/
*/
int
vout_CountPictureAvailable
(
vout_thread_t
*
p_vout
)
{
#warning "TODO remove vout_CountPictureAvailable"
return
VOUT_MAX_PICTURES
;
}
picture_t
*
vout_CreatePicture
(
vout_thread_t
*
p_vout
,
picture_t
*
vout_CreatePicture
(
vout_thread_t
*
p_vout
,
bool
b_progressive
,
bool
b_progressive
,
bool
b_top_field_first
,
bool
b_top_field_first
,
...
...
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