morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10664 from akallabeth/audin-fixes

Browse Source 
Audin fixes
This commit is contained in:
Martin Fleisz
2024-09-23 12:22:41 +02:00
committed by GitHub
parent b350b0039e 4b60f0651c
commit 5380a743b5
8 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/audin/client/alsa/audin_alsa.c
View File

@@ -75,12 +75,6 @@ static snd_pcm_format_t audin_alsa_format(UINT32 wFormatTag, UINT32 bitPerChanne
return SND_PCM_FORMAT_UNKNOWN;
}
case WAVE_FORMAT_ALAW:
return SND_PCM_FORMAT_A_LAW;
case WAVE_FORMAT_MULAW:
return SND_PCM_FORMAT_MU_LAW;
default:
return SND_PCM_FORMAT_UNKNOWN;
}

6
channels/audin/client/oss/audin_oss.c
View File

@@ -88,12 +88,6 @@ static UINT32 audin_oss_get_format(const AUDIO_FORMAT* format)
}
break;
case WAVE_FORMAT_ALAW:
return AFMT_A_LAW;
case WAVE_FORMAT_MULAW:
return AFMT_MU_LAW;
}
return 0;

12
channels/audin/client/pulse/audin_pulse.c
View File

@@ -280,14 +280,6 @@ static UINT audin_pulse_set_format(IAudinDevice* device, const AUDIO_FORMAT* for
break;
case WAVE_FORMAT_ALAW: /* A-LAW */
sample_spec.format = PA_SAMPLE_ALAW;
break;
case WAVE_FORMAT_MULAW: /* U-LAW */
sample_spec.format = PA_SAMPLE_ULAW;
break;
default:
return ERROR_INTERNAL_ERROR;
}
@@ -300,6 +292,8 @@ static UINT audin_pulse_set_format(IAudinDevice* device, const AUDIO_FORMAT* for
static void audin_pulse_stream_state_callback(pa_stream* stream, void* userdata)
{
AudinPulseDevice* pulse = (AudinPulseDevice*)userdata;
WINPR_ASSERT(pulse);
pa_stream_state_t state = pa_stream_get_state(stream);
WLog_Print(pulse->log, WLOG_DEBUG, "stream state %s", pulse_stream_state_string(state));
@@ -416,7 +410,7 @@ static UINT audin_pulse_open(IAudinDevice* device, AudinReceive receive, void* u
return pa_context_errno(pulse->context);
}
for (;;)
while (pulse->stream)
{
state = pa_stream_get_state(pulse->stream);

6
channels/rdpsnd/client/oss/rdpsnd_oss.c
View File

@@ -86,12 +86,6 @@ static int rdpsnd_oss_get_format(const AUDIO_FORMAT* format)
}
break;
case WAVE_FORMAT_ALAW:
return AFMT_A_LAW;
case WAVE_FORMAT_MULAW:
return AFMT_MU_LAW;
}
return 0;

10
channels/rdpsnd/client/pulse/rdpsnd_pulse.c
View File

@@ -327,14 +327,6 @@ static BOOL rdpsnd_pulse_set_format_spec(rdpsndPulsePlugin* pulse, const AUDIO_F
break;
case WAVE_FORMAT_ALAW:
sample_spec.format = PA_SAMPLE_ALAW;
break;
case WAVE_FORMAT_MULAW:
sample_spec.format = PA_SAMPLE_ULAW;
break;
default:
return FALSE;
}
@@ -422,7 +414,7 @@ static BOOL rdpsnd_pulse_open_stream(rdpsndDevicePlugin* device)
return FALSE;
}
for (;;)
while (pulse->stream)
{
state = pa_stream_get_state(pulse->stream);

2
channels/tsmf/client/pulse/tsmf_pulse.c
View File

@@ -176,6 +176,8 @@ static void tsmf_pulse_wait_for_operation(TSMFPulseAudioDevice* pulse, pa_operat
static void tsmf_pulse_stream_state_callback(pa_stream* stream, void* userdata)
{
TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*)userdata;
WINPR_ASSERT(pulse);
pa_stream_state_t state = pa_stream_get_state(stream);
switch (state)

6
libfreerdp/codec/dsp.c
View File

@@ -1183,6 +1183,12 @@ fail:
void freerdp_dsp_context_free(FREERDP_DSP_CONTEXT* context)
{
#if defined(WITH_FDK_AAC)
FREERDP_DSP_COMMON_CONTEXT* ctx = (FREERDP_DSP_COMMON_CONTEXT*)context;
WINPR_ASSERT(ctx);
fdk_aac_dsp_uninit(ctx);
#endif
#if defined(WITH_DSP_FFMPEG)
freerdp_dsp_ffmpeg_context_free(context);
#else

8
libfreerdp/codec/dsp_ffmpeg.c
View File

@@ -70,19 +70,17 @@ static BOOL ffmpeg_codec_is_filtered(enum AVCodecID id, BOOL encoder)
case AV_CODEC_ID_MP3:
case AV_CODEC_ID_ADPCM_MS:
case AV_CODEC_ID_G723_1:
case AV_CODEC_ID_GSM_MS:
case AV_CODEC_ID_PCM_ALAW:
case AV_CODEC_ID_PCM_MULAW:
return TRUE;
#endif
case AV_CODEC_ID_NONE:
return TRUE;
case AV_CODEC_ID_GSM_MS:
case AV_CODEC_ID_AAC:
case AV_CODEC_ID_AAC_LATM:
#if !defined(WITH_DSP_EXPERIMENTAL)
if (encoder)
return TRUE;
#endif
return FALSE;
default: