fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling - #3014

Merged
cgutman merged 5 commits into
LizardByte:masterfrom
ns6089:chroma_downscale
Sep 3, 2024
Merged

fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling#3014
cgutman merged 5 commits into
LizardByte:masterfrom
ns6089:chroma_downscale

Conversation

@ns6089

@ns6089ns6089 commented Aug 13, 2024•
edited
Loading

Copy link
Copy Markdown
Contributor

Description

Don't offload math to texture sampler when subsampling chroma together with downscaling.
Fixes broken chroma when downscaling.
This makes chroma consistent with luma when downscaling, but luma itself is broken if the factor is >2x and half-broken with lesser factors (inconsistent filter radius, linear texture sampler alone can't be used for proper downscaling).
I'm hesitant to touch upscaling because of the potential performance hit.

Screenshot

Before
2024-08-17 16_10_31-dixi - Moonlight
After
2024-08-17 16_16_58-dixi - Moonlight

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

@ns6089ns6089 changed the title Chroma downscaleDon't offload math to texture sampler when subsampling chroma together with downscalingAug 13, 2024
@ns6089
ns6089force-pushed the chroma_downscale branch 2 times, most recently from 5f86e5e to 9329e90CompareAugust 17, 2024 13:19
@ns6089ns6089 changed the title Don't offload math to texture sampler when subsampling chroma together with downscalingfix(win/video): don't offload chroma subsampling math to texture sampler when downscalingAug 17, 2024
@ns6089
ns6089 marked this pull request as ready for review August 17, 2024 13:21
@codecov

codecovBot commented Aug 18, 2024•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 0% with 54 lines in your changes missing coverage. Please review.

Project coverage is 9.83%. Comparing base (9d7e90e) to head (bc2bd06).
Report is 108 commits behind head on master.

Files with missing linesPatch %Lines
src/platform/windows/display_vram.cpp0.00%50 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## master #3014 +/- ##
=========================================
+ Coverage 9.70% 9.83% +0.12% 
=========================================
Files 77 101 +24 Lines 14055 17988 +3933 Branches 6443 8410 +1967 =========================================
+ Hits 1364 1769 +405 - Misses 10071 13337 +3266 - Partials 2620 2882 +262
FlagCoverage Δ
Linux7.26% <ø> (?)
Windows5.06% <0.00%> (+<0.01%)⬆️
macOS-1210.76% <ø> (-0.02%)⬇️
macOS-1310.66% <ø> (-0.02%)⬇️
macOS-1410.97% <ø> (+0.01%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing linesCoverage Δ
src/platform/windows/display_vram.cpp1.84% <0.00%> (+0.17%)⬆️

... and 56 files with indirect coverage changes

@ns6089

ns6089 commented Aug 25, 2024

Copy link
Copy Markdown
ContributorAuthor

The code in this pull request is Not a Contribution under LizardByte Individual Contributor License Agreement.
The code in this pull request is shared under GNU GENERAL PUBLIC LICENSE Version 3.

@ReenigneArcher
ReenigneArcher marked this pull request as draft August 25, 2024 04:22
@cgutman

cgutman commented Aug 28, 2024

Copy link
Copy Markdown
Collaborator

Reopening now that the CLA has been revoked and this can now be accepted under the GPLv3 terms alone.

@cgutmancgutman reopened this Aug 28, 2024
@cgutman
cgutman marked this pull request as ready for review August 30, 2024 05:12
cgutman
cgutman reviewed Aug 30, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp Outdated
ns6089
ns6089 commented Aug 31, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp Outdated
return -1; \
}

const bool downscaling = display->width != width || display->height != height;

@ns6089ns6089Aug 31, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
constbool downscaling = display->width != width || display->height != height;
constbool downscaling = display->width > width || display->height > height;

Comment threadsrc_assets/windows/assets/shaders/directx/include/convert_yuv420_packed_uv_ps_base.hlsl Outdated
Comment on lines +21 to +27
float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
rgb = CONVERT_FUNCTION(rgb * (1./6));

@ns6089ns6089Aug 31, 2024•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
rgb = CONVERT_FUNCTION(rgb * (1./6));
float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
rgb *= 2;
rgb += image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
rgb = CONVERT_FUNCTION(rgb * (1./8));

Also just realized we can sightly improve the quality and be consistent with what we do in no scaling path (#1621 (comment)) at pretty much no additional cost.

@ns6089

ns6089 commented Aug 31, 2024

Copy link
Copy Markdown
ContributorAuthor

Also fixed portrait rotation bug that's been there since that feature got first introduced https://github.com/ns6089/Sunshine/pull/3014/commits/f41242f819c0c1fc1372bf8a3c605e059c8f8073

@sonarqubecloud

sonarqubecloudBot commented Sep 2, 2024

Copy link
Copy Markdown

Quality Gate FailedQuality Gate failed

Failed conditions
7 New issues
7 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@cgutman
cgutman merged commit 7ce8547 into LizardByte:masterSep 3, 2024
KuleRucket pushed a commit to KuleRucket/Sunshine that referenced this pull request Oct 9, 2024
@ns6089KuleRucket
fix(win/video): don't offload chroma subsampling math to texture samp…
e534865
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
qiin2333 referenced this pull request in AlkaidLab/foundation-sunshine Dec 31, 2024
@ns6089@qiin2333
fix(win/video): don't offload chroma subsampling math to texture samp…
30514c8
…ler when downscaling (#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
This was referenced Jan 18, 2025
Merged
Closed
Merged
@ReenigneArcherReenigneArcher mentioned this pull request Jan 22, 2025
Merged
c2vi pushed a commit to c2vi/Sunshine that referenced this pull request Mar 27, 2025
@ns6089@c2vi
fix(win/video): don't offload chroma subsampling math to texture samp…
2c892fd
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Nonary pushed a commit to Nonary/vibeshine that referenced this pull request Oct 3, 2025
@ns6089@ClassicOldSong
fix(win/video): don't offload chroma subsampling math to texture samp…
538a64a
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cgutmancgutmancgutman left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ns6089@cgutman@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling - #3014
Merged
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Sep 3, 2024
Merged
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling#3014
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Conversation
@ns6089
@ns6089ns6089
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Don't offload math to texture sampler when subsampling chroma together with downscaling.

Fixes broken chroma when downscaling.

This makes chroma consistent with luma when downscaling, but luma itself is broken if the factor is >2x and half-broken with lesser factors (inconsistent filter radius, linear texture sampler alone can't be used for proper downscaling).

I'm hesitant to touch upscaling because of the potential performance hit.
Screenshot
Before
2024-08-17 16_10_31-dixi - Moonlight

After
2024-08-17 16_16_58-dixi - Moonlight
Issues Fixed or Closed
Type of Change
  •  Bug fix (non-breaking change which fixes an issue)
  •  New feature (non-breaking change which adds functionality)
  •  Breaking change (fix or feature that would cause existing functionality to not work as expected)
  •  Dependency update (updates to dependencies)
  •  Documentation update (changes to documentation)
  •  Repository update (changes to repository files, e.g. .github/...)
Checklist
  •  My code follows the style guidelines of this project
  •  I have performed a self-review of my own code
  •  I have commented my code, particularly in hard-to-understand areas
  •  I have added or updated the in code docstring/documentation-blocks for new or existing methods/components
@ns6089ns6089
changed the title
Chroma downscaleDon't offload math to texture sampler when subsampling chroma together with downscalingAug 13, 2024
@ns6089
ns6089force-pushed
the
chroma_downscale
branch
2 times, most recently
from
5f86e5e to
9329e90CompareAugust 17, 2024 13:19
@ns6089ns6089
changed the title
Don't offload math to texture sampler when subsampling chroma together with downscalingfix(win/video): don't offload chroma subsampling math to texture sampler when downscalingAug 17, 2024
@ns6089
ns6089
marked this pull request as ready for review
August 17, 2024 13:21
@codecov
codecovBot
commented
Aug 18, 2024•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 0% with 54 lines in your changes missing coverage. Please review.
Project coverage is 9.83%. Comparing base (9d7e90e) to head (bc2bd06).

Report is 108 commits behind head on master.
Files with missing linesPatch %Lines
src/platform/windows/display_vram.cpp0.00%50 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## master #3014 +/- ##
=========================================
+ Coverage 9.70% 9.83% +0.12% 
=========================================
Files 77 101 +24 Lines 14055 17988 +3933 Branches 6443 8410 +1967 =========================================
+ Hits 1364 1769 +405 - Misses 10071 13337 +3266 - Partials 2620 2882 +262 
FlagCoverage Δ
Linux7.26% <ø> (?)
Windows5.06% <0.00%> (+<0.01%)⬆️
macOS-1210.76% <ø> (-0.02%)⬇️
macOS-1310.66% <ø> (-0.02%)⬇️
macOS-1410.97% <ø> (+0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
Files with missing linesCoverage Δ
src/platform/windows/display_vram.cpp1.84% <0.00%> (+0.17%)⬆️
... and 56 files with indirect coverage changes
@ns6089
ns6089
commented
Aug 25, 2024

Copy link


Copy Markdown

ContributorAuthor
The code in this pull request is Not a Contribution under LizardByte Individual Contributor License Agreement.

The code in this pull request is shared under GNU GENERAL PUBLIC LICENSE Version 3.
@ReenigneArcher
ReenigneArcher
marked this pull request as draft
August 25, 2024 04:22
@cgutman
cgutman
commented
Aug 28, 2024

Copy link


Copy Markdown

Collaborator
Reopening now that the CLA has been revoked and this can now be accepted under the GPLv3 terms alone.
@cgutmancgutman
reopened this
Aug 28, 2024
@cgutman
cgutman
marked this pull request as ready for review
August 30, 2024 05:12
cgutman
cgutman
reviewed
Aug 30, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

ns6089
ns6089
commented
Aug 31, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

 return -1; \
 }

 const bool downscaling = display->width != width || display->height != height;
@ns6089ns6089Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

constbool downscaling = display->width != width || display->height != height;
constbool downscaling = display->width > width || display->height > height;
Comment threadsrc_assets/windows/assets/shaders/directx/include/convert_yuv420_packed_uv_ps_base.hlsl
Outdated


Comment on lines

+21
 to 
+27

 float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
@ns6089ns6089Aug 31, 2024•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb *= 2;
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./8));
Also just realized we can sightly improve the quality and be consistent with what we do in no scaling path (#1621 (comment)) at pretty much no additional cost.
@ns6089
ns6089
commented
Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Also fixed portrait rotation bug that's been there since that feature got first introduced https://github.com/ns6089/Sunshine/pull/3014/commits/f41242f819c0c1fc1372bf8a3c605e059c8f8073
@sonarqubecloud
sonarqubecloudBot
commented
Sep 2, 2024

Copy link


Copy Markdown

Quality Gate FailedQuality Gate failed
Failed conditions
7 New issues
7 New Code Smells (required ≤ 0)
See analysis details on SonarCloud
 Catch issues before they fail your Quality Gate with our IDE extension SonarLint
@cgutman
cgutman
merged commit 7ce8547
into
LizardByte:masterSep 3, 2024
KuleRucket pushed a commit
to KuleRucket/Sunshine
that referenced
this pull request
Oct 9, 2024
@ns6089KuleRucket
fix(win/video): don't offload chroma subsampling math to texture samp…
e534865
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
qiin2333 referenced
this pull request
in AlkaidLab/foundation-sunshine
Dec 31, 2024
@ns6089@qiin2333
fix(win/video): don't offload chroma subsampling math to texture samp…
30514c8
…ler when downscaling (#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets

This was referenced Jan 18, 2025
 Merged

 Closed

 Merged

@ReenigneArcherReenigneArcher
mentioned this pull request
Jan 22, 2025
 Merged

c2vi pushed a commit
to c2vi/Sunshine
that referenced
this pull request
Mar 27, 2025
@ns6089@c2vi
fix(win/video): don't offload chroma subsampling math to texture samp…
2c892fd
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Nonary pushed a commit
to Nonary/vibeshine
that referenced
this pull request
Oct 3, 2025
@ns6089@ClassicOldSong
fix(win/video): don't offload chroma subsampling math to texture samp…
538a64a
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@cgutmancgutmancgutman left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@ns6089@cgutman@ReenigneArcher

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling - #3014
Merged
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Sep 3, 2024
Merged
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling#3014
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Conversation
@ns6089
@ns6089ns6089
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Don't offload math to texture sampler when subsampling chroma together with downscaling.

Fixes broken chroma when downscaling.

This makes chroma consistent with luma when downscaling, but luma itself is broken if the factor is >2x and half-broken with lesser factors (inconsistent filter radius, linear texture sampler alone can't be used for proper downscaling).

I'm hesitant to touch upscaling because of the potential performance hit.
Screenshot
Before
2024-08-17 16_10_31-dixi - Moonlight

After
2024-08-17 16_16_58-dixi - Moonlight
Issues Fixed or Closed
Type of Change
  •  Bug fix (non-breaking change which fixes an issue)
  •  New feature (non-breaking change which adds functionality)
  •  Breaking change (fix or feature that would cause existing functionality to not work as expected)
  •  Dependency update (updates to dependencies)
  •  Documentation update (changes to documentation)
  •  Repository update (changes to repository files, e.g. .github/...)
Checklist
  •  My code follows the style guidelines of this project
  •  I have performed a self-review of my own code
  •  I have commented my code, particularly in hard-to-understand areas
  •  I have added or updated the in code docstring/documentation-blocks for new or existing methods/components
@ns6089ns6089
changed the title
Chroma downscaleDon't offload math to texture sampler when subsampling chroma together with downscalingAug 13, 2024
@ns6089
ns6089force-pushed
the
chroma_downscale
branch
2 times, most recently
from
5f86e5e to
9329e90CompareAugust 17, 2024 13:19
@ns6089ns6089
changed the title
Don't offload math to texture sampler when subsampling chroma together with downscalingfix(win/video): don't offload chroma subsampling math to texture sampler when downscalingAug 17, 2024
@ns6089
ns6089
marked this pull request as ready for review
August 17, 2024 13:21
@codecov
codecovBot
commented
Aug 18, 2024•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 0% with 54 lines in your changes missing coverage. Please review.
Project coverage is 9.83%. Comparing base (9d7e90e) to head (bc2bd06).

Report is 108 commits behind head on master.
Files with missing linesPatch %Lines
src/platform/windows/display_vram.cpp0.00%50 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## master #3014 +/- ##
=========================================
+ Coverage 9.70% 9.83% +0.12% 
=========================================
Files 77 101 +24 Lines 14055 17988 +3933 Branches 6443 8410 +1967 =========================================
+ Hits 1364 1769 +405 - Misses 10071 13337 +3266 - Partials 2620 2882 +262 
FlagCoverage Δ
Linux7.26% <ø> (?)
Windows5.06% <0.00%> (+<0.01%)⬆️
macOS-1210.76% <ø> (-0.02%)⬇️
macOS-1310.66% <ø> (-0.02%)⬇️
macOS-1410.97% <ø> (+0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
Files with missing linesCoverage Δ
src/platform/windows/display_vram.cpp1.84% <0.00%> (+0.17%)⬆️
... and 56 files with indirect coverage changes
@ns6089
ns6089
commented
Aug 25, 2024

Copy link


Copy Markdown

ContributorAuthor
The code in this pull request is Not a Contribution under LizardByte Individual Contributor License Agreement.

The code in this pull request is shared under GNU GENERAL PUBLIC LICENSE Version 3.
@ReenigneArcher
ReenigneArcher
marked this pull request as draft
August 25, 2024 04:22
@cgutman
cgutman
commented
Aug 28, 2024

Copy link


Copy Markdown

Collaborator
Reopening now that the CLA has been revoked and this can now be accepted under the GPLv3 terms alone.
@cgutmancgutman
reopened this
Aug 28, 2024
@cgutman
cgutman
marked this pull request as ready for review
August 30, 2024 05:12
cgutman
cgutman
reviewed
Aug 30, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

ns6089
ns6089
commented
Aug 31, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

 return -1; \
 }

 const bool downscaling = display->width != width || display->height != height;
@ns6089ns6089Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

constbool downscaling = display->width != width || display->height != height;
constbool downscaling = display->width > width || display->height > height;
Comment threadsrc_assets/windows/assets/shaders/directx/include/convert_yuv420_packed_uv_ps_base.hlsl
Outdated


Comment on lines

+21
 to 
+27

 float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
@ns6089ns6089Aug 31, 2024•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb *= 2;
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./8));
Also just realized we can sightly improve the quality and be consistent with what we do in no scaling path (#1621 (comment)) at pretty much no additional cost.
@ns6089
ns6089
commented
Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Also fixed portrait rotation bug that's been there since that feature got first introduced https://github.com/ns6089/Sunshine/pull/3014/commits/f41242f819c0c1fc1372bf8a3c605e059c8f8073
@sonarqubecloud
sonarqubecloudBot
commented
Sep 2, 2024

Copy link


Copy Markdown

Quality Gate FailedQuality Gate failed
Failed conditions
7 New issues
7 New Code Smells (required ≤ 0)
See analysis details on SonarCloud
 Catch issues before they fail your Quality Gate with our IDE extension SonarLint
@cgutman
cgutman
merged commit 7ce8547
into
LizardByte:masterSep 3, 2024
KuleRucket pushed a commit
to KuleRucket/Sunshine
that referenced
this pull request
Oct 9, 2024
@ns6089KuleRucket
fix(win/video): don't offload chroma subsampling math to texture samp…
e534865
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
qiin2333 referenced
this pull request
in AlkaidLab/foundation-sunshine
Dec 31, 2024
@ns6089@qiin2333
fix(win/video): don't offload chroma subsampling math to texture samp…
30514c8
…ler when downscaling (#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets

This was referenced Jan 18, 2025
 Merged

 Closed

 Merged

@ReenigneArcherReenigneArcher
mentioned this pull request
Jan 22, 2025
 Merged

c2vi pushed a commit
to c2vi/Sunshine
that referenced
this pull request
Mar 27, 2025
@ns6089@c2vi
fix(win/video): don't offload chroma subsampling math to texture samp…
2c892fd
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Nonary pushed a commit
to Nonary/vibeshine
that referenced
this pull request
Oct 3, 2025
@ns6089@ClassicOldSong
fix(win/video): don't offload chroma subsampling math to texture samp…
538a64a
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@cgutmancgutmancgutman left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@ns6089@cgutman@ReenigneArcher

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling - #3014
Merged
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Sep 3, 2024
Merged
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling#3014
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Conversation
@ns6089
@ns6089ns6089
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Don't offload math to texture sampler when subsampling chroma together with downscaling.

Fixes broken chroma when downscaling.

This makes chroma consistent with luma when downscaling, but luma itself is broken if the factor is >2x and half-broken with lesser factors (inconsistent filter radius, linear texture sampler alone can't be used for proper downscaling).

I'm hesitant to touch upscaling because of the potential performance hit.
Screenshot
Before
2024-08-17 16_10_31-dixi - Moonlight

After
2024-08-17 16_16_58-dixi - Moonlight
Issues Fixed or Closed
Type of Change
  •  Bug fix (non-breaking change which fixes an issue)
  •  New feature (non-breaking change which adds functionality)
  •  Breaking change (fix or feature that would cause existing functionality to not work as expected)
  •  Dependency update (updates to dependencies)
  •  Documentation update (changes to documentation)
  •  Repository update (changes to repository files, e.g. .github/...)
Checklist
  •  My code follows the style guidelines of this project
  •  I have performed a self-review of my own code
  •  I have commented my code, particularly in hard-to-understand areas
  •  I have added or updated the in code docstring/documentation-blocks for new or existing methods/components
@ns6089ns6089
changed the title
Chroma downscaleDon't offload math to texture sampler when subsampling chroma together with downscalingAug 13, 2024
@ns6089
ns6089force-pushed
the
chroma_downscale
branch
2 times, most recently
from
5f86e5e to
9329e90CompareAugust 17, 2024 13:19
@ns6089ns6089
changed the title
Don't offload math to texture sampler when subsampling chroma together with downscalingfix(win/video): don't offload chroma subsampling math to texture sampler when downscalingAug 17, 2024
@ns6089
ns6089
marked this pull request as ready for review
August 17, 2024 13:21
@codecov
codecovBot
commented
Aug 18, 2024•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 0% with 54 lines in your changes missing coverage. Please review.
Project coverage is 9.83%. Comparing base (9d7e90e) to head (bc2bd06).

Report is 108 commits behind head on master.
Files with missing linesPatch %Lines
src/platform/windows/display_vram.cpp0.00%50 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## master #3014 +/- ##
=========================================
+ Coverage 9.70% 9.83% +0.12% 
=========================================
Files 77 101 +24 Lines 14055 17988 +3933 Branches 6443 8410 +1967 =========================================
+ Hits 1364 1769 +405 - Misses 10071 13337 +3266 - Partials 2620 2882 +262 
FlagCoverage Δ
Linux7.26% <ø> (?)
Windows5.06% <0.00%> (+<0.01%)⬆️
macOS-1210.76% <ø> (-0.02%)⬇️
macOS-1310.66% <ø> (-0.02%)⬇️
macOS-1410.97% <ø> (+0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
Files with missing linesCoverage Δ
src/platform/windows/display_vram.cpp1.84% <0.00%> (+0.17%)⬆️
... and 56 files with indirect coverage changes
@ns6089
ns6089
commented
Aug 25, 2024

Copy link


Copy Markdown

ContributorAuthor
The code in this pull request is Not a Contribution under LizardByte Individual Contributor License Agreement.

The code in this pull request is shared under GNU GENERAL PUBLIC LICENSE Version 3.
@ReenigneArcher
ReenigneArcher
marked this pull request as draft
August 25, 2024 04:22
@cgutman
cgutman
commented
Aug 28, 2024

Copy link


Copy Markdown

Collaborator
Reopening now that the CLA has been revoked and this can now be accepted under the GPLv3 terms alone.
@cgutmancgutman
reopened this
Aug 28, 2024
@cgutman
cgutman
marked this pull request as ready for review
August 30, 2024 05:12
cgutman
cgutman
reviewed
Aug 30, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

ns6089
ns6089
commented
Aug 31, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

 return -1; \
 }

 const bool downscaling = display->width != width || display->height != height;
@ns6089ns6089Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

constbool downscaling = display->width != width || display->height != height;
constbool downscaling = display->width > width || display->height > height;
Comment threadsrc_assets/windows/assets/shaders/directx/include/convert_yuv420_packed_uv_ps_base.hlsl
Outdated


Comment on lines

+21
 to 
+27

 float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
@ns6089ns6089Aug 31, 2024•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb *= 2;
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./8));
Also just realized we can sightly improve the quality and be consistent with what we do in no scaling path (#1621 (comment)) at pretty much no additional cost.
@ns6089
ns6089
commented
Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Also fixed portrait rotation bug that's been there since that feature got first introduced https://github.com/ns6089/Sunshine/pull/3014/commits/f41242f819c0c1fc1372bf8a3c605e059c8f8073
@sonarqubecloud
sonarqubecloudBot
commented
Sep 2, 2024

Copy link


Copy Markdown

Quality Gate FailedQuality Gate failed
Failed conditions
7 New issues
7 New Code Smells (required ≤ 0)
See analysis details on SonarCloud
 Catch issues before they fail your Quality Gate with our IDE extension SonarLint
@cgutman
cgutman
merged commit 7ce8547
into
LizardByte:masterSep 3, 2024
KuleRucket pushed a commit
to KuleRucket/Sunshine
that referenced
this pull request
Oct 9, 2024
@ns6089KuleRucket
fix(win/video): don't offload chroma subsampling math to texture samp…
e534865
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
qiin2333 referenced
this pull request
in AlkaidLab/foundation-sunshine
Dec 31, 2024
@ns6089@qiin2333
fix(win/video): don't offload chroma subsampling math to texture samp…
30514c8
…ler when downscaling (#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets

This was referenced Jan 18, 2025
 Merged

 Closed

 Merged

@ReenigneArcherReenigneArcher
mentioned this pull request
Jan 22, 2025
 Merged

c2vi pushed a commit
to c2vi/Sunshine
that referenced
this pull request
Mar 27, 2025
@ns6089@c2vi
fix(win/video): don't offload chroma subsampling math to texture samp…
2c892fd
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Nonary pushed a commit
to Nonary/vibeshine
that referenced
this pull request
Oct 3, 2025
@ns6089@ClassicOldSong
fix(win/video): don't offload chroma subsampling math to texture samp…
538a64a
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@cgutmancgutmancgutman left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@ns6089@cgutman@ReenigneArcher

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling - #3014
Merged
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Sep 3, 2024
Merged
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling#3014
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Conversation
@ns6089
@ns6089ns6089
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Don't offload math to texture sampler when subsampling chroma together with downscaling.

Fixes broken chroma when downscaling.

This makes chroma consistent with luma when downscaling, but luma itself is broken if the factor is >2x and half-broken with lesser factors (inconsistent filter radius, linear texture sampler alone can't be used for proper downscaling).

I'm hesitant to touch upscaling because of the potential performance hit.
Screenshot
Before
2024-08-17 16_10_31-dixi - Moonlight

After
2024-08-17 16_16_58-dixi - Moonlight
Issues Fixed or Closed
Type of Change
  •  Bug fix (non-breaking change which fixes an issue)
  •  New feature (non-breaking change which adds functionality)
  •  Breaking change (fix or feature that would cause existing functionality to not work as expected)
  •  Dependency update (updates to dependencies)
  •  Documentation update (changes to documentation)
  •  Repository update (changes to repository files, e.g. .github/...)
Checklist
  •  My code follows the style guidelines of this project
  •  I have performed a self-review of my own code
  •  I have commented my code, particularly in hard-to-understand areas
  •  I have added or updated the in code docstring/documentation-blocks for new or existing methods/components
@ns6089ns6089
changed the title
Chroma downscaleDon't offload math to texture sampler when subsampling chroma together with downscalingAug 13, 2024
@ns6089
ns6089force-pushed
the
chroma_downscale
branch
2 times, most recently
from
5f86e5e to
9329e90CompareAugust 17, 2024 13:19
@ns6089ns6089
changed the title
Don't offload math to texture sampler when subsampling chroma together with downscalingfix(win/video): don't offload chroma subsampling math to texture sampler when downscalingAug 17, 2024
@ns6089
ns6089
marked this pull request as ready for review
August 17, 2024 13:21
@codecov
codecovBot
commented
Aug 18, 2024•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 0% with 54 lines in your changes missing coverage. Please review.
Project coverage is 9.83%. Comparing base (9d7e90e) to head (bc2bd06).

Report is 108 commits behind head on master.
Files with missing linesPatch %Lines
src/platform/windows/display_vram.cpp0.00%50 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## master #3014 +/- ##
=========================================
+ Coverage 9.70% 9.83% +0.12% 
=========================================
Files 77 101 +24 Lines 14055 17988 +3933 Branches 6443 8410 +1967 =========================================
+ Hits 1364 1769 +405 - Misses 10071 13337 +3266 - Partials 2620 2882 +262 
FlagCoverage Δ
Linux7.26% <ø> (?)
Windows5.06% <0.00%> (+<0.01%)⬆️
macOS-1210.76% <ø> (-0.02%)⬇️
macOS-1310.66% <ø> (-0.02%)⬇️
macOS-1410.97% <ø> (+0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
Files with missing linesCoverage Δ
src/platform/windows/display_vram.cpp1.84% <0.00%> (+0.17%)⬆️
... and 56 files with indirect coverage changes
@ns6089
ns6089
commented
Aug 25, 2024

Copy link


Copy Markdown

ContributorAuthor
The code in this pull request is Not a Contribution under LizardByte Individual Contributor License Agreement.

The code in this pull request is shared under GNU GENERAL PUBLIC LICENSE Version 3.
@ReenigneArcher
ReenigneArcher
marked this pull request as draft
August 25, 2024 04:22
@cgutman
cgutman
commented
Aug 28, 2024

Copy link


Copy Markdown

Collaborator
Reopening now that the CLA has been revoked and this can now be accepted under the GPLv3 terms alone.
@cgutmancgutman
reopened this
Aug 28, 2024
@cgutman
cgutman
marked this pull request as ready for review
August 30, 2024 05:12
cgutman
cgutman
reviewed
Aug 30, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

ns6089
ns6089
commented
Aug 31, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

 return -1; \
 }

 const bool downscaling = display->width != width || display->height != height;
@ns6089ns6089Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

constbool downscaling = display->width != width || display->height != height;
constbool downscaling = display->width > width || display->height > height;
Comment threadsrc_assets/windows/assets/shaders/directx/include/convert_yuv420_packed_uv_ps_base.hlsl
Outdated


Comment on lines

+21
 to 
+27

 float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
@ns6089ns6089Aug 31, 2024•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb *= 2;
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./8));
Also just realized we can sightly improve the quality and be consistent with what we do in no scaling path (#1621 (comment)) at pretty much no additional cost.
@ns6089
ns6089
commented
Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Also fixed portrait rotation bug that's been there since that feature got first introduced https://github.com/ns6089/Sunshine/pull/3014/commits/f41242f819c0c1fc1372bf8a3c605e059c8f8073
@sonarqubecloud
sonarqubecloudBot
commented
Sep 2, 2024

Copy link


Copy Markdown

Quality Gate FailedQuality Gate failed
Failed conditions
7 New issues
7 New Code Smells (required ≤ 0)
See analysis details on SonarCloud
 Catch issues before they fail your Quality Gate with our IDE extension SonarLint
@cgutman
cgutman
merged commit 7ce8547
into
LizardByte:masterSep 3, 2024
KuleRucket pushed a commit
to KuleRucket/Sunshine
that referenced
this pull request
Oct 9, 2024
@ns6089KuleRucket
fix(win/video): don't offload chroma subsampling math to texture samp…
e534865
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
qiin2333 referenced
this pull request
in AlkaidLab/foundation-sunshine
Dec 31, 2024
@ns6089@qiin2333
fix(win/video): don't offload chroma subsampling math to texture samp…
30514c8
…ler when downscaling (#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets

This was referenced Jan 18, 2025
 Merged

 Closed

 Merged

@ReenigneArcherReenigneArcher
mentioned this pull request
Jan 22, 2025
 Merged

c2vi pushed a commit
to c2vi/Sunshine
that referenced
this pull request
Mar 27, 2025
@ns6089@c2vi
fix(win/video): don't offload chroma subsampling math to texture samp…
2c892fd
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Nonary pushed a commit
to Nonary/vibeshine
that referenced
this pull request
Oct 3, 2025
@ns6089@ClassicOldSong
fix(win/video): don't offload chroma subsampling math to texture samp…
538a64a
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@cgutmancgutmancgutman left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@ns6089@cgutman@ReenigneArcher

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling - #3014
Merged
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Sep 3, 2024
Merged
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling#3014
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Conversation
@ns6089
@ns6089ns6089
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Don't offload math to texture sampler when subsampling chroma together with downscaling.

Fixes broken chroma when downscaling.

This makes chroma consistent with luma when downscaling, but luma itself is broken if the factor is >2x and half-broken with lesser factors (inconsistent filter radius, linear texture sampler alone can't be used for proper downscaling).

I'm hesitant to touch upscaling because of the potential performance hit.
Screenshot
Before
2024-08-17 16_10_31-dixi - Moonlight

After
2024-08-17 16_16_58-dixi - Moonlight
Issues Fixed or Closed
Type of Change
  •  Bug fix (non-breaking change which fixes an issue)
  •  New feature (non-breaking change which adds functionality)
  •  Breaking change (fix or feature that would cause existing functionality to not work as expected)
  •  Dependency update (updates to dependencies)
  •  Documentation update (changes to documentation)
  •  Repository update (changes to repository files, e.g. .github/...)
Checklist
  •  My code follows the style guidelines of this project
  •  I have performed a self-review of my own code
  •  I have commented my code, particularly in hard-to-understand areas
  •  I have added or updated the in code docstring/documentation-blocks for new or existing methods/components
@ns6089ns6089
changed the title
Chroma downscaleDon't offload math to texture sampler when subsampling chroma together with downscalingAug 13, 2024
@ns6089
ns6089force-pushed
the
chroma_downscale
branch
2 times, most recently
from
5f86e5e to
9329e90CompareAugust 17, 2024 13:19
@ns6089ns6089
changed the title
Don't offload math to texture sampler when subsampling chroma together with downscalingfix(win/video): don't offload chroma subsampling math to texture sampler when downscalingAug 17, 2024
@ns6089
ns6089
marked this pull request as ready for review
August 17, 2024 13:21
@codecov
codecovBot
commented
Aug 18, 2024•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 0% with 54 lines in your changes missing coverage. Please review.
Project coverage is 9.83%. Comparing base (9d7e90e) to head (bc2bd06).

Report is 108 commits behind head on master.
Files with missing linesPatch %Lines
src/platform/windows/display_vram.cpp0.00%50 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## master #3014 +/- ##
=========================================
+ Coverage 9.70% 9.83% +0.12% 
=========================================
Files 77 101 +24 Lines 14055 17988 +3933 Branches 6443 8410 +1967 =========================================
+ Hits 1364 1769 +405 - Misses 10071 13337 +3266 - Partials 2620 2882 +262 
FlagCoverage Δ
Linux7.26% <ø> (?)
Windows5.06% <0.00%> (+<0.01%)⬆️
macOS-1210.76% <ø> (-0.02%)⬇️
macOS-1310.66% <ø> (-0.02%)⬇️
macOS-1410.97% <ø> (+0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
Files with missing linesCoverage Δ
src/platform/windows/display_vram.cpp1.84% <0.00%> (+0.17%)⬆️
... and 56 files with indirect coverage changes
@ns6089
ns6089
commented
Aug 25, 2024

Copy link


Copy Markdown

ContributorAuthor
The code in this pull request is Not a Contribution under LizardByte Individual Contributor License Agreement.

The code in this pull request is shared under GNU GENERAL PUBLIC LICENSE Version 3.
@ReenigneArcher
ReenigneArcher
marked this pull request as draft
August 25, 2024 04:22
@cgutman
cgutman
commented
Aug 28, 2024

Copy link


Copy Markdown

Collaborator
Reopening now that the CLA has been revoked and this can now be accepted under the GPLv3 terms alone.
@cgutmancgutman
reopened this
Aug 28, 2024
@cgutman
cgutman
marked this pull request as ready for review
August 30, 2024 05:12
cgutman
cgutman
reviewed
Aug 30, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

ns6089
ns6089
commented
Aug 31, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

 return -1; \
 }

 const bool downscaling = display->width != width || display->height != height;
@ns6089ns6089Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

constbool downscaling = display->width != width || display->height != height;
constbool downscaling = display->width > width || display->height > height;
Comment threadsrc_assets/windows/assets/shaders/directx/include/convert_yuv420_packed_uv_ps_base.hlsl
Outdated


Comment on lines

+21
 to 
+27

 float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
@ns6089ns6089Aug 31, 2024•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb *= 2;
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./8));
Also just realized we can sightly improve the quality and be consistent with what we do in no scaling path (#1621 (comment)) at pretty much no additional cost.
@ns6089
ns6089
commented
Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Also fixed portrait rotation bug that's been there since that feature got first introduced https://github.com/ns6089/Sunshine/pull/3014/commits/f41242f819c0c1fc1372bf8a3c605e059c8f8073
@sonarqubecloud
sonarqubecloudBot
commented
Sep 2, 2024

Copy link


Copy Markdown

Quality Gate FailedQuality Gate failed
Failed conditions
7 New issues
7 New Code Smells (required ≤ 0)
See analysis details on SonarCloud
 Catch issues before they fail your Quality Gate with our IDE extension SonarLint
@cgutman
cgutman
merged commit 7ce8547
into
LizardByte:masterSep 3, 2024
KuleRucket pushed a commit
to KuleRucket/Sunshine
that referenced
this pull request
Oct 9, 2024
@ns6089KuleRucket
fix(win/video): don't offload chroma subsampling math to texture samp…
e534865
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
qiin2333 referenced
this pull request
in AlkaidLab/foundation-sunshine
Dec 31, 2024
@ns6089@qiin2333
fix(win/video): don't offload chroma subsampling math to texture samp…
30514c8
…ler when downscaling (#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets

This was referenced Jan 18, 2025
 Merged

 Closed

 Merged

@ReenigneArcherReenigneArcher
mentioned this pull request
Jan 22, 2025
 Merged

c2vi pushed a commit
to c2vi/Sunshine
that referenced
this pull request
Mar 27, 2025
@ns6089@c2vi
fix(win/video): don't offload chroma subsampling math to texture samp…
2c892fd
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Nonary pushed a commit
to Nonary/vibeshine
that referenced
this pull request
Oct 3, 2025
@ns6089@ClassicOldSong
fix(win/video): don't offload chroma subsampling math to texture samp…
538a64a
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@cgutmancgutmancgutman left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@ns6089@cgutman@ReenigneArcher

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling - #3014
Merged
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Sep 3, 2024
Merged
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling#3014
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Conversation
@ns6089
@ns6089ns6089
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Don't offload math to texture sampler when subsampling chroma together with downscaling.

Fixes broken chroma when downscaling.

This makes chroma consistent with luma when downscaling, but luma itself is broken if the factor is >2x and half-broken with lesser factors (inconsistent filter radius, linear texture sampler alone can't be used for proper downscaling).

I'm hesitant to touch upscaling because of the potential performance hit.
Screenshot
Before
2024-08-17 16_10_31-dixi - Moonlight

After
2024-08-17 16_16_58-dixi - Moonlight
Issues Fixed or Closed
Type of Change
  •  Bug fix (non-breaking change which fixes an issue)
  •  New feature (non-breaking change which adds functionality)
  •  Breaking change (fix or feature that would cause existing functionality to not work as expected)
  •  Dependency update (updates to dependencies)
  •  Documentation update (changes to documentation)
  •  Repository update (changes to repository files, e.g. .github/...)
Checklist
  •  My code follows the style guidelines of this project
  •  I have performed a self-review of my own code
  •  I have commented my code, particularly in hard-to-understand areas
  •  I have added or updated the in code docstring/documentation-blocks for new or existing methods/components
@ns6089ns6089
changed the title
Chroma downscaleDon't offload math to texture sampler when subsampling chroma together with downscalingAug 13, 2024
@ns6089
ns6089force-pushed
the
chroma_downscale
branch
2 times, most recently
from
5f86e5e to
9329e90CompareAugust 17, 2024 13:19
@ns6089ns6089
changed the title
Don't offload math to texture sampler when subsampling chroma together with downscalingfix(win/video): don't offload chroma subsampling math to texture sampler when downscalingAug 17, 2024
@ns6089
ns6089
marked this pull request as ready for review
August 17, 2024 13:21
@codecov
codecovBot
commented
Aug 18, 2024•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 0% with 54 lines in your changes missing coverage. Please review.
Project coverage is 9.83%. Comparing base (9d7e90e) to head (bc2bd06).

Report is 108 commits behind head on master.
Files with missing linesPatch %Lines
src/platform/windows/display_vram.cpp0.00%50 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## master #3014 +/- ##
=========================================
+ Coverage 9.70% 9.83% +0.12% 
=========================================
Files 77 101 +24 Lines 14055 17988 +3933 Branches 6443 8410 +1967 =========================================
+ Hits 1364 1769 +405 - Misses 10071 13337 +3266 - Partials 2620 2882 +262 
FlagCoverage Δ
Linux7.26% <ø> (?)
Windows5.06% <0.00%> (+<0.01%)⬆️
macOS-1210.76% <ø> (-0.02%)⬇️
macOS-1310.66% <ø> (-0.02%)⬇️
macOS-1410.97% <ø> (+0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
Files with missing linesCoverage Δ
src/platform/windows/display_vram.cpp1.84% <0.00%> (+0.17%)⬆️
... and 56 files with indirect coverage changes
@ns6089
ns6089
commented
Aug 25, 2024

Copy link


Copy Markdown

ContributorAuthor
The code in this pull request is Not a Contribution under LizardByte Individual Contributor License Agreement.

The code in this pull request is shared under GNU GENERAL PUBLIC LICENSE Version 3.
@ReenigneArcher
ReenigneArcher
marked this pull request as draft
August 25, 2024 04:22
@cgutman
cgutman
commented
Aug 28, 2024

Copy link


Copy Markdown

Collaborator
Reopening now that the CLA has been revoked and this can now be accepted under the GPLv3 terms alone.
@cgutmancgutman
reopened this
Aug 28, 2024
@cgutman
cgutman
marked this pull request as ready for review
August 30, 2024 05:12
cgutman
cgutman
reviewed
Aug 30, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

ns6089
ns6089
commented
Aug 31, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

 return -1; \
 }

 const bool downscaling = display->width != width || display->height != height;
@ns6089ns6089Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

constbool downscaling = display->width != width || display->height != height;
constbool downscaling = display->width > width || display->height > height;
Comment threadsrc_assets/windows/assets/shaders/directx/include/convert_yuv420_packed_uv_ps_base.hlsl
Outdated


Comment on lines

+21
 to 
+27

 float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
@ns6089ns6089Aug 31, 2024•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb *= 2;
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./8));
Also just realized we can sightly improve the quality and be consistent with what we do in no scaling path (#1621 (comment)) at pretty much no additional cost.
@ns6089
ns6089
commented
Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Also fixed portrait rotation bug that's been there since that feature got first introduced https://github.com/ns6089/Sunshine/pull/3014/commits/f41242f819c0c1fc1372bf8a3c605e059c8f8073
@sonarqubecloud
sonarqubecloudBot
commented
Sep 2, 2024

Copy link


Copy Markdown

Quality Gate FailedQuality Gate failed
Failed conditions
7 New issues
7 New Code Smells (required ≤ 0)
See analysis details on SonarCloud
 Catch issues before they fail your Quality Gate with our IDE extension SonarLint
@cgutman
cgutman
merged commit 7ce8547
into
LizardByte:masterSep 3, 2024
KuleRucket pushed a commit
to KuleRucket/Sunshine
that referenced
this pull request
Oct 9, 2024
@ns6089KuleRucket
fix(win/video): don't offload chroma subsampling math to texture samp…
e534865
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
qiin2333 referenced
this pull request
in AlkaidLab/foundation-sunshine
Dec 31, 2024
@ns6089@qiin2333
fix(win/video): don't offload chroma subsampling math to texture samp…
30514c8
…ler when downscaling (#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets

This was referenced Jan 18, 2025
 Merged

 Closed

 Merged

@ReenigneArcherReenigneArcher
mentioned this pull request
Jan 22, 2025
 Merged

c2vi pushed a commit
to c2vi/Sunshine
that referenced
this pull request
Mar 27, 2025
@ns6089@c2vi
fix(win/video): don't offload chroma subsampling math to texture samp…
2c892fd
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Nonary pushed a commit
to Nonary/vibeshine
that referenced
this pull request
Oct 3, 2025
@ns6089@ClassicOldSong
fix(win/video): don't offload chroma subsampling math to texture samp…
538a64a
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@cgutmancgutmancgutman left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@ns6089@cgutman@ReenigneArcher

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling - #3014
Merged
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Sep 3, 2024
Merged
fix(win/video): don't offload chroma subsampling math to texture sampler when downscaling#3014
cgutman merged 5 commits into
LizardByte:masterfrom 
ns6089:chroma_downscale
Conversation
@ns6089
@ns6089ns6089
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Don't offload math to texture sampler when subsampling chroma together with downscaling.

Fixes broken chroma when downscaling.

This makes chroma consistent with luma when downscaling, but luma itself is broken if the factor is >2x and half-broken with lesser factors (inconsistent filter radius, linear texture sampler alone can't be used for proper downscaling).

I'm hesitant to touch upscaling because of the potential performance hit.
Screenshot
Before
2024-08-17 16_10_31-dixi - Moonlight

After
2024-08-17 16_16_58-dixi - Moonlight
Issues Fixed or Closed
Type of Change
  •  Bug fix (non-breaking change which fixes an issue)
  •  New feature (non-breaking change which adds functionality)
  •  Breaking change (fix or feature that would cause existing functionality to not work as expected)
  •  Dependency update (updates to dependencies)
  •  Documentation update (changes to documentation)
  •  Repository update (changes to repository files, e.g. .github/...)
Checklist
  •  My code follows the style guidelines of this project
  •  I have performed a self-review of my own code
  •  I have commented my code, particularly in hard-to-understand areas
  •  I have added or updated the in code docstring/documentation-blocks for new or existing methods/components
@ns6089ns6089
changed the title
Chroma downscaleDon't offload math to texture sampler when subsampling chroma together with downscalingAug 13, 2024
@ns6089
ns6089force-pushed
the
chroma_downscale
branch
2 times, most recently
from
5f86e5e to
9329e90CompareAugust 17, 2024 13:19
@ns6089ns6089
changed the title
Don't offload math to texture sampler when subsampling chroma together with downscalingfix(win/video): don't offload chroma subsampling math to texture sampler when downscalingAug 17, 2024
@ns6089
ns6089
marked this pull request as ready for review
August 17, 2024 13:21
@codecov
codecovBot
commented
Aug 18, 2024•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 0% with 54 lines in your changes missing coverage. Please review.
Project coverage is 9.83%. Comparing base (9d7e90e) to head (bc2bd06).

Report is 108 commits behind head on master.
Files with missing linesPatch %Lines
src/platform/windows/display_vram.cpp0.00%50 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## master #3014 +/- ##
=========================================
+ Coverage 9.70% 9.83% +0.12% 
=========================================
Files 77 101 +24 Lines 14055 17988 +3933 Branches 6443 8410 +1967 =========================================
+ Hits 1364 1769 +405 - Misses 10071 13337 +3266 - Partials 2620 2882 +262 
FlagCoverage Δ
Linux7.26% <ø> (?)
Windows5.06% <0.00%> (+<0.01%)⬆️
macOS-1210.76% <ø> (-0.02%)⬇️
macOS-1310.66% <ø> (-0.02%)⬇️
macOS-1410.97% <ø> (+0.01%)⬆️
Flags with carried forward coverage won't be shown. Click here to find out more.
Files with missing linesCoverage Δ
src/platform/windows/display_vram.cpp1.84% <0.00%> (+0.17%)⬆️
... and 56 files with indirect coverage changes
@ns6089
ns6089
commented
Aug 25, 2024

Copy link


Copy Markdown

ContributorAuthor
The code in this pull request is Not a Contribution under LizardByte Individual Contributor License Agreement.

The code in this pull request is shared under GNU GENERAL PUBLIC LICENSE Version 3.
@ReenigneArcher
ReenigneArcher
marked this pull request as draft
August 25, 2024 04:22
@cgutman
cgutman
commented
Aug 28, 2024

Copy link


Copy Markdown

Collaborator
Reopening now that the CLA has been revoked and this can now be accepted under the GPLv3 terms alone.
@cgutmancgutman
reopened this
Aug 28, 2024
@cgutman
cgutman
marked this pull request as ready for review
August 30, 2024 05:12
cgutman
cgutman
reviewed
Aug 30, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

ns6089
ns6089
commented
Aug 31, 2024
View reviewed changes
Comment threadsrc/platform/windows/display_vram.cpp
Outdated

 return -1; \
 }

 const bool downscaling = display->width != width || display->height != height;
@ns6089ns6089Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

constbool downscaling = display->width != width || display->height != height;
constbool downscaling = display->width > width || display->height > height;
Comment threadsrc_assets/windows/assets/shaders/directx/include/convert_yuv420_packed_uv_ps_base.hlsl
Outdated


Comment on lines

+21
 to 
+27

 float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
@ns6089ns6089Aug 31, 2024•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./6));
float3 rgb = image.Sample(def_sampler, input.tex_right_center_left_top.yw).rgb; // top-center
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.yw).rgb; // bottom-center
 rgb *= 2;
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.xw).rgb; // top-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_top.zw).rgb; // top-left
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.xw).rgb; // bottom-right
 rgb += image.Sample(def_sampler, input.tex_right_center_left_bottom.zw).rgb; // bottom-left
 rgb = CONVERT_FUNCTION(rgb * (1./8));
Also just realized we can sightly improve the quality and be consistent with what we do in no scaling path (#1621 (comment)) at pretty much no additional cost.
@ns6089
ns6089
commented
Aug 31, 2024

Copy link


Copy Markdown

ContributorAuthor
Also fixed portrait rotation bug that's been there since that feature got first introduced https://github.com/ns6089/Sunshine/pull/3014/commits/f41242f819c0c1fc1372bf8a3c605e059c8f8073
@sonarqubecloud
sonarqubecloudBot
commented
Sep 2, 2024

Copy link


Copy Markdown

Quality Gate FailedQuality Gate failed
Failed conditions
7 New issues
7 New Code Smells (required ≤ 0)
See analysis details on SonarCloud
 Catch issues before they fail your Quality Gate with our IDE extension SonarLint
@cgutman
cgutman
merged commit 7ce8547
into
LizardByte:masterSep 3, 2024
KuleRucket pushed a commit
to KuleRucket/Sunshine
that referenced
this pull request
Oct 9, 2024
@ns6089KuleRucket
fix(win/video): don't offload chroma subsampling math to texture samp…
e534865
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
qiin2333 referenced
this pull request
in AlkaidLab/foundation-sunshine
Dec 31, 2024
@ns6089@qiin2333
fix(win/video): don't offload chroma subsampling math to texture samp…
30514c8
…ler when downscaling (#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets

This was referenced Jan 18, 2025
 Merged

 Closed

 Merged

@ReenigneArcherReenigneArcher
mentioned this pull request
Jan 22, 2025
 Merged

c2vi pushed a commit
to c2vi/Sunshine
that referenced
this pull request
Mar 27, 2025
@ns6089@c2vi
fix(win/video): don't offload chroma subsampling math to texture samp…
2c892fd
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Nonary pushed a commit
to Nonary/vibeshine
that referenced
this pull request
Oct 3, 2025
@ns6089@ClassicOldSong
fix(win/video): don't offload chroma subsampling math to texture samp…
538a64a
…ler when downscaling (LizardByte#3014)
* Don't use sampler math for chroma if downscaling
* Correct portrait rotation offsets
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@cgutmancgutmancgutman left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@ns6089@cgutman@ReenigneArcher