mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[codec,dsp] fix opus related code

Browse Source 
* proper library detection
* default to NOT WITH_DSP_FFMPEG
* disable if WITH_DSP_FFMPEG
This commit is contained in:
akallabeth 2023-11-20 09:20:41 +01:00 committed by akallabeth
parent 330f7ae0a2
commit a232cec690
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libfreerdp/CMakeLists.txt
View File

@ -216,9 +216,21 @@ if(LAME_FOUND)
include_directories(${LAME_INCLUDE_DIRS})
endif()
if(OPUS_FOUND)
freerdp_library_add(${OPUS_LIBRARIES})
include_directories(${OPUS_INCLUDE_DIRS})
set(OPUS_DEFAULT OFF)
if (NOT WITH_DSP_FFMPEG)
find_package(PkgConfig REQUIRED)
pkg_check_modules(OPUS REQUIRED opus)
set(OPUS_DEFAULT ${OPUS_FOUND})
endif()
option(WITH_OPUS "compile with opus codec support" ${OPUS_DEFAULT})
if (WITH_OPUS)
find_package(PkgConfig REQUIRED)
pkg_check_modules(OPUS REQUIRED opus)
if(OPUS_FOUND)
freerdp_library_add(${OPUS_LIBRARIES})
include_directories(${OPUS_INCLUDE_DIRS})
endif()
endif()
if(FAAD2_FOUND)

27
libfreerdp/codec/dsp.c
View File

@ -1247,11 +1247,6 @@ BOOL freerdp_dsp_encode(FREERDP_DSP_CONTEXT* context, const AUDIO_FORMAT* srcFor
BOOL freerdp_dsp_decode(FREERDP_DSP_CONTEXT* context, const AUDIO_FORMAT* srcFormat,
const BYTE* data, size_t length, wStream* out)
{
#if defined(WITH_OPUS)
if (context->format.wFormatTag == WAVE_FORMAT_OPUS)
return freerdp_dsp_decode_opus(context, data, length, out);
#endif
#if defined(WITH_DSP_FFMPEG)
return freerdp_dsp_ffmpeg_decode(context, srcFormat, data, length, out);
#else
@ -1289,6 +1284,10 @@ BOOL freerdp_dsp_decode(FREERDP_DSP_CONTEXT* context, const AUDIO_FORMAT* srcFor
return freerdp_dsp_decode_faad(context, data, length, out);
#endif
#if defined(WITH_OPUS)
case WAVE_FORMAT_OPUS:
return freerdp_dsp_decode_opus(context, data, length, out);
#endif
default:
return FALSE;
}
@ -1299,14 +1298,6 @@ BOOL freerdp_dsp_decode(FREERDP_DSP_CONTEXT* context, const AUDIO_FORMAT* srcFor
BOOL freerdp_dsp_supports_format(const AUDIO_FORMAT* format, BOOL encode)
{
#if defined(WITH_OPUS)
if (format->wFormatTag == WAVE_FORMAT_OPUS && !encode &&
(format->nSamplesPerSec == 8000 || format->nSamplesPerSec == 12000 ||
format->nSamplesPerSec == 16000 || format->nSamplesPerSec == 24000 ||
format->nSamplesPerSec == 48000))
return TRUE;
#endif
#if defined(WITH_DSP_FFMPEG)
return freerdp_dsp_ffmpeg_supports_format(format, encode);
#else
@ -1355,6 +1346,16 @@ BOOL freerdp_dsp_supports_format(const AUDIO_FORMAT* format, BOOL encode)
if (encode)
return TRUE;
#endif
#if defined(WITH_OPUS)
case WAVE_FORMAT_OPUS:
if (encode)
return FALSE;
if ((format->nSamplesPerSec == 8000 || format->nSamplesPerSec == 12000 ||
format->nSamplesPerSec == 16000 || format->nSamplesPerSec == 24000 ||
format->nSamplesPerSec == 48000))
return TRUE;
return FALSE;
#endif
default: