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

Added CMake option WITH_DSP_EXPERIMENTAL

Browse Source 
Some encoder/decoder formats are currently not really working or
have not been thouroughly tested. To allow fearless hackers
fine tuning this flag is added to easily enable/disable these formats.
This commit is contained in:
Armin Novak 2018-03-14 16:10:12 +01:00
parent f89c1857b9
commit 4d45bd6661
4 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/ConfigOptions.cmake
View File

@ -132,6 +132,7 @@ option(WITH_DEBUG_SYMBOLS "Pack debug symbols to installer" OFF)
option(WITH_CCACHE "Use ccache support if available" ON)
option(WITH_ICU "Use ICU for unicode conversion" OFF)
option(WITH_DSP_EXPERIMENTAL "Enable experimental sound encoder/decoder formats" OFF)
if (WITH_FFMPEG)
option(WITH_DSP_FFMPEG "Use FFMPEG for audio encoding/decoding" OFF)
endif(WITH_FFMPEG)

1
config.h.in
View File

@ -58,6 +58,7 @@
#cmakedefine WITH_GFX_H264
#cmakedefine WITH_OPENH264
#cmakedefine WITH_FFMPEG
#cmakedefine WITH_DSP_EXPERIMENTAL
#cmakedefine WITH_DSP_FFMPEG
#cmakedefine WITH_X264
#cmakedefine WITH_MEDIA_FOUNDATION

10
libfreerdp/codec/dsp.c
View File

@ -1128,12 +1128,20 @@ BOOL freerdp_dsp_supports_format(const AUDIO_FORMAT* format, BOOL encode)
#if defined(WITH_GSM)
case WAVE_FORMAT_GSM610:
#if defined(WITH_DSP_EXPERIMENTAL)
return TRUE;
#else
return !encode;
#endif
#endif
#if defined(WITH_LAME)
case WAVE_FORMAT_MPEGLAYER3:
#if defined(WITH_DSP_EXPERIMENTAL)
return TRUE;
#else
return !encode;
#endif
#endif
case WAVE_FORMAT_AAC_MS:
@ -1142,7 +1150,7 @@ BOOL freerdp_dsp_supports_format(const AUDIO_FORMAT* format, BOOL encode)
return TRUE;
#endif
#if defined(WITH_FAAC)
#if defined(WITH_FAAC) && defined(WITH_DSP_EXPERIMENTAL)
if (encode)
return TRUE;

28
libfreerdp/codec/dsp_ffmpeg.c
View File

@ -53,6 +53,28 @@ struct _FREERDP_DSP_CONTEXT
AVAudioResampleContext* rcontext;
};
static BOOL ffmpeg_codec_is_filtered(enum AVCodecID id, BOOL encoder)
{
if (!encoder)
return FALSE;
switch(id)
{
#if !defined(WITH_DSP_EXPERIMENTAL)
case AV_CODEC_ID_MP3:
case AV_CODEC_ID_GSM_MS:
case AV_CODEC_ID_AAC:
return TRUE;
#endif
case AV_CODEC_ID_NONE:
return TRUE;
default:
return FALSE;
}
}
static enum AVCodecID ffmpeg_get_avcodec(const AUDIO_FORMAT* format)
{
const char* id;
@ -189,7 +211,7 @@ static BOOL ffmpeg_open_context(FREERDP_DSP_CONTEXT* context)
layout = av_get_default_channel_layout(format->nChannels);
context->id = ffmpeg_get_avcodec(format);
if (context->id == AV_CODEC_ID_NONE)
if (ffmpeg_codec_is_filtered(context->id, context->encoder))
goto fail;
if (context->encoder)
@ -333,7 +355,7 @@ static BOOL ffmpeg_encode_frame(AVCodecContext* context, AVFrame* in,
{
const char* err = av_err2str(ret);
WLog_ERR(TAG, "Error submitting the packet to the encoder %s [%d]",
err, ret);
err, ret);
return FALSE;
}
@ -452,7 +474,7 @@ BOOL freerdp_dsp_ffmpeg_supports_format(const AUDIO_FORMAT* format, BOOL encode)
{
enum AVCodecID id = ffmpeg_get_avcodec(format);
if (id == AV_CODEC_ID_NONE)
if (ffmpeg_codec_is_filtered(id, encode))
return FALSE;
if (encode)