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
liblinphone
Commits
c001a62e
Commit
c001a62e
authored
Jun 18, 2020
by
Sylvain Berfini
🐮
Browse files
Set correct direction on all media streams
parent
7c3d0b14
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
1 deletion
+21
-1
src/conference/session/audio-stream.cpp
src/conference/session/audio-stream.cpp
+7
-0
src/conference/session/video-stream.cpp
src/conference/session/video-stream.cpp
+1
-1
tester/call_video_tester.c
tester/call_video_tester.c
+13
-0
No files found.
src/conference/session/audio-stream.cpp
View file @
c001a62e
...
...
@@ -264,6 +264,13 @@ void MS2AudioStream::render(const OfferAnswerContext ¶ms, CallSession::State
getMediaSessionPrivate
().
getCurrentParams
()
->
getPrivate
()
->
setUsedAudioCodec
(
rtp_profile_get_payload
(
audioProfile
,
usedPt
));
}
if
(
stream
->
dir
==
SalStreamSendOnly
)
media_stream_set_direction
(
&
mStream
->
ms
,
MediaStreamSendOnly
);
else
if
(
stream
->
dir
==
SalStreamRecvOnly
)
media_stream_set_direction
(
&
mStream
->
ms
,
MediaStreamRecvOnly
);
else
if
(
stream
->
dir
==
SalStreamSendRecv
)
media_stream_set_direction
(
&
mStream
->
ms
,
MediaStreamSendRecv
);
AudioDevice
*
audioDevice
=
getMediaSessionPrivate
().
getCurrentOutputAudioDevice
();
MSSndCard
*
playcard
=
nullptr
;
...
...
src/conference/session/video-stream.cpp
View file @
c001a62e
...
...
@@ -262,7 +262,7 @@ void MS2VideoStream::render(const OfferAnswerContext & ctx, CallSession::State t
MS2VideoMixer
*
videoMixer
=
getVideoMixer
();
getMediaSession
().
getLog
()
->
video_enabled
=
true
;
video
_stream_set_direction
(
mStream
,
dir
);
media
_stream_set_direction
(
&
mStream
->
ms
,
dir
);
lInfo
()
<<
"Device rotation ="
<<
getCCore
()
->
device_rotation
;
video_stream_set_device_rotation
(
mStream
,
getCCore
()
->
device_rotation
);
video_stream_set_freeze_on_error
(
mStream
,
!!
lp_config_get_int
(
linphone_core_get_config
(
getCCore
()),
"video"
,
"freeze_on_error"
,
1
));
...
...
tester/call_video_tester.c
View file @
c001a62e
...
...
@@ -1322,6 +1322,7 @@ static void accept_call_in_send_only_base(LinphoneCoreManager* pauline, Linphone
LinphoneCall
*
call
;
pol
.
automatically_accept
=
1
;
pol
.
automatically_initiate
=
1
;
int
dummy
=
0
;
// important: VP8 has really poor performances with the mire camera, at least
// on iOS - so when ever h264 is available, let's use it instead
...
...
@@ -1364,12 +1365,24 @@ static void accept_call_in_send_only_base(LinphoneCoreManager* pauline, Linphone
BC_ASSERT_TRUE
(
wait_for_list
(
lcs
,
&
pauline
->
stat
.
number_of_LinphoneCallPausedByRemote
,
1
,
DEFAULT_WAIT_FOR
));
check_media_direction
(
marie
,
call
,
lcs
,
LinphoneMediaDirectionSendOnly
,
LinphoneMediaDirectionSendOnly
);
float
quality
=
linphone_call_get_current_quality
(
call
);
BC_ASSERT_GREATER
(
quality
,
1
.
0
,
float
,
"%f"
);
wait_for_until
(
marie
->
lc
,
pauline
->
lc
,
&
dummy
,
1
,
3000
);
quality
=
linphone_call_get_current_quality
(
call
);
BC_ASSERT_GREATER
(
quality
,
1
.
0
,
float
,
"%f"
);
}
call
=
linphone_core_get_current_call
(
pauline
->
lc
);
if
(
call
)
{
check_media_direction
(
pauline
,
call
,
lcs
,
LinphoneMediaDirectionRecvOnly
,
LinphoneMediaDirectionRecvOnly
);
float
quality
=
linphone_call_get_current_quality
(
call
);
BC_ASSERT_GREATER
(
quality
,
1
.
0
,
float
,
"%f"
);
wait_for_until
(
marie
->
lc
,
pauline
->
lc
,
&
dummy
,
1
,
3000
);
quality
=
linphone_call_get_current_quality
(
call
);
BC_ASSERT_GREATER
(
quality
,
1
.
0
,
float
,
"%f"
);
}
}
...
...
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