MT#55283 fix ssrc_in non-null dependency logic

Change-Id: I47f5ba681f0911961f27bb2fd9f9a4f887ba538c
Warned-by: Coverity
(cherry picked from commit 44722edaf6)
(cherry picked from commit e96bd06b14)
mr26.3.1
Richard Fuchs 3 weeks ago
parent c1c6579995
commit 34d480e397

@ -3049,11 +3049,11 @@ static void media_packet_rtp_out(struct packet_handler_ctx *phc, struct sink_han
const char *unkern = NULL;
uint32_t fixed_ssrc = phc->mp.media_out->fixed_egress_ssrc;
uint32_t fixed_ssrc = phc->mp.ssrc_in ? phc->mp.media_out->fixed_egress_ssrc : 0;
/* A fixed egress SSRC is just a mapping from the ingress SSRC, so record it
* where every consumer already looks for one. */
if (fixed_ssrc && phc->mp.ssrc_in)
if (fixed_ssrc)
phc->mp.ssrc_in->ssrc_map_out = fixed_ssrc;
if (G_LIKELY(!phc->rtcp && phc->mp.rtp)) {
@ -3063,7 +3063,7 @@ static void media_packet_rtp_out(struct packet_handler_ctx *phc, struct sink_han
/* a fixed egress SSRC outlives the ingress SSRC, so carry the
* sequence numbering across a change of source */
if (fixed_ssrc && phc->mp.ssrc_out) {
if (fixed_ssrc) {
struct ssrc_entry_call *so = phc->mp.ssrc_out;
uint32_t in_ssrc = ntohl(phc->mp.rtp->ssrc);
uint16_t seq = ntohs(phc->mp.rtp->seq_num);

Loading…
Cancel
Save