scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-20 22:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

RTSP: compatible with current UltraGrid

Browse Source 
+ note about older version which is needed for live555
This commit is contained in:
Martin Pulec
2017-05-18 18:10:34 +02:00
parent ea3ad52755
commit ea1971c116
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rtsp/BasicRTSPOnlySubsession.cpp
View File

@@ -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);

6
src/video_rxtx/h264_rtp.cpp
View File

@@ -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"