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

Allow building without libsoxr support.

Browse Source
This commit is contained in:
Armin Novak 2018-11-13 11:06:38 +01:00
parent 6af56458ad
commit 5b363e72aa
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libfreerdp/codec/dsp.c
View File

@ -131,9 +131,6 @@ static BOOL freerdp_dsp_resample(FREERDP_DSP_CONTEXT* context,
size_t srcChannels, dstChannels; size_t srcChannels, dstChannels;
AUDIO_FORMAT format; AUDIO_FORMAT format;
if (!context || !src || !srcFormat || !data || !length)
return FALSE;
if (srcFormat->wFormatTag != WAVE_FORMAT_PCM) if (srcFormat->wFormatTag != WAVE_FORMAT_PCM)
{ {
WLog_ERR(TAG, "%s requires %s for sample input, got %s", __FUNCTION__, WLog_ERR(TAG, "%s requires %s for sample input, got %s", __FUNCTION__,
@ -153,6 +150,7 @@ static BOOL freerdp_dsp_resample(FREERDP_DSP_CONTEXT* context,
if (audio_format_compatible(&format, &context->format)) if (audio_format_compatible(&format, &context->format))
return TRUE; return TRUE;
#if defined(WITH_SOXR)
sbytes = srcChannels * srcBytesPerFrame; sbytes = srcChannels * srcBytesPerFrame;
sframes = size / sbytes; sframes = size / sbytes;
rbytes = dstBytesPerFrame * dstChannels; rbytes = dstBytesPerFrame * dstChannels;
@ -171,6 +169,10 @@ static BOOL freerdp_dsp_resample(FREERDP_DSP_CONTEXT* context,
*data = Stream_Buffer(context->resample); *data = Stream_Buffer(context->resample);
*length = Stream_Length(context->resample); *length = Stream_Length(context->resample);
return (error == 0) ? TRUE : FALSE; return (error == 0) ? TRUE : FALSE;
#else
WLog_ERR(TAG, "Missing resample support, recompile -DWITH_SOXR=ON or -DWITH_DSP_FFMPEG=ON");
return FALSE;
#endif
} }
/** /**