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

[codec,dsp] reorganize experimental codecs

Browse Source 
* Remove ALAW/µULAW from sound channels
* Make everything except PCM and AAC experimental
This commit is contained in:
akallabeth 2024-09-23 11:30:56 +02:00
parent ce2605fad2
commit ae3330d63d
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
6 changed files with 3 additions and 39 deletions
Show Stats 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; 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: default:
return SND_PCM_FORMAT_UNKNOWN; 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; break;
case WAVE_FORMAT_ALAW:
return AFMT_A_LAW;
case WAVE_FORMAT_MULAW:
return AFMT_MU_LAW;
} }
return 0; return 0;

8
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; 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: default:
return ERROR_INTERNAL_ERROR; return ERROR_INTERNAL_ERROR;
} }

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; break;
case WAVE_FORMAT_ALAW:
return AFMT_A_LAW;
case WAVE_FORMAT_MULAW:
return AFMT_MU_LAW;
} }
return 0; return 0;

8
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; break;
case WAVE_FORMAT_ALAW:
sample_spec.format = PA_SAMPLE_ALAW;
break;
case WAVE_FORMAT_MULAW:
sample_spec.format = PA_SAMPLE_ULAW;
break;
default: default:
return FALSE; return FALSE;
} }

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_MP3:
case AV_CODEC_ID_ADPCM_MS: case AV_CODEC_ID_ADPCM_MS:
case AV_CODEC_ID_G723_1: 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; return TRUE;
#endif #endif
case AV_CODEC_ID_NONE: case AV_CODEC_ID_NONE:
return TRUE; return TRUE;
case AV_CODEC_ID_GSM_MS:
case AV_CODEC_ID_AAC: case AV_CODEC_ID_AAC:
case AV_CODEC_ID_AAC_LATM: case AV_CODEC_ID_AAC_LATM:
#if !defined(WITH_DSP_EXPERIMENTAL)
if (encoder)
return TRUE;
#endif
return FALSE; return FALSE;
default: default: