diff options
| author | metalefty <meta@vmeta.jp> | 2018-11-28 10:20:05 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 10:20:05 +0900 |
| commit | 435295e5bff9e75d464e63c80a8c82a6c34e55aa (patch) | |
| tree | 56f396ad92ca546d37853a0f1cdc205403f4271c | |
| parent | 9a2d94b9dd8271e5b668539d19bc1f5813ffb028 (diff) | |
| parent | 88f0d3114db0a6f4841064de918e11753951f862 (diff) | |
| download | xrdp-proprietary-435295e5bff9e75d464e63c80a8c82a6c34e55aa.tar.gz xrdp-proprietary-435295e5bff9e75d464e63c80a8c82a6c34e55aa.zip | |
Merge pull request #1257 from metalefty/FDKv2
Fix build with FDK AAC v2
| -rw-r--r-- | sesman/chansrv/sound.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sesman/chansrv/sound.c b/sesman/chansrv/sound.c index cc9f2ceb..452acc12 100644 --- a/sesman/chansrv/sound.c +++ b/sesman/chansrv/sound.c @@ -38,6 +38,12 @@ #if defined(XRDP_FDK_AAC) #include <fdk-aac/aacenc_lib.h> static HANDLE_AACENCODER g_fdk_aac_encoder = 0; + +#define AACENCODER_LIB_VER_GTEQ(vl0, vl1, vl2) \ + (defined(AACENCODER_LIB_VL0) && \ + ((AACENCODER_LIB_VL0 > vl0) || \ + (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1) || \ + (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 == vl1 && AACENCODER_LIB_VL2 > vl2))) #endif #if defined(XRDP_OPUS) @@ -598,7 +604,12 @@ sound_wave_compress_fdk_aac(char *data, int data_bytes, int *format_index) LOG(0, (" inBufFillLevel %d", info.inBufFillLevel)); LOG(0, (" inputChannels %d", info.inputChannels)); LOG(0, (" frameLength %d", info.frameLength)); +#if AACENCODER_LIB_VER_GTEQ(4, 0, 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)); } |