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
31888963
Commit
31888963
authored
Mar 17, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
block: remove block_FifoWake()
parent
cb925bf2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
15 deletions
+1
-15
include/vlc_block.h
include/vlc_block.h
+0
-1
src/libvlccore.sym
src/libvlccore.sym
+0
-1
src/misc/fifo.c
src/misc/fifo.c
+1
-13
No files found.
include/vlc_block.h
View file @
31888963
...
...
@@ -314,7 +314,6 @@ VLC_API void block_FifoRelease( block_fifo_t * );
VLC_API
void
block_FifoPace
(
block_fifo_t
*
fifo
,
size_t
max_depth
,
size_t
max_size
);
VLC_API
void
block_FifoEmpty
(
block_fifo_t
*
);
VLC_API
void
block_FifoPut
(
block_fifo_t
*
,
block_t
*
);
VLC_API
void
block_FifoWake
(
block_fifo_t
*
);
VLC_API
block_t
*
block_FifoGet
(
block_fifo_t
*
)
VLC_USED
;
VLC_API
block_t
*
block_FifoShow
(
block_fifo_t
*
);
size_t
block_FifoSize
(
block_fifo_t
*
)
VLC_USED
;
...
...
src/libvlccore.sym
View file @
31888963
...
...
@@ -31,7 +31,6 @@ block_FifoPace
block_FifoPut
block_FifoRelease
block_FifoShow
block_FifoWake
block_File
block_FilePath
block_heap_Alloc
...
...
src/misc/fifo.c
View file @
31888963
...
...
@@ -49,7 +49,6 @@ struct block_fifo_t
block_t
**
pp_last
;
size_t
i_depth
;
size_t
i_size
;
bool
b_force_wake
;
};
/**
...
...
@@ -258,7 +257,6 @@ block_fifo_t *block_FifoNew( void )
p_fifo
->
p_first
=
NULL
;
p_fifo
->
pp_last
=
&
p_fifo
->
p_first
;
p_fifo
->
i_depth
=
p_fifo
->
i_size
=
0
;
p_fifo
->
b_force_wake
=
false
;
return
p_fifo
;
}
...
...
@@ -332,15 +330,6 @@ void block_FifoPut(block_fifo_t *fifo, block_t *block)
vlc_fifo_Unlock
(
fifo
);
}
void
block_FifoWake
(
block_fifo_t
*
p_fifo
)
{
vlc_mutex_lock
(
&
p_fifo
->
lock
);
if
(
p_fifo
->
p_first
==
NULL
)
p_fifo
->
b_force_wake
=
true
;
vlc_cond_broadcast
(
&
p_fifo
->
wait
);
vlc_mutex_unlock
(
&
p_fifo
->
lock
);
}
/**
* Dequeue the first block from the FIFO. If necessary, wait until there is
* one block in the queue. This function is (always) cancellation point.
...
...
@@ -354,13 +343,12 @@ block_t *block_FifoGet(block_fifo_t *fifo)
vlc_testcancel
();
vlc_fifo_Lock
(
fifo
);
while
(
vlc_fifo_IsEmpty
(
fifo
)
&&
!
fifo
->
b_force_wake
)
while
(
vlc_fifo_IsEmpty
(
fifo
))
{
vlc_fifo_CleanupPush
(
fifo
);
vlc_fifo_Wait
(
fifo
);
vlc_cleanup_pop
();
}
fifo
->
b_force_wake
=
false
;
block
=
vlc_fifo_DequeueUnlocked
(
fifo
);
vlc_fifo_Unlock
(
fifo
);
...
...
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