jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sound: g_bbuf_size should be determined after codec is determined

Browse Source 
Fixes #910, if both client and server support more than one codecs,
g_bbuf_size might be set to wrong value.
This commit is contained in:
Koichiro IWAO 2017-11-07 18:55:59 +09:00 committed by metalefty
parent a6fd518a48
commit 3d29b6ec76
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sesman/chansrv/sound.c
View File

@ -400,19 +400,16 @@ sound_process_output_format(int aindex, int wFormatTag, int nChannels,
LOG(0, ("wFormatTag, fdk aac")); LOG(0, ("wFormatTag, fdk aac"));
g_client_does_fdk_aac = 1; g_client_does_fdk_aac = 1;
g_client_fdk_aac_index = aindex; g_client_fdk_aac_index = aindex;
g_bbuf_size = 4096;
break; break;
case WAVE_FORMAT_MPEGLAYER3: case WAVE_FORMAT_MPEGLAYER3:
LOG(0, ("wFormatTag, mp3")); LOG(0, ("wFormatTag, mp3"));
g_client_does_mp3lame = 1; g_client_does_mp3lame = 1;
g_client_mp3lame_index = aindex; g_client_mp3lame_index = aindex;
g_bbuf_size = 11520;
break; break;
case WAVE_FORMAT_OPUS: case WAVE_FORMAT_OPUS:
LOG(0, ("wFormatTag, opus")); LOG(0, ("wFormatTag, opus"));
g_client_does_opus = 1; g_client_does_opus = 1;
g_client_opus_index = aindex; g_client_opus_index = aindex;
g_bbuf_size = 11520;
break; break;
} }
@ -840,14 +837,17 @@ sound_wave_compress(char *data, int data_bytes, int *format_index)
{ {
if (g_client_does_fdk_aac) if (g_client_does_fdk_aac)
{ {
g_bbuf_size = 4096;
return sound_wave_compress_fdk_aac(data, data_bytes, format_index); return sound_wave_compress_fdk_aac(data, data_bytes, format_index);
} }
else if (g_client_does_opus) else if (g_client_does_opus)
{ {
g_bbuf_size = 11520;
return sound_wave_compress_opus(data, data_bytes, format_index); return sound_wave_compress_opus(data, data_bytes, format_index);
} }
else if (g_client_does_mp3lame) else if (g_client_does_mp3lame)
{ {
g_bbuf_size = 11520;
return sound_wave_compress_mp3lame(data, data_bytes, format_index); return sound_wave_compress_mp3lame(data, data_bytes, format_index);
} }
return data_bytes; return data_bytes;