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
6b2744ef
Commit
6b2744ef
authored
6 years ago
by
Philippe Gorley
Committed by
Adrien Béraud
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
audio: play file audio locally when streaming
Change-Id: Ie6b0b0090c451db7f8df3f53dbbc45726bfe08f2
parent
c0766a6e
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/media/audio/audio_input.cpp
+3
-0
3 additions, 0 deletions
src/media/audio/audio_input.cpp
with
3 additions
and
0 deletions
src/media/audio/audio_input.cpp
+
3
−
0
View file @
6b2744ef
...
...
@@ -167,7 +167,10 @@ AudioInput::initFile(const std::string& path)
return
initDevice
(
""
);
}
fileBuf_
=
Manager
::
instance
().
getRingBufferPool
().
createRingBuffer
(
fileId_
);
// have file audio mixed into the call buffer so it gets sent to the peer
Manager
::
instance
().
getRingBufferPool
().
bindHalfDuplexOut
(
id_
,
fileId_
);
// have file audio mixed into the local buffer so it gets played
Manager
::
instance
().
getRingBufferPool
().
bindHalfDuplexOut
(
RingBufferPool
::
DEFAULT_ID
,
fileId_
);
decodingFile_
=
true
;
return
true
;
}
...
...
This diff is collapsed.
Click to expand it.
Philippe Gorley
@pgorley
mentioned in issue
#37 (closed)
·
6 years ago
mentioned in issue
#37 (closed)
mentioned in issue #37
Toggle commit list
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