From e8aac8272c0d9eb04a730b51d5a170197861e7b6 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 31 Aug 2020 14:26:34 -0400 Subject: [PATCH] TT#91003 add media_out pointer to media_packet Change-Id: I21c76fef05d6af394f09476e9761c439e7a0da44 --- daemon/dtmf.c | 1 + daemon/media_player.c | 1 + daemon/media_socket.c | 2 ++ include/media_socket.h | 1 + 4 files changed, 5 insertions(+) diff --git a/daemon/dtmf.c b/daemon/dtmf.c index dec881a8a..0fde9bae1 100644 --- a/daemon/dtmf.c +++ b/daemon/dtmf.c @@ -216,6 +216,7 @@ static const char *dtmf_inject_pcm(struct call_media *media, struct call_monolog .tv = rtpe_now, .call = call, .media = media, + .media_out = media, .rtp = &rtp, .ssrc_in = ssrc_in, .ssrc_out = ssrc_out, diff --git a/daemon/media_player.c b/daemon/media_player.c index 82e9475b3..3e4b30794 100644 --- a/daemon/media_player.c +++ b/daemon/media_player.c @@ -377,6 +377,7 @@ void media_player_add_packet(struct media_player *mp, char *buf, size_t len, .tv = rtpe_now, .call = mp->call, .media = mp->media, + .media_out = mp->media, .rtp = &rtp, .ssrc_out = mp->ssrc_out, }; diff --git a/daemon/media_socket.c b/daemon/media_socket.c index 02ae2483c..b1ab083e1 100644 --- a/daemon/media_socket.c +++ b/daemon/media_socket.c @@ -1454,6 +1454,8 @@ static void media_packet_rtcp_demux(struct packet_handler_ctx *phc) phc->out_srtp = phc->sink; if (phc->rtcp && phc->sink && phc->sink->rtcp_sibling) phc->out_srtp = phc->sink->rtcp_sibling; // use RTCP SRTP context + + phc->mp.media_out = phc->sink->media; } diff --git a/include/media_socket.h b/include/media_socket.h index 19b5c3a58..fc3873b2f 100644 --- a/include/media_socket.h +++ b/include/media_socket.h @@ -131,6 +131,7 @@ struct media_packet { struct call *call; // sfd->call struct packet_stream *stream; // sfd->stream struct call_media *media; // stream->media + struct call_media *media_out; // output media struct rtp_header *rtp; struct rtcp_packet *rtcp;