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

current live555 compat

Browse Source
This commit is contained in:
Martin Pulec
2024-01-10 08:27:25 +01:00
parent f7dd228b0f
commit 8adb8f2c50
4 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/rtsp/BasicRTSPOnlySubsession.cpp
View File

@@ -87,7 +87,8 @@ BasicRTSPOnlySubsession::~BasicRTSPOnlySubsession() {
delete Vdestination;
}
char const* BasicRTSPOnlySubsession::sdpLines() {
char const* BasicRTSPOnlySubsession::sdpLines(int addressFamily) {
(void) addressFamily;
if (fSDPLines == NULL) {
setSDPLines();
}
@@ -101,7 +102,7 @@ void BasicRTSPOnlySubsession::setSDPLines() {
unsigned estBitrate = 5000;
char const* mediaType = "video";
uint8_t rtpPayloadType = 96;
AddressString ipAddressStr(fServerAddressForSDP);
AddressString ipAddressStr(0);
char* rtpmapLine = strdup("a=rtpmap:96 H264/90000\n");
//char const* auxSDPLine = "";
@@ -133,7 +134,7 @@ void BasicRTSPOnlySubsession::setSDPLines() {
if (avType == audio || avType == av) {
unsigned estBitrate = 384;
char const* mediaType = "audio";
AddressString ipAddressStr(fServerAddressForSDP);
AddressString ipAddressStr(0);
char rtpmapLine[STR_LEN];
//char const* auxSDPLine = "";
@@ -167,10 +168,11 @@ void BasicRTSPOnlySubsession::setSDPLines() {
}
void BasicRTSPOnlySubsession::getStreamParameters(unsigned /* clientSessionId */,
netAddressBits clientAddress, Port const& clientRTPPort,
struct sockaddr_storage const &clientAddress, Port const& clientRTPPort,
Port const& clientRTCPPort, int /* tcpSocketNum */,
unsigned char /* rtpChannelId */, unsigned char /* rtcpChannelId */,
netAddressBits& destinationAddress, uint8_t& /*destinationTTL*/,
TLSState * /* tlsState */,
struct sockaddr_storage& /*destinationAddress*/, uint8_t& /*destinationTTL*/,
Boolean& /* isMulticast */, Port& serverRTPPort, Port& serverRTCPPort,
void*& /* streamToken */) {
if (avType == video || avType == av) {
@@ -182,11 +184,9 @@ void BasicRTSPOnlySubsession::getStreamParameters(unsigned /* clientSessionId */
if (fSDPLines == NULL) {
setSDPLines();
}
if (destinationAddress == 0) {
destinationAddress = clientAddress;
}
struct in_addr destinationAddr;
destinationAddr.s_addr = destinationAddress;
destinationAddr.s_addr =
((const sockaddr_in *) &clientAddress)->sin_addr.s_addr;
delete Vdestination;
Vdestination = new Destinations(destinationAddr, clientRTPPort,
clientRTCPPort);
@@ -200,11 +200,9 @@ void BasicRTSPOnlySubsession::getStreamParameters(unsigned /* clientSessionId */
if (fSDPLines == NULL) {
setSDPLines();
}
if (destinationAddress == 0) {
destinationAddress = clientAddress;
}
struct in_addr destinationAddr;
destinationAddr.s_addr = destinationAddress;
destinationAddr.s_addr =
((const sockaddr_in *) &clientAddress)->sin_addr.s_addr;
delete Adestination;
Adestination = new Destinations(destinationAddr, clientRTPPort,
clientRTCPPort);