Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
4f86fc54
Commit
4f86fc54
authored
13 years ago
by
Rafaël Carré
Browse files
Options
Downloads
Patches
Plain Diff
AudioRtpRecordHandler::initNoiseSuppress() : use noiseSuppress directly
parent
90d9c09c
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
+1
-5
1 addition, 5 deletions
daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
daemon/src/audio/audiortp/AudioRtpRecordHandler.h
+0
-1
0 additions, 1 deletion
daemon/src/audio/audiortp/AudioRtpRecordHandler.h
with
1 addition
and
6 deletions
daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
+
1
−
5
View file @
4f86fc54
...
@@ -46,7 +46,6 @@ AudioRtpRecord::AudioRtpRecord () : _audioCodec (NULL)
...
@@ -46,7 +46,6 @@ AudioRtpRecord::AudioRtpRecord () : _audioCodec (NULL)
,
_codecSampleRate
(
0
)
,
_codecSampleRate
(
0
)
,
_codecFrameSize
(
0
)
,
_codecFrameSize
(
0
)
,
_micAmplFactor
(
initFadeinFactor
)
,
_micAmplFactor
(
initFadeinFactor
)
,
_audioProcess
(
NULL
)
,
_noiseSuppress
(
NULL
)
,
_noiseSuppress
(
NULL
)
,
_callId
(
""
)
,
_callId
(
""
)
,
_dtmfPayloadType
(
101
)
// same as Asterisk
,
_dtmfPayloadType
(
101
)
// same as Asterisk
...
@@ -59,7 +58,6 @@ AudioRtpRecord::~AudioRtpRecord()
...
@@ -59,7 +58,6 @@ AudioRtpRecord::~AudioRtpRecord()
{
{
delete
_converter
;
delete
_converter
;
delete
_audioCodec
;
delete
_audioCodec
;
delete
_audioProcess
;
delete
_noiseSuppress
;
delete
_noiseSuppress
;
}
}
...
@@ -103,11 +101,9 @@ void AudioRtpRecordHandler::initNoiseSuppress()
...
@@ -103,11 +101,9 @@ void AudioRtpRecordHandler::initNoiseSuppress()
{
{
_audioRtpRecord
.
audioProcessMutex
.
enter
();
_audioRtpRecord
.
audioProcessMutex
.
enter
();
delete
_audioRtpRecord
.
_audioProcess
;
delete
_audioRtpRecord
.
_noiseSuppress
;
delete
_audioRtpRecord
.
_noiseSuppress
;
_audioRtpRecord
.
_noiseSuppress
=
new
NoiseSuppress
(
getCodecFrameSize
(),
getCodecSampleRate
());
_audioRtpRecord
.
_noiseSuppress
=
new
NoiseSuppress
(
getCodecFrameSize
(),
getCodecSampleRate
());
_audioRtpRecord
.
_audioProcess
=
new
AudioProcessing
(
_audioRtpRecord
.
_noiseSuppress
);
_audioRtpRecord
.
audioProcessMutex
.
leave
();
_audioRtpRecord
.
audioProcessMutex
.
leave
();
}
}
...
@@ -153,7 +149,7 @@ int AudioRtpRecordHandler::processDataEncode (void)
...
@@ -153,7 +149,7 @@ int AudioRtpRecordHandler::processDataEncode (void)
_audioRtpRecord
.
audioProcessMutex
.
enter
();
_audioRtpRecord
.
audioProcessMutex
.
enter
();
if
(
Manager
::
instance
().
audioPreference
.
getNoiseReduce
())
if
(
Manager
::
instance
().
audioPreference
.
getNoiseReduce
())
_audioRtpRecord
.
_
audioProc
ess
->
process
Audio
(
micData
,
bytesToGet
);
_audioRtpRecord
.
_
noiseSuppr
ess
->
process
(
micData
,
bytesToGet
);
_audioRtpRecord
.
audioProcessMutex
.
leave
();
_audioRtpRecord
.
audioProcessMutex
.
leave
();
#ifdef DUMP_PROCESS_DATA_ENCODE
#ifdef DUMP_PROCESS_DATA_ENCODE
...
...
This diff is collapsed.
Click to expand it.
daemon/src/audio/audiortp/AudioRtpRecordHandler.h
+
0
−
1
View file @
4f86fc54
...
@@ -95,7 +95,6 @@ class AudioRtpRecord
...
@@ -95,7 +95,6 @@ class AudioRtpRecord
int
_converterSamplingRate
;
int
_converterSamplingRate
;
std
::
list
<
int
>
_dtmfQueue
;
std
::
list
<
int
>
_dtmfQueue
;
SFLDataFormat
_micAmplFactor
;
SFLDataFormat
_micAmplFactor
;
AudioProcessing
*
_audioProcess
;
NoiseSuppress
*
_noiseSuppress
;
NoiseSuppress
*
_noiseSuppress
;
ost
::
Mutex
audioProcessMutex
;
ost
::
Mutex
audioProcessMutex
;
std
::
string
_callId
;
std
::
string
_callId
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment