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
0ef0ad68
Commit
0ef0ad68
authored
May 14, 2014
by
Ghislain MARY
Browse files
Fix inversed ssrc tests for RTCP PSFB packets.
parent
43da5cdd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
src/voip/videostream.c
src/voip/videostream.c
+4
-4
No files found.
src/voip/videostream.c
View file @
0ef0ad68
...
...
@@ -90,12 +90,12 @@ static void video_stream_process_rtcp(MediaStream *media_stream, mblk_t *m){
}
else
if
(
rtcp_is_PSFB
(
m
))
{
if
(
rtcp_PSFB_get_type
(
m
)
==
RTCP_PSFB_FIR
)
{
/* Special case for FIR where the packet sender ssrc must be equal to 0. */
if
((
rtcp_PSFB_get_media_source_ssrc
(
m
)
==
rtp_session_get_
recv
_ssrc
(
stream
->
ms
.
sessions
.
rtp_session
))
if
((
rtcp_PSFB_get_media_source_ssrc
(
m
)
==
rtp_session_get_
send
_ssrc
(
stream
->
ms
.
sessions
.
rtp_session
))
&&
(
rtcp_PSFB_get_packet_sender_ssrc
(
m
)
==
0
))
{
for
(
i
=
0
;
;
i
++
)
{
rtcp_fb_fir_fci_t
*
fci
=
rtcp_PSFB_fir_get_fci
(
m
,
i
);
if
(
fci
==
NULL
)
break
;
if
(
rtcp_fb_fir_fci_get_ssrc
(
fci
)
==
rtp_session_get_
send
_ssrc
(
stream
->
ms
.
sessions
.
rtp_session
))
{
if
(
rtcp_fb_fir_fci_get_ssrc
(
fci
)
==
rtp_session_get_
recv
_ssrc
(
stream
->
ms
.
sessions
.
rtp_session
))
{
uint8_t
seq_nr
=
rtcp_fb_fir_fci_get_seq_nr
(
fci
);
ms_filter_call_method
(
stream
->
ms
.
encoder
,
MS_VIDEO_ENCODER_NOTIFY_FIR
,
&
seq_nr
);
break
;
...
...
@@ -103,8 +103,8 @@ static void video_stream_process_rtcp(MediaStream *media_stream, mblk_t *m){
}
}
}
else
{
if
((
rtcp_PSFB_get_media_source_ssrc
(
m
)
==
rtp_session_get_
recv
_ssrc
(
stream
->
ms
.
sessions
.
rtp_session
))
&&
(
rtcp_PSFB_get_packet_sender_ssrc
(
m
)
==
rtp_session_get_
send
_ssrc
(
stream
->
ms
.
sessions
.
rtp_session
)))
{
if
((
rtcp_PSFB_get_media_source_ssrc
(
m
)
==
rtp_session_get_
send
_ssrc
(
stream
->
ms
.
sessions
.
rtp_session
))
&&
(
rtcp_PSFB_get_packet_sender_ssrc
(
m
)
==
rtp_session_get_
recv
_ssrc
(
stream
->
ms
.
sessions
.
rtp_session
)))
{
switch
(
rtcp_PSFB_get_type
(
m
))
{
case
RTCP_PSFB_PLI
:
ms_filter_call_method_noarg
(
stream
->
ms
.
encoder
,
MS_VIDEO_ENCODER_NOTIFY_PLI
);
...
...
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