Revert "Reduce audio bitrate when streaming with a low video bitrate" due to breakage on GFE 3.14.1

This commit is contained in:
Cameron Gutman 2018-07-27 19:02:27 -07:00
parent d55b6bb502
commit 4c47dd74ad

View File

@ -11,7 +11,6 @@
#define CHANNEL_MASK_STEREO 0x3 #define CHANNEL_MASK_STEREO 0x3
#define CHANNEL_MASK_51_SURROUND 0xFC #define CHANNEL_MASK_51_SURROUND 0xFC
#define LOW_BITRATE_THRESHOLD 5000
#define HIGH_BITRATE_THRESHOLD 15000 #define HIGH_BITRATE_THRESHOLD 15000
typedef struct _SDP_OPTION { typedef struct _SDP_OPTION {
@ -375,23 +374,6 @@ static PSDP_OPTION getAttributesList(char*urlSafeAddr) {
err |= addAttributeString(&optionHead, "x-nv-audio.surround.AudioQuality", "0"); err |= addAttributeString(&optionHead, "x-nv-audio.surround.AudioQuality", "0");
HighQualitySurroundEnabled = 0; HighQualitySurroundEnabled = 0;
} }
if (StreamConfig.bitrate < LOW_BITRATE_THRESHOLD && audioChannelCount == 2) {
// At low bitrates, cap the stereo audio bitrate to reduce data usage. For some reason,
// GFE seems to always enable high quality (512 Kbps) mode for stereo even though we
// don't specify that we want it via SDP. 5.1 audio properly remains at normal quality
// mode by default. To work around high quality mode, use adaptive bitrate with a
// min = max clamp (like we do for video).
err |= addAttributeString(&optionHead, "x-nv-audioBitrate.adaptiveBitrateEnable", "1");
err |= addAttributeString(&optionHead, "x-nv-audioBitrate.local2chMin", "96");
err |= addAttributeString(&optionHead, "x-nv-audioBitrate.local2chMax", "96");
err |= addAttributeString(&optionHead, "x-nv-audioBitrate.remote2chMin", "96");
err |= addAttributeString(&optionHead, "x-nv-audioBitrate.remote2chMax", "96");
}
else {
// Disable audio bitrate cap
err |= addAttributeString(&optionHead, "x-nv-audioBitrate.adaptiveBitrateEnable", "0");
}
} }
} }