--- ./Makefile 2018-11-09 15:32:15.000000000 +0000 +++ ./Makefile 2018-11-27 08:33:58.577791000 +0000 @@ -42,6 +42,7 @@ OPTIONS_DEFAULT= FDKAAC MP3LAME OPUS OPTIONS_GROUP= AUDIO_CODEC OPTIONS_GROUP_AUDIO_CODEC= FDKAAC MP3LAME OPUS FDKAAC_DESC= Enable Fraunhofer FDK AAC for audio redirection +#FDKAAC_BROKEN= use old version 0.1.6 FUSE_DESC= Enable drive redirection via FUSE (experimental) MP3LAME_DESC= Enable MP3 Lame for audio redirection OPUS_DESC= Enable Opus for audio redirection --- ./files/patch-sesman_chansrv_sound.c 1970-01-01 00:00:00.000000000 +0000 +++ ./files/patch-sesman_chansrv_sound.c 2018-11-27 09:53:49.842465000 +0000 @@ -0,0 +1,27 @@ +--- sesman/chansrv/sound.c.orig 2018-09-25 06:09:22 UTC ++++ sesman/chansrv/sound.c +@@ -40,6 +40,11 @@ + static HANDLE_AACENCODER g_fdk_aac_encoder = 0; + #endif + ++#define FDKENC_VER_AT_LEAST(vl0, vl1) \ ++ (defined(AACENCODER_LIB_VL0) && \ ++ ((AACENCODER_LIB_VL0 > vl0) || \ ++ (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1))) ++ + #if defined(XRDP_OPUS) + #include + static OpusEncoder *g_opus_encoder = 0; +@@ -598,7 +603,12 @@ sound_wave_compress_fdk_aac(char *data, + LOG(0, (" inBufFillLevel %d", info.inBufFillLevel)); + LOG(0, (" inputChannels %d", info.inputChannels)); + LOG(0, (" frameLength %d", info.frameLength)); ++#if FDKENC_VER_AT_LEAST(4, 0) ++ LOG(0, (" nDelay %d", info.nDelay)); ++ LOG(0, (" nDelayCore %d", info.nDelayCore)); ++#else + LOG(0, (" encoderDelay %d", info.encoderDelay)); ++#endif + LOG(0, (" confBuf")); + LOG(0, (" confSize %d", info.confSize)); + }