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

Cleaned up defaults.

Browse Source
This commit is contained in:
Armin Novak 2018-09-25 14:56:25 +02:00
parent 106dde9571
commit 18f97d03e7
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels/audin/client/audin_main.c
View File

@ -369,12 +369,8 @@ static UINT audin_receive_wave_data(const AUDIO_FORMAT* format,
if (Stream_GetPosition(audin->data) <= 1)
return CHANNEL_RC_OK;
WLog_Print(audin->log, WLOG_TRACE,
"%s: nChannels: %"PRIu16" nSamplesPerSec: %"PRIu32" "
"nAvgBytesPerSec: %"PRIu32" nBlockAlign: %"PRIu16" wBitsPerSample: %"PRIu16" cbSize: %"PRIu16" [%"PRIdz"/%"PRIdz"]",
audio_format_get_tag_string(audin->format->wFormatTag),
audin->format->nChannels, audin->format->nSamplesPerSec, audin->format->nAvgBytesPerSec,
audin->format->nBlockAlign, audin->format->wBitsPerSample, audin->format->cbSize, size,
audio_format_print(audin->log, WLOG_TRACE, audin->format);
WLog_Print(audin->log, WLOG_TRACE, "[%"PRIdz"/%"PRIdz"]", size,
Stream_GetPosition(audin->data) - 1);
if ((error = audin_send_incoming_data_pdu(callback)))

26
server/shadow/shadow_audin.c
View File

@ -173,22 +173,22 @@ BOOL shadow_client_audin_init(rdpShadowClient* client)
{ WAVE_FORMAT_GSM610, 1, 8000, 1625, 65, 0, 2, gsm610_data },
/* Formats added for others */
{ WAVE_FORMAT_MSG723, 2, 44100, 176400, 4, 16, 0, NULL },
{ WAVE_FORMAT_MSG723, 2, 22050, 176400, 4, 16, 0, NULL },
{ WAVE_FORMAT_MSG723, 1, 44100, 176400, 4, 16, 0, NULL },
{ WAVE_FORMAT_MSG723, 1, 22050, 176400, 4, 16, 0, NULL },
{ WAVE_FORMAT_MSG723, 2, 44100, 0, 4, 16, 0, NULL },
{ WAVE_FORMAT_MSG723, 2, 22050, 0, 4, 16, 0, NULL },
{ WAVE_FORMAT_MSG723, 1, 44100, 0, 4, 16, 0, NULL },
{ WAVE_FORMAT_MSG723, 1, 22050, 0, 4, 16, 0, NULL },
{ WAVE_FORMAT_PCM, 2, 44100, 176400, 4, 16, 0, NULL },
{ WAVE_FORMAT_PCM, 2, 22050, 176400, 4, 16, 0, NULL },
{ WAVE_FORMAT_PCM, 1, 44100, 176400, 4, 16, 0, NULL },
{ WAVE_FORMAT_PCM, 1, 22050, 176400, 4, 16, 0, NULL },
{ WAVE_FORMAT_MULAW, 2, 44100, 176400, 4, 16, 0, NULL },
{ WAVE_FORMAT_MULAW, 2, 22050, 176400, 4, 16, 0, NULL },
{ WAVE_FORMAT_MULAW, 1, 44100, 176400, 4, 16, 0, NULL },
{ WAVE_FORMAT_MULAW, 1, 22050, 176400, 4, 16, 0, NULL },
{ WAVE_FORMAT_ALAW, 2, 44100, 44100, 2, 8, 0, NULL },
{ WAVE_FORMAT_PCM, 2, 22050, 88200, 4, 16, 0, NULL },
{ WAVE_FORMAT_PCM, 1, 44100, 88200, 4, 16, 0, NULL },
{ WAVE_FORMAT_PCM, 1, 22050, 44100, 4, 16, 0, NULL },
{ WAVE_FORMAT_MULAW, 2, 44100, 88200, 4, 16, 0, NULL },
{ WAVE_FORMAT_MULAW, 2, 22050, 44100, 4, 16, 0, NULL },
{ WAVE_FORMAT_MULAW, 1, 44100, 44100, 4, 16, 0, NULL },
{ WAVE_FORMAT_MULAW, 1, 22050, 22050, 4, 16, 0, NULL },
{ WAVE_FORMAT_ALAW, 2, 44100, 88200, 2, 8, 0, NULL },
{ WAVE_FORMAT_ALAW, 2, 22050, 44100, 2, 8, 0, NULL },
{ WAVE_FORMAT_ALAW, 1, 44100, 44100, 2, 8, 0, NULL },
{ WAVE_FORMAT_ALAW, 1, 22050, 44100, 2, 8, 0, NULL }
{ WAVE_FORMAT_ALAW, 1, 22050, 22050, 2, 8, 0, NULL }
};
const size_t nrDefaultFormatsMax = ARRAYSIZE(default_supported_audio_formats);
size_t x;