From ea1971c116dddee7a7cffe014c9a6d98f8d969fd Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 18 May 2017 18:10:34 +0200 Subject: [PATCH] RTSP: compatible with current UltraGrid + note about older version which is needed for live555 --- src/rtsp/BasicRTSPOnlySubsession.cpp | 8 ++++---- src/video_rxtx/h264_rtp.cpp | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/rtsp/BasicRTSPOnlySubsession.cpp b/src/rtsp/BasicRTSPOnlySubsession.cpp index ec755ae76..88fdb0739 100644 --- a/src/rtsp/BasicRTSPOnlySubsession.cpp +++ b/src/rtsp/BasicRTSPOnlySubsession.cpp @@ -240,7 +240,7 @@ void BasicRTSPOnlySubsession::startStream(unsigned /* clientSessionId */, //CHANGE DST PORT struct msg_sender *msgV1 = (struct msg_sender *) new_message( sizeof(struct msg_sender)); - msgV1->port = ntohs(Vdestination->rtpPort.num()); + msgV1->tx_port = ntohs(Vdestination->rtpPort.num()); msgV1->type = SENDER_MSG_CHANGE_PORT; resp = send_message(fmod, pathV, (struct message *) msgV1); resp = NULL; @@ -269,7 +269,7 @@ void BasicRTSPOnlySubsession::startStream(unsigned /* clientSessionId */, //CHANGE DST PORT struct msg_sender *msgA1 = (struct msg_sender *) new_message( sizeof(struct msg_sender)); - msgA1->port = ntohs(Adestination->rtpPort.num()); + msgA1->tx_port = ntohs(Adestination->rtpPort.num()); msgA1->type = SENDER_MSG_CHANGE_PORT; resp = send_message(fmod, pathA, (struct message *) msgA1); resp = NULL; @@ -301,7 +301,7 @@ void BasicRTSPOnlySubsession::deleteStream(unsigned /* clientSessionId */, //CHANGE DST PORT struct msg_sender *msgV1 = (struct msg_sender *) new_message( sizeof(struct msg_sender)); - msgV1->port = rtp_port; + msgV1->tx_port = rtp_port; msgV1->type = SENDER_MSG_CHANGE_PORT; struct response *resp; resp = send_message(fmod, pathV, (struct message *) msgV1); @@ -331,7 +331,7 @@ void BasicRTSPOnlySubsession::deleteStream(unsigned /* clientSessionId */, sizeof(struct msg_sender)); //TODO: GET AUDIO PORT SET (NOT A COMMON CASE WHEN RTSP IS ENABLED: DEFAULT -> vport + 2) - msgA1->port = rtp_port_audio; + msgA1->tx_port = rtp_port_audio; msgA1->type = SENDER_MSG_CHANGE_PORT; struct response *resp; resp = send_message(fmod, pathA, (struct message *) msgA1); diff --git a/src/video_rxtx/h264_rtp.cpp b/src/video_rxtx/h264_rtp.cpp index f32489aed..16e5f818d 100644 --- a/src/video_rxtx/h264_rtp.cpp +++ b/src/video_rxtx/h264_rtp.cpp @@ -38,6 +38,12 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/** + * @note + * Currently incompatible with upstream version of live555. Works with older + * version from https://github.com/xanview/live555/, commit 35c375 (live555 + * version from 7th Aug 2015). + */ #ifdef HAVE_CONFIG_H #include "config.h"