Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
0c721afd
Commit
0c721afd
authored
Sep 11, 2013
by
Alexandre Lision
Browse files
* #29866: fixed deallocation of recorder
parent
9308e26d
Changes
2
Hide whitespace changes
Inline
Side-by-side
daemon/src/audio/opensl/opensllayer.cpp
View file @
0c721afd
...
...
@@ -147,8 +147,8 @@ OpenSLLayer::OpenSLLayer()
,
recorderBufferQueue_
(
0
)
,
playbackBufferIndex_
(
0
)
,
recordBufferIndex_
(
0
)
,
playbackBufferStack_
(
ANDROID_BUFFER_QUEUE_LENGTH
,
AudioBuffer
(
3000
))
,
recordBufferStack_
(
ANDROID_BUFFER_QUEUE_LENGTH
,
AudioBuffer
(
3000
))
,
playbackBufferStack_
(
ANDROID_BUFFER_QUEUE_LENGTH
,
AudioBuffer
(
BUFFER_SIZE
))
,
recordBufferStack_
(
ANDROID_BUFFER_QUEUE_LENGTH
,
AudioBuffer
(
BUFFER_SIZE
))
{
}
...
...
@@ -257,9 +257,15 @@ OpenSLLayer::shutdownAudioEngine()
outputMixer_
=
NULL
;
}
if
(
recorderObject_
!=
NULL
){
(
*
recorderObject_
)
->
Destroy
(
recorderObject_
);
recorderObject_
=
NULL
;
recorderInterface_
=
NULL
;
recorderBufferQueue_
=
NULL
;
}
// destroy engine object, and invalidate all associated interfaces
DEBUG
(
"Shutdown audio engine
\n
"
);
if
(
engineObject_
!=
NULL
)
{
(
*
engineObject_
)
->
Destroy
(
engineObject_
);
engineObject_
=
NULL
;
...
...
daemon/src/audio/opensl/opensllayer.h
View file @
0c721afd
...
...
@@ -36,6 +36,7 @@
#include
<vector>
#include
"../audiolayer.h"
#include
"logger.h"
enum
PCMType
{
...
...
@@ -52,6 +53,7 @@ class AudioPreference;
class
OpenSLThread
;
#define ANDROID_BUFFER_QUEUE_LENGTH 2
#define BUFFER_SIZE 5000
/**
...
...
@@ -238,9 +240,7 @@ class OpenSLLayer : public AudioLayer {
* Output mix interface
*/
SLObjectItf
outputMixer_
;
SLObjectItf
playerObject_
;
SLObjectItf
recorderObject_
;
/**
...
...
Write
Preview
Supports
Markdown
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