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

mfreerdp-server and rdpsnd server more fixes

Browse Source
This commit is contained in:
C-o-r-E 2013-03-08 12:55:21 -05:00
parent 989232dc41
commit 2d3fc241a6
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
channels/rdpsnd/server/rdpsnd.c
View File

@ -159,12 +159,6 @@ static BOOL rdpsnd_server_recv_formats(rdpsnd_server* rdpsnd, STREAM* s)
UINT32 flags, vol, pitch;
UINT16 udpPort, version;
BYTE lastblock;
/*if (stream_get_left(s) < 20)
{
printf("vic logic: < 20");
return FALSE;
}*/
stream_read_UINT32(s, flags); /* dwFlags */
@ -276,7 +270,7 @@ static void* rdpsnd_server_thread_func(void* arg)
break;
}
printf("rdpsnd: got a message of %d bytes\n", bytes_returned);
//printf("rdpsnd: got a message of %d bytes\n", bytes_returned);
//winpr_HexDump(s->data, stream_get_size(s));
@ -287,7 +281,7 @@ static void* rdpsnd_server_thread_func(void* arg)
//if (BodySize + 4 > (int) bytes_returned)
//continue;
printf("body size: %d\n", BodySize);
//printf("body size: %d\n", BodySize);
switch (msgType)
{

10
server/Mac/mf_rdpsnd.c
View File

@ -112,13 +112,10 @@ static void mf_peer_rdpsnd_activated(rdpsnd_server_context* context)
{
case WAVE_FORMAT_ALAW:
recorderState.dataFormat.mFormatID = kAudioFormatDVIIntelIMA;
recorderState.dataFormat.mBitsPerChannel = 16;
break;
case WAVE_FORMAT_PCM:
recorderState.dataFormat.mFormatID = kAudioFormatLinearPCM;
recorderState.dataFormat.mBitsPerChannel = 4;
break;
default:
@ -126,14 +123,13 @@ static void mf_peer_rdpsnd_activated(rdpsnd_server_context* context)
break;
}
recorderState.dataFormat.mSampleRate = 22050.0;
recorderState.dataFormat.mFormatID = kAudioFormatALaw;
recorderState.dataFormat.mSampleRate = agreedFormat->nSamplesPerSec;
recorderState.dataFormat.mFormatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagsNativeEndian | kAudioFormatFlagIsPacked;;
recorderState.dataFormat.mBytesPerPacket = 4;
recorderState.dataFormat.mFramesPerPacket = 1;
recorderState.dataFormat.mBytesPerFrame = 4;
recorderState.dataFormat.mChannelsPerFrame = 2;
recorderState.dataFormat.mBitsPerChannel = 8;
recorderState.dataFormat.mChannelsPerFrame = agreedFormat->nChannels;
recorderState.dataFormat.mBitsPerChannel = agreedFormat->wBitsPerSample;
/*