Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
a99d6b0d
Commit
a99d6b0d
authored
May 22, 2014
by
Simon Morlat
Browse files
fix bad handling of audio rate in audio conference when opus codec is used on android.
parent
b6ad773d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
include/mediastreamer2/msfilter.h
include/mediastreamer2/msfilter.h
+1
-1
src/voip/audioconference.c
src/voip/audioconference.c
+3
-1
No files found.
include/mediastreamer2/msfilter.h
View file @
a99d6b0d
...
...
@@ -431,7 +431,7 @@ MS2_PUBLIC int ms_filter_call_method_noarg(MSFilter *f, unsigned int id);
* @param f A MSFilter object.
* @param id A method ID.
*
* Returns:
0 if successfull, -1
otherwise.
* Returns:
TRUE if method is implemented, FALSE
otherwise.
*/
MS2_PUBLIC
bool_t
ms_filter_has_method
(
MSFilter
*
f
,
unsigned
int
id
);
...
...
src/voip/audioconference.c
View file @
a99d6b0d
...
...
@@ -103,7 +103,9 @@ static void cut_audio_stream_graph(MSAudioEndpoint *ep, bool_t is_remote){
ep
->
out_cut_point
=
just_before
(
st
->
ms
.
encoder
);
ms_filter_unlink
(
ep
->
out_cut_point
.
filter
,
ep
->
out_cut_point
.
pin
,
st
->
ms
.
encoder
,
0
);
ms_filter_call_method
(
st
->
ms
.
rtpsend
,
MS_FILTER_GET_SAMPLE_RATE
,
&
ep
->
samplerate
);
if
(
ms_filter_has_method
(
st
->
ms
.
encoder
,
MS_FILTER_GET_SAMPLE_RATE
)){
ms_filter_call_method
(
st
->
ms
.
encoder
,
MS_FILTER_GET_SAMPLE_RATE
,
&
ep
->
samplerate
);
}
else
ms_warning
(
"MSAudioConference: filter %s does not implement MS_FILTER_GET_SAMPLE_RATE, assuming 8khz"
,
st
->
ms
.
encoder
->
desc
->
name
);
if
(
is_remote
){
ep
->
mixer_in
.
filter
=
ep
->
in_cut_point_prev
.
filter
;
...
...
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