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
278cca2e
Commit
278cca2e
authored
Dec 20, 2012
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opensles: no need to count number of busy buffers
We can access it with GetState
parent
b8cef162
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
7 deletions
+2
-7
modules/audio_output/opensles_android.c
modules/audio_output/opensles_android.c
+2
-7
No files found.
modules/audio_output/opensles_android.c
View file @
278cca2e
...
...
@@ -83,8 +83,6 @@ struct aout_sys_t
vlc_mutex_t
lock
;
mtime_t
length
;
int
buffers
;
/* audio buffered through opensles */
block_t
*
p_chain
;
block_t
**
pp_last
;
...
...
@@ -143,7 +141,6 @@ static void Flush(audio_output_t *aout, bool drain)
SetPlayState
(
sys
->
playerPlay
,
SL_PLAYSTATE_PLAYING
);
sys
->
length
=
0
;
sys
->
buffers
=
0
;
/* release audio data not yet written to opensles */
block_ChainRelease
(
sys
->
p_buffer_chain
);
...
...
@@ -242,14 +239,13 @@ static int WriteBuffer(audio_output_t *aout)
if
(
r
==
SL_RESULT_SUCCESS
)
{
/* Remove that block from the list of audio not yet written */
sys
->
buffers
++
;
sys
->
p_buffer_chain
=
next
;
if
(
!
sys
->
p_buffer_chain
)
sys
->
pp_buffer_last
=
&
sys
->
p_buffer_chain
;
}
else
{
/* Remove that block from the list of audio already written */
msg_Err
(
aout
,
"error %lu when writing %d bytes
, %d/255 buffers occupied
%s"
,
r
,
b
->
i_buffer
,
sys
->
buffers
,
msg_Err
(
aout
,
"error %lu when writing %d bytes %s"
,
r
,
b
->
i_buffer
,
(
r
==
SL_RESULT_BUFFER_INSUFFICIENT
)
?
" (buffer insufficient)"
:
""
);
sys
->
pp_last
=
pp_last_saved
;
...
...
@@ -289,7 +285,6 @@ static void PlayedCallback (SLAndroidSimpleBufferQueueItf caller, void *pContext
assert
(
caller
==
sys
->
playerBufferQueue
);
vlc_mutex_lock
(
&
sys
->
lock
);
sys
->
buffers
--
;
p_block
=
sys
->
p_chain
;
assert
(
p_block
);
...
...
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