moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2025-08-17 17:05:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SDP generator bugs based on testing within the test harness

Browse Source
This commit is contained in:
Cameron Gutman 2014-06-28 23:54:50 -07:00
parent c1d273c22f
commit c5491ef928
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
limelight-common/Limelight-internal.h
View File

@ -6,6 +6,8 @@
#include "PlatformThreads.h" #include "PlatformThreads.h"
#include "Video.h" #include "Video.h"
char* getSdpPayloadForStreamConfig(PSTREAM_CONFIGURATION streamConfig, struct in_addr targetAddress, int *length);
int initializeControlStream(IP_ADDRESS host, PSTREAM_CONFIGURATION streamConfig, PCONNECTION_LISTENER_CALLBACKS clCallbacks); int initializeControlStream(IP_ADDRESS host, PSTREAM_CONFIGURATION streamConfig, PCONNECTION_LISTENER_CALLBACKS clCallbacks);
int startControlStream(void); int startControlStream(void);
int stopControlStream(void); int stopControlStream(void);

7
limelight-common/SdpGenerator.c
View File

@ -117,6 +117,7 @@ static int addAttributeBinary(PSDP_OPTION *head, char* name, const void* payload
return -1; return -1;
} }
option->next = NULL;
option->payloadLen = payloadLen; option->payloadLen = payloadLen;
strcpy(option->name, name); strcpy(option->name, name);
option->payload = (void*)(option + 1); option->payload = (void*)(option + 1);
@ -150,6 +151,7 @@ static PSDP_OPTION getAttributesList(PSTREAM_CONFIGURATION streamConfig, struct
optionHead = NULL; optionHead = NULL;
err = 0;
err |= addAttributeBinary(&optionHead, "x-nv-callbacks", err |= addAttributeBinary(&optionHead, "x-nv-callbacks",
ATTRIB_X_NV_CALLBACKS, sizeof(ATTRIB_X_NV_CALLBACKS)); ATTRIB_X_NV_CALLBACKS, sizeof(ATTRIB_X_NV_CALLBACKS));
err |= addAttributeBinary(&optionHead, "x-nv-videoDecoder", err |= addAttributeBinary(&optionHead, "x-nv-videoDecoder",
@ -335,14 +337,14 @@ ExitFailure:
return NULL; return NULL;
} }
int fillSdpHeader(char* buffer, struct in_addr targetAddress) { static int fillSdpHeader(char* buffer, struct in_addr targetAddress) {
return sprintf(buffer, return sprintf(buffer,
"v=0\r\n" "v=0\r\n"
"o=android 0 9 IN IPv4 %s\r\n" "o=android 0 9 IN IPv4 %s\r\n"
"s=NVIDIA Streaming Client\r\n", inet_ntoa(targetAddress)); "s=NVIDIA Streaming Client\r\n", inet_ntoa(targetAddress));
} }
int fillSdpTail(char* buffer) { static int fillSdpTail(char* buffer) {
return sprintf(buffer, return sprintf(buffer,
"t=0 0\r\n" "t=0 0\r\n"
"m=video 47996 \r\n"); "m=video 47996 \r\n");
@ -369,6 +371,7 @@ char* getSdpPayloadForStreamConfig(PSTREAM_CONFIGURATION streamConfig, struct in
offset += fillSerializedAttributeList(&payload[offset], attributeList); offset += fillSerializedAttributeList(&payload[offset], attributeList);
offset += fillSdpTail(&payload[offset]); offset += fillSdpTail(&payload[offset]);
freeAttributeList(attributeList);
*length = offset; *length = offset;
return payload; return payload;
} }