jyapayne/moonlight-common-c
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix streaming from Gen 3 servers

Browse source
This commit is contained in:
Cameron Gutman 2019-07-05 21:01:14 -07:00
commit 6245934462
1 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/SdpGenerator.c
View file

@ -271,6 +271,15 @@ static PSDP_OPTION getAttributesList(char*urlSafeAddr) {
err |= addGen5Options(&optionHead); err |= addGen5Options(&optionHead);
} }
if (StreamConfig.audioConfiguration == AUDIO_CONFIGURATION_51_SURROUND) {
audioChannelCount = CHANNEL_COUNT_51_SURROUND;
audioChannelMask = CHANNEL_MASK_51_SURROUND;
}
else {
audioChannelCount = CHANNEL_COUNT_STEREO;
audioChannelMask = CHANNEL_MASK_STEREO;
}
if (AppVersionQuad[0] >= 4) { if (AppVersionQuad[0] >= 4) {
unsigned char slicesPerFrame; unsigned char slicesPerFrame;
@ -338,15 +347,6 @@ static PSDP_OPTION getAttributesList(char*urlSafeAddr) {
err |= addAttributeString(&optionHead, "x-nv-video[0].clientRefreshRateX100", payloadStr); err |= addAttributeString(&optionHead, "x-nv-video[0].clientRefreshRateX100", payloadStr);
} }
if (StreamConfig.audioConfiguration == AUDIO_CONFIGURATION_51_SURROUND) {
audioChannelCount = CHANNEL_COUNT_51_SURROUND;
audioChannelMask = CHANNEL_MASK_51_SURROUND;
}
else {
audioChannelCount = CHANNEL_COUNT_STEREO;
audioChannelMask = CHANNEL_MASK_STEREO;
}
sprintf(payloadStr, "%d", audioChannelCount); sprintf(payloadStr, "%d", audioChannelCount);
err |= addAttributeString(&optionHead, "x-nv-audio.surround.numChannels", payloadStr); err |= addAttributeString(&optionHead, "x-nv-audio.surround.numChannels", payloadStr);
sprintf(payloadStr, "%d", audioChannelMask); sprintf(payloadStr, "%d", audioChannelMask);
@ -357,6 +357,7 @@ static PSDP_OPTION getAttributesList(char*urlSafeAddr) {
else { else {
err |= addAttributeString(&optionHead, "x-nv-audio.surround.enable", "0"); err |= addAttributeString(&optionHead, "x-nv-audio.surround.enable", "0");
} }
}
if (AppVersionQuad[0] >= 7) { if (AppVersionQuad[0] >= 7) {
// Decide to use HQ audio based on the original video bitrate, not the HEVC-adjusted value // Decide to use HQ audio based on the original video bitrate, not the HEVC-adjusted value
@ -393,7 +394,6 @@ static PSDP_OPTION getAttributesList(char*urlSafeAddr) {
// 5 ms duration for legacy servers // 5 ms duration for legacy servers
AudioPacketDuration = 5; AudioPacketDuration = 5;
} }
}
if (err == 0) { if (err == 0) {
return optionHead; return optionHead;