MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-16 08:13:30 +00:00
Code Issues Releases Wiki Activity

Removed compression optimization, which seems to resolve 4k display issues

Browse Source
This commit is contained in:
Bryan Roe
2020-04-08 10:09:20 -07:00
parent f4a84e212f
commit ddfce07d40
1 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
meshcore/KVM/MacOS/mac_tile.c
View File

@@ -306,30 +306,35 @@ int getTileAt(int x, int y, void** buffer, long long *bufferSize, void *desktop,
int retval = 0; int retval = 0;
int firstTime = 1; int firstTime = 1;
//This loop is used to adjust the COMPRESSION_RATIO. This loop runs only once most of the time. ////This loop is used to adjust the COMPRESSION_RATIO. This loop runs only once most of the time.
do { do
{
//retval here is 0 if everything was good. It is > 0 if it contains the size of the jpeg that was created and not sent. //retval here is 0 if everything was good. It is > 0 if it contains the size of the jpeg that was created and not sent.
retval = calc_opt_compr_send(x, y, captureWidth, captureHeight, desktop, desktopsize, buffer, bufferSize); retval = calc_opt_compr_send(x, y, captureWidth, captureHeight, desktop, desktopsize, buffer, bufferSize);
if (retval != 0) { if (retval != 0)
if (firstTime) { {
//Re-adjust the compression ratio. //if (firstTime)
COMPRESSION_RATIO = (int)(((double)COMPRESSION_RATIO/(double)retval) * 60000);//Magic number: 60000 ~= 65500 //{
if (COMPRESSION_RATIO <= 1) { // //Re-adjust the compression ratio.
COMPRESSION_RATIO = 2; // COMPRESSION_RATIO = (int)(((double)COMPRESSION_RATIO/(double)retval) * 60000);//Magic number: 60000 ~= 65500
} // if (COMPRESSION_RATIO <= 1) {
// COMPRESSION_RATIO = 2;
firstTime = 0; // }
} //
// firstTime = 0;
//}
if (botrow > row) { //First time, try reducing the height. if (botrow > row) { //First time, try reducing the height.
botrow = row + ((botrow - row + 1) / 2); botrow = row + ((botrow - row + 1) / 2);
captureHeight = (botrow - row + 1) * TILE_HEIGHT; captureHeight = (botrow - row + 1) * TILE_HEIGHT;
} }
else if (rightcol > col){ //If it is not possible, reduce the width else if (rightcol > col)
{ //If it is not possible, reduce the width
rightcol = col + ((rightcol - col + 1) / 2); rightcol = col + ((rightcol - col + 1) / 2);
captureWidth = (rightcol - col + 1) * TILE_WIDTH; captureWidth = (rightcol - col + 1) * TILE_WIDTH;
} }
else { //This never happens in any case. else
{ //This never happens in any case.
retval = 0; retval = 0;
break; break;
} }
@@ -338,15 +343,30 @@ int getTileAt(int x, int y, void** buffer, long long *bufferSize, void *desktop,
} while (retval != 0); } while (retval != 0);
//Set the flags to TILE_SENT //Set the flags to TILE_SENT
if (jpeg_buffer != NULL) { if (jpeg_buffer != NULL)
*bufferSize = jpeg_buffer_length + 8; {
*bufferSize = jpeg_buffer_length + (jpeg_buffer_length > 65500 ? 16 : 8);
*buffer = malloc (*bufferSize); *buffer = malloc (*bufferSize);
if (jpeg_buffer_length > 65500)
{
((unsigned short*)*buffer)[0] = (unsigned short)htons((unsigned short)MNG_JUMBO); // Write the type
((unsigned short*)*buffer)[1] = (unsigned short)htons((unsigned short)8); // Write the size
((unsigned int*)*buffer)[1] = (unsigned int)htonl(jpeg_buffer_length + 8); // Size of the Next Packet
((unsigned short*)*buffer)[4] = (unsigned short)htons((unsigned short)MNG_KVM_PICTURE); // Write the type
((unsigned short*)*buffer)[5] = 0; // RESERVED
((unsigned short*)*buffer)[6] = (unsigned short)htons((unsigned short)x); // X position
((unsigned short*)*buffer)[7] = (unsigned short)htons((unsigned short)y); // Y position
memcpy((char *)(*buffer) + 16, jpeg_buffer, jpeg_buffer_length);
}
else
{
((unsigned short*)*buffer)[0] = (unsigned short)htons((unsigned short)MNG_KVM_PICTURE); // Write the type ((unsigned short*)*buffer)[0] = (unsigned short)htons((unsigned short)MNG_KVM_PICTURE); // Write the type
((unsigned short*)*buffer)[1] = (unsigned short)htons((unsigned short)*bufferSize); // Write the size ((unsigned short*)*buffer)[1] = (unsigned short)htons((unsigned short)*bufferSize); // Write the size
((unsigned short*)*buffer)[2] = (unsigned short)htons((unsigned short)x); // X position ((unsigned short*)*buffer)[2] = (unsigned short)htons((unsigned short)x); // X position
((unsigned short*)*buffer)[3] = (unsigned short)htons((unsigned short)y); // Y position ((unsigned short*)*buffer)[3] = (unsigned short)htons((unsigned short)y); // Y position
memcpy((char *)(*buffer) + 8, jpeg_buffer, jpeg_buffer_length); memcpy((char *)(*buffer) + 8, jpeg_buffer, jpeg_buffer_length);
}
free(jpeg_buffer); free(jpeg_buffer);
jpeg_buffer = NULL; jpeg_buffer = NULL;
jpeg_buffer_length = 0; jpeg_buffer_length = 0;