Mercurial > hg > Members > nobuyasu > tightVNCProxy
comparison src/myVncProxy/VncProxyService.java @ 127:97bb1436e34c
change encode to Hextile from ZRLE
author | e085711 |
---|---|
date | Tue, 02 Aug 2011 13:17:23 +0900 |
parents | 762d2b7f1db2 |
children | fa2122e5c807 |
comparison
equal
deleted
inserted
replaced
126:762d2b7f1db2 | 127:97bb1436e34c |
---|---|
324 long kbitsPerSecond = rfb.kbitsPerSecond(); | 324 long kbitsPerSecond = rfb.kbitsPerSecond(); |
325 | 325 |
326 if (nEncodingsSaved < 1) { | 326 if (nEncodingsSaved < 1) { |
327 // Choose Tight or ZRLE encoding for the very first update. | 327 // Choose Tight or ZRLE encoding for the very first update. |
328 System.out.println("Using Tight/ZRLE encodings"); | 328 System.out.println("Using Tight/ZRLE encodings"); |
329 preferredEncoding = RfbProto.EncodingTight; | 329 // preferredEncoding = RfbProto.EncodingTight; |
330 } else if (kbitsPerSecond > 2000 | 330 } else if (kbitsPerSecond > 2000 |
331 && encodingsSaved[0] != RfbProto.EncodingHextile) { | 331 && encodingsSaved[0] != RfbProto.EncodingHextile) { |
332 // Switch to Hextile if the connection speed is above 2Mbps. | 332 // Switch to Hextile if the connection speed is above 2Mbps. |
333 System.out.println("Throughput " + kbitsPerSecond | 333 System.out.println("Throughput " + kbitsPerSecond |
334 + " kbit/s - changing to Hextile encoding"); | 334 + " kbit/s - changing to Hextile encoding"); |
336 } else if (kbitsPerSecond < 1000 | 336 } else if (kbitsPerSecond < 1000 |
337 && encodingsSaved[0] != RfbProto.EncodingTight) { | 337 && encodingsSaved[0] != RfbProto.EncodingTight) { |
338 // Switch to Tight/ZRLE if the connection speed is below 1Mbps. | 338 // Switch to Tight/ZRLE if the connection speed is below 1Mbps. |
339 System.out.println("Throughput " + kbitsPerSecond | 339 System.out.println("Throughput " + kbitsPerSecond |
340 + " kbit/s - changing to Tight/ZRLE encodings"); | 340 + " kbit/s - changing to Tight/ZRLE encodings"); |
341 preferredEncoding = RfbProto.EncodingTight; | 341 // preferredEncoding = RfbProto.EncodingTight; |
342 } else { | 342 } else { |
343 // Don't change the encoder. | 343 // Don't change the encoder. |
344 if (autoSelectOnly) | 344 if (autoSelectOnly) |
345 return; | 345 return; |
346 preferredEncoding = encodingsSaved[0]; | 346 preferredEncoding = encodingsSaved[0]; |
357 | 357 |
358 encodings[nEncodings++] = preferredEncoding; | 358 encodings[nEncodings++] = preferredEncoding; |
359 if (options.useCopyRect) { | 359 if (options.useCopyRect) { |
360 encodings[nEncodings++] = RfbProto.EncodingCopyRect; | 360 encodings[nEncodings++] = RfbProto.EncodingCopyRect; |
361 } | 361 } |
362 /* | |
362 if (preferredEncoding != RfbProto.EncodingTight) { | 363 if (preferredEncoding != RfbProto.EncodingTight) { |
363 encodings[nEncodings++] = RfbProto.EncodingTight; | 364 encodings[nEncodings++] = RfbProto.EncodingTight; |
364 } | 365 } |
365 if (preferredEncoding != RfbProto.EncodingZRLE) { | 366 if (preferredEncoding != RfbProto.EncodingZRLE) { |
366 encodings[nEncodings++] = RfbProto.EncodingZRLE; | 367 encodings[nEncodings++] = RfbProto.EncodingZRLE; |
367 } | 368 } |
369 */ | |
368 if (preferredEncoding != RfbProto.EncodingHextile) { | 370 if (preferredEncoding != RfbProto.EncodingHextile) { |
369 encodings[nEncodings++] = RfbProto.EncodingHextile; | 371 encodings[nEncodings++] = RfbProto.EncodingHextile; |
370 } | 372 } |
373 /* | |
371 if (preferredEncoding != RfbProto.EncodingZlib) { | 374 if (preferredEncoding != RfbProto.EncodingZlib) { |
372 encodings[nEncodings++] = RfbProto.EncodingZlib; | 375 encodings[nEncodings++] = RfbProto.EncodingZlib; |
373 } | 376 } |
374 /* | 377 |
375 if (preferredEncoding != RfbProto.EncodingCoRRE) { | 378 if (preferredEncoding != RfbProto.EncodingCoRRE) { |
376 encodings[nEncodings++] = RfbProto.EncodingCoRRE; | 379 encodings[nEncodings++] = RfbProto.EncodingCoRRE; |
377 } | 380 } |
378 if (preferredEncoding != RfbProto.EncodingRRE) { | 381 if (preferredEncoding != RfbProto.EncodingRRE) { |
379 encodings[nEncodings++] = RfbProto.EncodingRRE; | 382 encodings[nEncodings++] = RfbProto.EncodingRRE; |
380 } | 383 } |
381 | 384 /* |
382 if (options.compressLevel >= 0 && options.compressLevel <= 9) { | 385 if (options.compressLevel >= 0 && options.compressLevel <= 9) { |
383 encodings[nEncodings++] = RfbProto.EncodingCompressLevel0 | 386 encodings[nEncodings++] = RfbProto.EncodingCompressLevel0 |
384 + options.compressLevel; | 387 + options.compressLevel; |
385 } | 388 } |
386 if (options.jpegQuality >= 0 && options.jpegQuality <= 9) { | 389 if (options.jpegQuality >= 0 && options.jpegQuality <= 9) { |