Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
131
Issues
131
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
4f3ccc26
Commit
4f3ccc26
authored
Jun 26, 2019
by
Ming Rui Zhang
Committed by
Sébastien Blin
Jun 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sipcall: fix the order of playbackqueue to make DTMF ring tone correct
Change-Id: Ib3755c563cb9928f25aee285510e367774d18389
parent
ff4a0ae3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
10 deletions
+6
-10
src/media/audio/audiolayer.cpp
src/media/audio/audiolayer.cpp
+6
-10
No files found.
src/media/audio/audiolayer.cpp
View file @
4f3ccc26
...
...
@@ -56,7 +56,7 @@ void AudioLayer::hardwareFormatAvailable(AudioFormat playback)
std
::
lock_guard
<
std
::
mutex
>
lock
(
mutex_
);
JAMI_DBG
(
"Hardware audio format available : %s"
,
playback
.
toString
().
c_str
());
audioFormat_
=
Manager
::
instance
().
hardwareAudioFormatChanged
(
playback
);
urgentRingBuffer_
.
setFormat
(
playback
);
urgentRingBuffer_
.
setFormat
(
audioFormat_
);
}
void
AudioLayer
::
hardwareInputFormatAvailable
(
AudioFormat
capture
)
...
...
@@ -142,13 +142,6 @@ AudioLayer::getToPlay(AudioFormat format, size_t writableSamples)
notifyIncomingCall
();
auto
&
bufferPool
=
Manager
::
instance
().
getRingBufferPool
();
if
(
auto
urgentSamples
=
urgentRingBuffer_
.
get
(
RingBufferPool
::
DEFAULT_ID
))
{
bufferPool
.
discard
(
1
,
RingBufferPool
::
DEFAULT_ID
);
return
urgentSamples
;
}
// flush remaining samples in _urgentRingBuffer
flushUrgent
();
if
(
not
playbackQueue_
)
playbackQueue_
.
reset
(
new
AudioFrameResizer
(
format
,
writableSamples
));
else
...
...
@@ -156,7 +149,10 @@ AudioLayer::getToPlay(AudioFormat format, size_t writableSamples)
std
::
shared_ptr
<
AudioFrame
>
playbackBuf
{};
while
(
!
(
playbackBuf
=
playbackQueue_
->
dequeue
()))
{
if
(
auto
toneToPlay
=
Manager
::
instance
().
getTelephoneTone
())
{
if
(
auto
urgentSamples
=
urgentRingBuffer_
.
get
(
RingBufferPool
::
DEFAULT_ID
))
{
bufferPool
.
discard
(
1
,
RingBufferPool
::
DEFAULT_ID
);
playbackQueue_
->
enqueue
(
std
::
move
(
urgentSamples
));
}
else
if
(
auto
toneToPlay
=
Manager
::
instance
().
getTelephoneTone
())
{
playbackQueue_
->
enqueue
(
resampler_
->
resample
(
toneToPlay
->
getNext
(),
format
));
}
else
if
(
auto
buf
=
bufferPool
.
getData
(
RingBufferPool
::
DEFAULT_ID
))
{
playbackQueue_
->
enqueue
(
resampler_
->
resample
(
std
::
move
(
buf
),
format
));
...
...
@@ -164,7 +160,7 @@ AudioLayer::getToPlay(AudioFormat format, size_t writableSamples)
break
;
}
}
return
playbackBuf
;
}
...
...
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