|
505 | 505 | if (!candidates.length) { |
506 | 506 | return null; |
507 | 507 | } |
508 | | - var best = null; |
509 | | - var bestArea = -1; |
510 | | - var bestScore = -1; |
511 | | - var bestIndex = -1; |
512 | | - var bestSource = 'none'; |
513 | | - var bestSignature = 'none'; |
| 508 | + var evaluated = []; |
| 509 | + var maxArea = -1; |
514 | 510 | for (var i = 0; i < candidates.length; i++) { |
515 | 511 | var c = candidates[i].canvas; |
516 | 512 | if (!c || (includeDataUrl && typeof c.toDataURL !== 'function')) { |
|
522 | 518 | var scoreMeta = canvasContentScore(c); |
523 | 519 | var score = scoreMeta && scoreMeta.score != null ? (scoreMeta.score | 0) : -1; |
524 | 520 | var signature = scoreMeta && scoreMeta.signature ? String(scoreMeta.signature) : 'none'; |
525 | | - if (score > bestScore || (score === bestScore && area > bestArea)) { |
526 | | - bestScore = score; |
527 | | - bestArea = area; |
528 | | - best = c; |
529 | | - bestIndex = i; |
530 | | - bestSource = candidates[i].source || 'unknown'; |
531 | | - bestSignature = signature; |
| 521 | + evaluated.push({ |
| 522 | + canvas: c, |
| 523 | + index: i, |
| 524 | + source: candidates[i].source || 'unknown', |
| 525 | + area: area, |
| 526 | + score: score, |
| 527 | + signature: signature, |
| 528 | + width: w, |
| 529 | + height: h |
| 530 | + }); |
| 531 | + if (area > maxArea) { |
| 532 | + maxArea = area; |
| 533 | + } |
| 534 | + } |
| 535 | + if (!evaluated.length) { |
| 536 | + return null; |
| 537 | + } |
| 538 | + var minLargeArea = Math.max(65536, Math.floor(maxArea * 0.45)); |
| 539 | + var pool = []; |
| 540 | + for (var p = 0; p < evaluated.length; p++) { |
| 541 | + if (evaluated[p].area >= minLargeArea) { |
| 542 | + pool.push(evaluated[p]); |
| 543 | + } |
| 544 | + } |
| 545 | + if (!pool.length) { |
| 546 | + pool = evaluated; |
| 547 | + } |
| 548 | + var best = null; |
| 549 | + var bestArea = -1; |
| 550 | + var bestScore = -1; |
| 551 | + var bestIndex = -1; |
| 552 | + var bestSource = 'none'; |
| 553 | + var bestSignature = 'none'; |
| 554 | + for (var j = 0; j < pool.length; j++) { |
| 555 | + var pick = pool[j]; |
| 556 | + if (pick.score > bestScore || (pick.score === bestScore && pick.area > bestArea)) { |
| 557 | + bestScore = pick.score; |
| 558 | + bestArea = pick.area; |
| 559 | + best = pick.canvas; |
| 560 | + bestIndex = pick.index; |
| 561 | + bestSource = pick.source; |
| 562 | + bestSignature = pick.signature; |
532 | 563 | } |
533 | 564 | } |
534 | 565 | if (!best) { |
535 | 566 | return null; |
536 | 567 | } |
537 | 568 | var out = { |
538 | 569 | canvasCount: candidates.length, |
| 570 | + canvasConsidered: evaluated.length, |
| 571 | + canvasLargeCount: pool.length, |
| 572 | + canvasMinLargeArea: minLargeArea, |
539 | 573 | canvasPick: bestIndex, |
540 | 574 | canvasArea: bestArea, |
541 | 575 | canvasScore: bestScore, |
|
677 | 711 | } |
678 | 712 | global.__cn1LastScreenshotSignature = result.canvasSignature || ''; |
679 | 713 | diag('SCREENSHOT_START', 'canvasCount', result.canvasCount); |
| 714 | + diag('SCREENSHOT_START', 'canvasConsidered', result.canvasConsidered | 0); |
| 715 | + diag('SCREENSHOT_START', 'canvasLargeCount', result.canvasLargeCount | 0); |
| 716 | + diag('SCREENSHOT_START', 'canvasMinLargeArea', result.canvasMinLargeArea | 0); |
680 | 717 | diag('SCREENSHOT_START', 'canvasPick', result.canvasPick); |
681 | 718 | diag('SCREENSHOT_START', 'canvasArea', result.canvasArea); |
682 | 719 | diag('SCREENSHOT_START', 'canvasScore', result.canvasScore); |
|
0 commit comments