View | Details | Raw Unified | Return to bug 233558
Collapse All | Expand All

(-)./Makefile (+1 lines)
Lines 42-47 OPTIONS_DEFAULT= FDKAAC MP3LAME OPUS Link Here
42 
OPTIONS_GROUP=	AUDIO_CODEC
 42 
OPTIONS_GROUP=	AUDIO_CODEC
43 
OPTIONS_GROUP_AUDIO_CODEC=	FDKAAC MP3LAME OPUS
 43 
OPTIONS_GROUP_AUDIO_CODEC=	FDKAAC MP3LAME OPUS
44 
FDKAAC_DESC=	Enable Fraunhofer FDK AAC for audio redirection
 44 
FDKAAC_DESC=	Enable Fraunhofer FDK AAC for audio redirection
45 
#FDKAAC_BROKEN=	use old version 0.1.6
45 
FUSE_DESC=	Enable drive redirection via FUSE (experimental)
 46 
FUSE_DESC=	Enable drive redirection via FUSE (experimental)
46 
MP3LAME_DESC=	Enable MP3 Lame for audio redirection
 47 
MP3LAME_DESC=	Enable MP3 Lame for audio redirection
47 
OPUS_DESC=	Enable Opus for audio redirection
 48 
OPUS_DESC=	Enable Opus for audio redirection
(-)./files/patch-sesman_chansrv_sound.c (+27 lines)
Line 0 Link Here
1 
--- sesman/chansrv/sound.c.orig	2018-09-25 06:09:22 UTC
2 
+++ sesman/chansrv/sound.c
3 
@@ -40,6 +40,11 @@
4 
 static HANDLE_AACENCODER g_fdk_aac_encoder = 0;
5 
 #endif
6
7 
+#define FDKENC_VER_AT_LEAST(vl0, vl1) \
8 
+    (defined(AACENCODER_LIB_VL0) && \
9 
+        ((AACENCODER_LIB_VL0 > vl0) || \
10 
+         (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1)))
11 
+
12 
 #if defined(XRDP_OPUS)
13 
 #include <opus/opus.h>
14 
 static OpusEncoder *g_opus_encoder = 0;
15 
@@ -598,7 +603,12 @@ sound_wave_compress_fdk_aac(char *data,
16 
         LOG(0, ("    inBufFillLevel %d", info.inBufFillLevel));
17 
         LOG(0, ("    inputChannels %d", info.inputChannels));
18 
         LOG(0, ("    frameLength %d", info.frameLength));
19 
+#if FDKENC_VER_AT_LEAST(4, 0)
20 
+        LOG(0, ("    nDelay %d", info.nDelay));
21 
+        LOG(0, ("    nDelayCore %d", info.nDelayCore));
22 
+#else
23 
         LOG(0, ("    encoderDelay %d", info.encoderDelay));
24 
+#endif
25 
         LOG(0, ("    confBuf"));
26 
         LOG(0, ("    confSize %d", info.confSize));
27 
     }

Return to bug 233558