From 08d9dec76f50144bdac6efa29c1ecfe2e1bdfb1c Mon Sep 17 00:00:00 2001 From: bob Date: Thu, 20 Oct 2022 06:52:28 +0000 Subject: [PATCH 01/28] Added controller rumble support. Pepper SDK and NaCl in general is EOL for Chrome, although still supported for Chrome Apps. This means that the Pepper Gamepad API was never updated with rumble support so in order to add rumble support, rumble messages from Gamestream have to be forwarded to JavaScript and handled with gamepad.vibrationActuator.playEffect(). Side note, Chrome limits the duration of playEffect to 5 seconds and requesting more than that causes the vibration request to be rejected. --- connectionlistener.cpp | 1 + gamepad.cpp | 13 +++++++++++++ manifest.json | 2 +- moonlight.hpp | 1 + static/js/messages.js | 12 ++++++++++++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/connectionlistener.cpp b/connectionlistener.cpp index 094081f1..bfc79f86 100644 --- a/connectionlistener.cpp +++ b/connectionlistener.cpp @@ -56,4 +56,5 @@ CONNECTION_LISTENER_CALLBACKS MoonlightInstance::s_ClCallbacks = { .connectionStarted = MoonlightInstance::ClConnectionStarted, .connectionTerminated = MoonlightInstance::ClConnectionTerminated, .logMessage = MoonlightInstance::ClLogMessage, + .rumble = MoonlightInstance::ClControllerRumble, }; diff --git a/gamepad.cpp b/gamepad.cpp index 93df0fca..eac6979a 100644 --- a/gamepad.cpp +++ b/gamepad.cpp @@ -4,6 +4,8 @@ #include +#include + static const unsigned short k_StandardGamepadButtonMapping[] = { A_FLAG, B_FLAG, X_FLAG, Y_FLAG, LB_FLAG, RB_FLAG, @@ -127,3 +129,14 @@ void MoonlightInstance::PollGamepads() { controllerIndex++; } } + +void MoonlightInstance::ClControllerRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor) +{ + const float weakMagnitude = static_cast(highFreqMotor) / static_cast(UINT16_MAX); + const float strongMagnitude = static_cast(lowFreqMotor) / static_cast(UINT16_MAX); + + std::ostringstream ss; + ss << controllerNumber << "," << weakMagnitude << "," << strongMagnitude; + pp::Var response(std::string("controllerRumble: ") + ss.str()); + g_Instance->PostMessage(response); +} \ No newline at end of file diff --git a/manifest.json b/manifest.json index ac1aef25..2a509bbb 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "Moonlight Game Streaming", "short_name": "Moonlight", - "version": "0.10.21", + "version": "0.10.22", "description": "Open-source client for NVIDIA GameStream", "icons": { "128": "icons/icon128.png", diff --git a/moonlight.hpp b/moonlight.hpp index 452aad64..56a70fbd 100644 --- a/moonlight.hpp +++ b/moonlight.hpp @@ -137,6 +137,7 @@ class MoonlightInstance : public pp::Instance, public pp::MouseLock { static void ClDisplayMessage(const char* message); static void ClDisplayTransientMessage(const char* message); static void ClLogMessage(const char* format, ...); + static void ClControllerRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor); static Shader CreateProgram(const char* vertexShader, const char* fragmentShader); static void CreateShader(GLuint program, GLenum type, const char* source, int size); diff --git a/static/js/messages.js b/static/js/messages.js index d8ab820b..3a0970dc 100644 --- a/static/js/messages.js +++ b/static/js/messages.js @@ -81,6 +81,18 @@ function handleMessage(msg) { snackbarLogLong(msg.data.replace('DialogMsg: ', '')); } else if (msg.data === 'displayVideo') { $("#listener").addClass("fullscreen"); + } else if (msg.data.indexOf('controllerRumble: ' ) === 0) { + const eventData = msg.data.split( ' ' )[1].split(','); + const gamepadIdx = parseInt(eventData[0]); + const weakMagnitude = parseFloat(eventData[1]); + const strongMagnitude = parseFloat(eventData[2]); + console.log("Playing rumble on gamepad " + gamepadIdx + " with weakMagnitude " + weakMagnitude + " and strongMagnitude " + strongMagnitude); + navigator.getGamepads()[gamepadIdx].vibrationActuator.playEffect('dual-rumble', { + startDelay: 0, + duration: 5000, // Moonlight should be sending another rumble event when stopping. + weakMagnitude: weakMagnitude, + strongMagnitude: strongMagnitude, + }); } } } From 06100217d6054f4bd617c3ea2dda5f7d08f090c5 Mon Sep 17 00:00:00 2001 From: utopiafallen Date: Sat, 22 Oct 2022 15:05:04 -0700 Subject: [PATCH 02/28] Remove explicit fullscreen handling Moonlight's fullscreen requests generally conflict with what ChromeOS is trying to do automatically for the app, especially when using tablet mode. Just remove it for now and let the OS handle fullscreen. --- manifest.json | 3 +-- static/js/background.js | 17 +++---------- static/js/index.js | 53 ----------------------------------------- 3 files changed, 4 insertions(+), 69 deletions(-) diff --git a/manifest.json b/manifest.json index 2a509bbb..f4b9759c 100644 --- a/manifest.json +++ b/manifest.json @@ -26,8 +26,7 @@ "pointerLock", "system.network", "fullscreen", - "power", - "overrideEscFullscreen", { + "power", { "socket": [ "tcp-connect", "resolve-host", diff --git a/static/js/background.js b/static/js/background.js index 664eb98e..65f2de33 100644 --- a/static/js/background.js +++ b/static/js/background.js @@ -1,19 +1,8 @@ +const windowId = "1337"; function createWindow(state) { chrome.app.window.create('index.html', { - state: state, - bounds: { - width: 960, - height: 540 - } - }, function(window) { - // workaround: - // state = 'normal' in some cases not work (e.g. starting app from 'chrome://extensions' always open window in fullscreen mode) - // it requires manually restoring window state to 'normal' - if (state == 'normal') { - setTimeout(function() { - window.restore(); - }, 1000); - } + state: "normal", + id: windowId, }); } diff --git a/static/js/index.js b/static/js/index.js index 08408250..13276b8d 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -4,7 +4,6 @@ var pairingCert; var myUniqueid = '0123456789ABCDEF'; // Use the same UID as other Moonlight clients to allow them to quit each other's games var api; // `api` should only be set if we're in a host-specific screen. on the initial screen it should always be null. var isInGame = false; // flag indicating whether the game stream started -var windowState = 'normal'; // chrome's windowState, possible values: 'normal' or 'fullscreen' // Called by the common.js module. function attachListeners() { @@ -21,49 +20,6 @@ function attachListeners() { $('#backIcon').on('click', showHostsAndSettingsMode); $('#quitCurrentApp').on('click', stopGameWithConfirmation); $(window).resize(fullscreenNaclModule); - chrome.app.window.current().onMaximized.addListener(fullscreenChromeWindow); -} - -function fullscreenChromeWindow() { - // when the user clicks the maximize button on the window, - // FIRST restore it to the previous size, then fullscreen it to the whole screen - // this prevents the previous window size from being 'maximized', - // and allows us to functionally retain two window sizes - // so that when the user hits `esc`, they go back to the "restored" size, - // instead of "maximized", which would immediately go to fullscreen - chrome.app.window.current().restore(); - chrome.app.window.current().fullscreen(); -} - -function loadWindowState() { - if (!chrome.storage) { - return; - } - - chrome.storage.sync.get('windowState', function(item) { - // load stored window state - windowState = (item && item.windowState) ? - item.windowState : - windowState; - - // subscribe to chrome's windowState events - chrome.app.window.current().onFullscreened.addListener(onFullscreened); - chrome.app.window.current().onBoundsChanged.addListener(onBoundsChanged); - }); -} - -function onFullscreened() { - if (!isInGame && windowState == 'normal') { - storeData('windowState', 'fullscreen', null); - windowState = 'fullscreen'; - } -} - -function onBoundsChanged() { - if (!isInGame && windowState == 'fullscreen') { - storeData('windowState', 'normal', null); - windowState = 'normal'; - } } function changeUiModeForNaClLoad() { @@ -625,11 +581,6 @@ function showAppsMode() { $('#loadingSpinner').css('display', 'none'); $('body').css('backgroundColor', '#282C38'); - // Restore back to a window - if (windowState == 'normal') { - chrome.app.window.current().restore(); - } - isInGame = false; // FIXME: We want to eventually poll on the app screen but we can't now @@ -768,10 +719,8 @@ function playGameMode() { $("#main-content").children().not("#listener, #loadingSpinner").hide(); $("#main-content").addClass("fullscreen"); - chrome.app.window.current().fullscreen(); fullscreenNaclModule(); $('#loadingSpinner').css('display', 'inline-block'); - } // Maximize the size of the nacl module by scaling and resizing appropriately @@ -950,8 +899,6 @@ function onWindowLoad() { // don't show the game selection div $('#gameSelection').css('display', 'none'); - loadWindowState(); - if (chrome.storage) { // load stored resolution prefs chrome.storage.sync.get('resolution', function(previousValue) { From 627494ed3c95580fec1b3077cd6723e59354f405 Mon Sep 17 00:00:00 2001 From: utopiafallen Date: Sat, 22 Oct 2022 15:34:56 -0700 Subject: [PATCH 03/28] Restore overrideEscFullscreen permission Otherwise, Esc breaks out of fullscreen instead of being sent to the streaming app. --- manifest.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index f4b9759c..2a509bbb 100644 --- a/manifest.json +++ b/manifest.json @@ -26,7 +26,8 @@ "pointerLock", "system.network", "fullscreen", - "power", { + "power", + "overrideEscFullscreen", { "socket": [ "tcp-connect", "resolve-host", From b88decd31fc820d35ba5f5f4a13e2817de7ec8fd Mon Sep 17 00:00:00 2001 From: utopiafallen Date: Sat, 22 Oct 2022 15:55:32 -0700 Subject: [PATCH 04/28] Fix black screen when starting game stream Adding fullscreen class to the #listener seems to fix the game stream getting stuck in a black screen. I suspect that #main-content isn't recomputing its layout when #listener is resized. --- static/js/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/static/js/index.js b/static/js/index.js index 13276b8d..c593308c 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -718,6 +718,7 @@ function playGameMode() { $("#main-navigation").hide(); $("#main-content").children().not("#listener, #loadingSpinner").hide(); $("#main-content").addClass("fullscreen"); + $("#listener").addClass("fullscreen"); fullscreenNaclModule(); $('#loadingSpinner').css('display', 'inline-block'); From d584fa998c22d8e99a680359d1945c634a6c0c97 Mon Sep 17 00:00:00 2001 From: utopiafallen Date: Sun, 23 Oct 2022 03:29:27 +0000 Subject: [PATCH 05/28] Updated Video Decode Shader with black crush mitigation logic Shader is compiling successfully, but the required data not yet hooked up. --- viddec.cpp | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/viddec.cpp b/viddec.cpp index 7993b244..a3c07918 100644 --- a/viddec.cpp +++ b/viddec.cpp @@ -18,6 +18,32 @@ static uint64_t s_LastPaintFinishedTime; #define assertNoGLError() assert(!glGetError()) +// Assume gl_FragColor is in sRGB space and do a poor approximate conversion to linear. +// After conversion to XYZ space, curve the Y value up to brighten dark values and +// then convert back to sRGB. +#define fragmentShader_BlackCrushMitigation() \ + "const vec3 CIE_X_FROM_RGB_WEIGHTS = vec3(0.4124f, 0.3576f, 0.1805f); \n" \ + "const vec3 CIE_Y_FROM_RGB_WEIGHTS = vec3(0.2126f, 0.7152f, 0.0722f); \n" \ + "const vec3 CIE_Z_FROM_RGB_WEIGHTS = vec3(0.0193f, 0.1192f, 0.9505f); \n" \ + "const vec3 R_FROM_CIEXYZ_WEIGHTS = vec3(3.2406f, -1.5372f, -0.4986f); \n" \ + "const vec3 G_FROM_CIEXYZ_WEIGHTS = vec3(-0.9689f, 1.8758f, 0.0415f); \n" \ + "const vec3 B_FROM_CIEXYZ_WEIGHTS = vec3(0.0557f, -0.2040f, 1.0570f); \n" \ + "const float TEXEL_WIDTH_HEIGHT = 0.0625f; \n" \ + "const float CURVE_TEXTURE_WIDTH = 16.0f; \n" \ + "const float CURVE_TEXTURE_HEIGHT = 16.0f; \n" \ + "vec3 linearRGB = texColor.rgb * texColor.rgb; \n" \ + "float cieX = dot(CIE_X_FROM_RGB_WEIGHTS, linearRGB); \n" \ + "float cieY = dot(CIE_Y_FROM_RGB_WEIGHTS, linearRGB); \n" \ + "float cieZ = dot(CIE_Z_FROM_RGB_WEIGHTS, linearRGB); \n" \ + "float curveTexCoord1D = cieY * (CURVE_TEXTURE_WIDTH * CURVE_TEXTURE_HEIGHT - 1.0f); \n" \ + "float curveTexCoord2DRowIdx = floor(curveTexCoord1D / CURVE_TEXTURE_WIDTH); \n" \ + "float curveTexCoord2DSubRowIdx = (curveTexCoord1D - curveTexCoord2DRowIdx * CURVE_TEXTURE_WIDTH); \n" \ + "vec2 curveTexCoord2D = vec2((curveTexCoord2DSubRowIdx + 0.5f) * TEXEL_WIDTH_HEIGHT, (curveTexCoord2DRowIdx + 0.5f) * TEXEL_WIDTH_HEIGHT); \n" \ + "float cieYCurved = texture2D(s_curveTexture, curveTexCoord2D).a; \n" \ + "vec3 cieXYZCurved = vec3(cieX, cieYCurved, cieZ); \n" \ + "vec3 linearRGBCurved = vec3(dot(R_FROM_CIEXYZ_WEIGHTS, cieXYZCurved), dot(G_FROM_CIEXYZ_WEIGHTS, cieXYZCurved), dot(B_FROM_CIEXYZ_WEIGHTS, cieXYZCurved)); \n" \ + "gl_FragColor.rgb = sqrt(linearRGBCurved);" + static const char k_VertexShader[] = "varying vec2 v_texCoord; \n" "attribute vec4 a_position; \n" @@ -33,9 +59,12 @@ static const char k_FragmentShader2D[] = "precision mediump float; \n" "varying vec2 v_texCoord; \n" "uniform sampler2D s_texture; \n" + "uniform sampler2D s_curveTexture; \n" "void main() \n" "{" - " gl_FragColor = texture2D(s_texture, v_texCoord); \n" + " vec4 texColor = texture2D(s_texture, v_texCoord); \n" + " gl_FragColor = texColor; \n" + fragmentShader_BlackCrushMitigation() "}"; static const char k_FragmentShaderRectangle[] = @@ -43,9 +72,12 @@ static const char k_FragmentShaderRectangle[] = "precision mediump float; \n" "varying vec2 v_texCoord; \n" "uniform sampler2DRect s_texture; \n" + "uniform sampler2D s_curveTexture; \n" "void main() \n" "{" - " gl_FragColor = texture2DRect(s_texture, v_texCoord).rgba; \n" + " vec4 texColor = texture2DRect(s_texture, v_texCoord).rgba; \n" + " gl_FragColor = texColor; \n" + fragmentShader_BlackCrushMitigation() "}"; static const char k_FragmentShaderExternal[] = @@ -53,9 +85,12 @@ static const char k_FragmentShaderExternal[] = "precision mediump float; \n" "varying vec2 v_texCoord; \n" "uniform samplerExternalOES s_texture; \n" + "uniform sampler2D s_curveTexture; \n" "void main() \n" "{" - " gl_FragColor = texture2D(s_texture, v_texCoord); \n" + " vec4 texColor = texture2D(s_texture, v_texCoord); \n" + " gl_FragColor = texColor; \n" + fragmentShader_BlackCrushMitigation() "}"; void MoonlightInstance::DidChangeFocus(bool got_focus) { From 291797f7caf6aa410848499295b209cfb09775e6 Mon Sep 17 00:00:00 2001 From: utopiafallen Date: Sun, 23 Oct 2022 05:32:37 +0000 Subject: [PATCH 06/28] More progress with shaders A lot of plumbing is set up but Chrome seems sensitive to certain OGL calls hanging the NaCl module. I don't understand what's happening but this is version at least draws the video stream again, even if it's messed up. --- moonlight.hpp | 4 +++ viddec.cpp | 98 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 90 insertions(+), 12 deletions(-) diff --git a/moonlight.hpp b/moonlight.hpp index 56a70fbd..d0ea311f 100644 --- a/moonlight.hpp +++ b/moonlight.hpp @@ -56,6 +56,8 @@ class MoonlightInstance : public pp::Instance, public pp::MouseLock { explicit MoonlightInstance(PP_Instance instance) : pp::Instance(instance), pp::MouseLock(this), + m_BlackCrushMitigationEnable(false), + m_curveTexture(-1u), m_HasNextPicture(false), m_IsPainting(false), m_OpusDecoder(NULL), @@ -187,6 +189,8 @@ class MoonlightInstance : public pp::Instance, public pp::MouseLock { Shader m_RectangleArbShader; Shader m_ExternalOesShader; PP_VideoPicture m_NextPicture; + bool m_BlackCrushMitigationEnable; + GLuint m_curveTexture; bool m_HasNextPicture; PP_VideoPicture m_CurrentPicture; bool m_IsPainting; diff --git a/viddec.cpp b/viddec.cpp index a3c07918..ed56990e 100644 --- a/viddec.cpp +++ b/viddec.cpp @@ -22,27 +22,27 @@ static uint64_t s_LastPaintFinishedTime; // After conversion to XYZ space, curve the Y value up to brighten dark values and // then convert back to sRGB. #define fragmentShader_BlackCrushMitigation() \ - "const vec3 CIE_X_FROM_RGB_WEIGHTS = vec3(0.4124f, 0.3576f, 0.1805f); \n" \ - "const vec3 CIE_Y_FROM_RGB_WEIGHTS = vec3(0.2126f, 0.7152f, 0.0722f); \n" \ - "const vec3 CIE_Z_FROM_RGB_WEIGHTS = vec3(0.0193f, 0.1192f, 0.9505f); \n" \ - "const vec3 R_FROM_CIEXYZ_WEIGHTS = vec3(3.2406f, -1.5372f, -0.4986f); \n" \ - "const vec3 G_FROM_CIEXYZ_WEIGHTS = vec3(-0.9689f, 1.8758f, 0.0415f); \n" \ - "const vec3 B_FROM_CIEXYZ_WEIGHTS = vec3(0.0557f, -0.2040f, 1.0570f); \n" \ - "const float TEXEL_WIDTH_HEIGHT = 0.0625f; \n" \ - "const float CURVE_TEXTURE_WIDTH = 16.0f; \n" \ - "const float CURVE_TEXTURE_HEIGHT = 16.0f; \n" \ + "vec3 CIE_X_FROM_RGB_WEIGHTS = vec3(0.4124, 0.3576, 0.1805); \n" \ + "vec3 CIE_Y_FROM_RGB_WEIGHTS = vec3(0.2126, 0.7152, 0.0722); \n" \ + "vec3 CIE_Z_FROM_RGB_WEIGHTS = vec3(0.0193, 0.1192, 0.9505); \n" \ + "vec3 R_FROM_CIEXYZ_WEIGHTS = vec3(3.2406, -1.5372, -0.4986); \n" \ + "vec3 G_FROM_CIEXYZ_WEIGHTS = vec3(-0.9689, 1.8758, 0.0415); \n" \ + "vec3 B_FROM_CIEXYZ_WEIGHTS = vec3(0.0557, -0.2040, 1.0570); \n" \ + "float TEXEL_WIDTH_HEIGHT = 0.0625; \n" \ + "float CURVE_TEXTURE_WIDTH = 16.0; \n" \ + "float CURVE_TEXTURE_HEIGHT = 16.0; \n" \ "vec3 linearRGB = texColor.rgb * texColor.rgb; \n" \ "float cieX = dot(CIE_X_FROM_RGB_WEIGHTS, linearRGB); \n" \ "float cieY = dot(CIE_Y_FROM_RGB_WEIGHTS, linearRGB); \n" \ "float cieZ = dot(CIE_Z_FROM_RGB_WEIGHTS, linearRGB); \n" \ - "float curveTexCoord1D = cieY * (CURVE_TEXTURE_WIDTH * CURVE_TEXTURE_HEIGHT - 1.0f); \n" \ + "float curveTexCoord1D = cieY * (CURVE_TEXTURE_WIDTH * CURVE_TEXTURE_HEIGHT - 1.0); \n" \ "float curveTexCoord2DRowIdx = floor(curveTexCoord1D / CURVE_TEXTURE_WIDTH); \n" \ "float curveTexCoord2DSubRowIdx = (curveTexCoord1D - curveTexCoord2DRowIdx * CURVE_TEXTURE_WIDTH); \n" \ - "vec2 curveTexCoord2D = vec2((curveTexCoord2DSubRowIdx + 0.5f) * TEXEL_WIDTH_HEIGHT, (curveTexCoord2DRowIdx + 0.5f) * TEXEL_WIDTH_HEIGHT); \n" \ + "vec2 curveTexCoord2D = vec2((curveTexCoord2DSubRowIdx + 0.5) * TEXEL_WIDTH_HEIGHT, (curveTexCoord2DRowIdx + 0.5) * TEXEL_WIDTH_HEIGHT); \n" \ "float cieYCurved = texture2D(s_curveTexture, curveTexCoord2D).a; \n" \ "vec3 cieXYZCurved = vec3(cieX, cieYCurved, cieZ); \n" \ "vec3 linearRGBCurved = vec3(dot(R_FROM_CIEXYZ_WEIGHTS, cieXYZCurved), dot(G_FROM_CIEXYZ_WEIGHTS, cieXYZCurved), dot(B_FROM_CIEXYZ_WEIGHTS, cieXYZCurved)); \n" \ - "gl_FragColor.rgb = sqrt(linearRGBCurved);" + "gl_FragColor = vec4(sqrt(linearRGBCurved), texColor.a);" static const char k_VertexShader[] = "varying vec2 v_texCoord; \n" @@ -93,6 +93,47 @@ static const char k_FragmentShaderExternal[] = fragmentShader_BlackCrushMitigation() "}"; + +static const unsigned char k_BlackCrushMitigationCurve[] = +{ + 0,4,6,8,10,11,12,13,14,15,16,17,18,19,20,21, + 22,23,24,24,25,25,26,26,27,27,28,28,29,29,30,31, + 32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, + 48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63, + 64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79, + 80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95, + 96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111, + 112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, + 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, + 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159, + 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175, + 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191, + 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207, + 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223, + 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239, + 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 +}; + +static const unsigned char k_IdentityCurve[] = +{ + 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, + 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, + 32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, + 48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63, + 64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79, + 80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95, + 96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111, + 112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, + 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, + 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159, + 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175, + 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191, + 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207, + 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223, + 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239, + 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 +}; + void MoonlightInstance::DidChangeFocus(bool got_focus) { // Request an IDR frame to dump the frame queue that may have // built up from the GL pipeline being stalled. @@ -109,6 +150,8 @@ bool MoonlightInstance::InitializeRenderingSurface(int width, int height) { if (!glInitializePPAPI(pp::Module::Get()->get_browser_interface())) { return false; } + + g_Instance->PostMessage(pp::Var("Initializing rendering surface.")); int32_t contextAttributes[] = { PP_GRAPHICS3DATTRIB_ALPHA_SIZE, 8, @@ -167,6 +210,21 @@ bool MoonlightInstance::InitializeRenderingSurface(int width, int height) { k_Vertices, GL_STATIC_DRAW); assertNoGLError(); + + if (m_curveTexture != -1u) + glDeleteTextures(1, &m_curveTexture); + glGenTextures(1, &m_curveTexture); + + glActiveTexture(GL_TEXTURE1); + glBindTexture(GL_TEXTURE_2D, m_curveTexture); + + GLint existingUnpackAlignment; + glGetIntegerv(GL_UNPACK_ALIGNMENT, &existingUnpackAlignment); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, 16, 16, 0, GL_ALPHA, GL_UNSIGNED_BYTE, m_BlackCrushMitigationEnable ? k_BlackCrushMitigationCurve : k_IdentityCurve); + glPixelStorei(GL_UNPACK_ALIGNMENT, existingUnpackAlignment); + + glActiveTexture(GL_TEXTURE0); g_Instance->m_Graphics3D.SwapBuffers(pp::BlockUntilComplete()); return true; @@ -324,6 +382,21 @@ void MoonlightInstance::CreateShader(GLuint program, GLenum type, GLuint shader = glCreateShader(type); glShaderSource(shader, 1, &source, &size); glCompileShader(shader); + + GLint compileSuccess; + glGetShaderiv(shader, GL_COMPILE_STATUS, &compileSuccess); + if (type == GL_FRAGMENT_SHADER && compileSuccess == GL_FALSE) + { + pp::Var response(std::string("Compile shader: \n") + source); + g_Instance->PostMessage(response); + + GLchar compileInfoLog[2048]; + GLsizei actualInfoLogLength; + glGetShaderInfoLog(shader, 2048, &actualInfoLogLength, compileInfoLog); + response = compileInfoLog; + g_Instance->PostMessage(response); + } + glAttachShader(program, shader); glDeleteShader(shader); } @@ -338,6 +411,7 @@ Shader MoonlightInstance::CreateProgram(const char* vertexShader, const char* fr glUseProgram(shader.program); glUniform1i(glGetUniformLocation(shader.program, "s_texture"), 0); + glUniform1i(glGetUniformLocation(shader.program, "s_curveTexture"), 1); assertNoGLError(); shader.texcoord_scale_location = glGetUniformLocation(shader.program, "v_scale"); From 411dcd2770a7e6d20ac3cce7f2d0b573d282d4d1 Mon Sep 17 00:00:00 2001 From: utopiafallen Date: Sun, 23 Oct 2022 05:52:43 +0000 Subject: [PATCH 07/28] Black crush mitigation disabled now works. Finally back to a no-op equivalent state. --- viddec.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/viddec.cpp b/viddec.cpp index ed56990e..33b52f56 100644 --- a/viddec.cpp +++ b/viddec.cpp @@ -218,6 +218,11 @@ bool MoonlightInstance::InitializeRenderingSurface(int width, int height) { glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, m_curveTexture); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + GLint existingUnpackAlignment; glGetIntegerv(GL_UNPACK_ALIGNMENT, &existingUnpackAlignment); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); @@ -482,8 +487,12 @@ void MoonlightInstance::PaintPicture(void) { // Only rebind our texture if we've changed since last time if (m_CurrentPicture.texture_id != s_LastTextureId || m_CurrentPicture.texture_target != originalTextureTarget) { + glActiveTexture(GL_TEXTURE0); glBindTexture(m_CurrentPicture.texture_target, m_CurrentPicture.texture_id); s_LastTextureId = m_CurrentPicture.texture_id; + + glActiveTexture(GL_TEXTURE1); + glBindTexture(GL_TEXTURE_2D, m_curveTexture); } // Draw the image From 1a0de99e25f3e6a1f80fcbf531e6632c245b5b8b Mon Sep 17 00:00:00 2001 From: utopiafallen Date: Sun, 23 Oct 2022 06:08:16 +0000 Subject: [PATCH 08/28] Hookup black crush mitigation to UI --- index.html | 10 ++++++++++ main.cpp | 6 ++++-- static/js/index.js | 28 +++++++++++++++++++++++++--- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 36c5953f..9ca43aff 100644 --- a/index.html +++ b/index.html @@ -89,6 +89,16 @@ +
+ +
+ Attempt to mitigate display black crush by boosting the brightness of very dark colors +
+
+
-
+
Attempt to mitigate display black crush by boosting the brightness of very dark colors
diff --git a/static/js/index.js b/static/js/index.js index 9884bdbb..b00163c6 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -947,9 +947,9 @@ function onWindowLoad() { }); chrome.storage.sync.get('blackCrushMitigate', function(previousValue) { - if (previousValue.mouseLock == null) { + if (previousValue.blackCrushMitigate == null) { document.querySelector('#blackCrushMitigateBtn').MaterialIconToggle.check(); - } else if (previousValue.mouseLock == false) { + } else if (previousValue.blackCrushMitigate == false) { document.querySelector('#blackCrushMitigateBtn').MaterialIconToggle.uncheck(); } else { document.querySelector('#blackCrushMitigateBtn').MaterialIconToggle.check(); diff --git a/viddec.cpp b/viddec.cpp index 524ec348..de9025bc 100644 --- a/viddec.cpp +++ b/viddec.cpp @@ -22,30 +22,20 @@ static uint64_t s_LastPaintFinishedTime; // After conversion to XYZ space, curve the Y value up to brighten dark values and // then convert back to sRGB. #define fragmentShader_BlackCrushMitigation() \ - "vec3 CIE_X_FROM_RGB_WEIGHTS = vec3(0.4124, 0.3576, 0.1805); \n" \ - "vec3 CIE_Y_FROM_RGB_WEIGHTS = vec3(0.2126, 0.7152, 0.0722); \n" \ - "vec3 CIE_Z_FROM_RGB_WEIGHTS = vec3(0.0193, 0.1192, 0.9505); \n" \ - "vec3 R_FROM_CIEXYZ_WEIGHTS = vec3(3.2406, -1.5372, -0.4986); \n" \ - "vec3 G_FROM_CIEXYZ_WEIGHTS = vec3(-0.9689, 1.8758, 0.0415); \n" \ - "vec3 B_FROM_CIEXYZ_WEIGHTS = vec3(0.0557, -0.2040, 1.0570); \n" \ - "float TEXEL_WIDTH_HEIGHT = 0.0625; \n" \ - "float CURVE_TEXTURE_WIDTH = 16.0; \n" \ - "float CURVE_TEXTURE_HEIGHT = 16.0; \n" \ - "vec3 linearRGB = texColor.rgb * texColor.rgb; \n" \ - "float cieX = dot(CIE_X_FROM_RGB_WEIGHTS, linearRGB); \n" \ - "float cieY = dot(CIE_Y_FROM_RGB_WEIGHTS, linearRGB); \n" \ - "float cieZ = dot(CIE_Z_FROM_RGB_WEIGHTS, linearRGB); \n" \ - "float cieXYZSum = cieX + cieY + cieZ; \n" \ - "vec2 cie_xy = vec2( cieX / cieXYZSum, cieY / cieXYZSum ); \n" \ - "float curveTexCoord1D = cieY * (CURVE_TEXTURE_WIDTH * CURVE_TEXTURE_HEIGHT - 1.0); \n" \ - "float curveTexCoord2DRowIdx = floor(curveTexCoord1D / CURVE_TEXTURE_WIDTH); \n" \ - "float curveTexCoord2DSubRowIdx = (curveTexCoord1D - curveTexCoord2DRowIdx * CURVE_TEXTURE_WIDTH); \n" \ - "vec2 curveTexCoord2D = vec2((curveTexCoord2DSubRowIdx + 0.5) * TEXEL_WIDTH_HEIGHT, (curveTexCoord2DRowIdx + 0.5) * TEXEL_WIDTH_HEIGHT); \n" \ - "float cieYCurved = texture2D(s_curveTexture, curveTexCoord2D).a; \n" \ - "float cie_xy_conversionFactor = (cieYCurved / cie_xy.y); \n" \ - "vec3 cieXYZCurved = vec3( cie_xy_conversionFactor * cie_xy.x, cieYCurved, cie_xy_conversionFactor * (1.0 - cie_xy.x - cie_xy.y)); \n" \ - "vec3 linearRGBCurved = vec3(dot(R_FROM_CIEXYZ_WEIGHTS, cieXYZCurved), dot(G_FROM_CIEXYZ_WEIGHTS, cieXYZCurved), dot(B_FROM_CIEXYZ_WEIGHTS, cieXYZCurved)); \n" \ - "gl_FragColor = vec4(sqrt(linearRGBCurved), texColor.a);" + "vec3 CIE_Y_FROM_RGB_WEIGHTS = vec3(0.2126, 0.7152, 0.0722); \n" \ + "float TEXEL_WIDTH_HEIGHT = 0.0625; \n" \ + "float CURVE_TEXTURE_WIDTH = 16.0; \n" \ + "float CURVE_TEXTURE_HEIGHT = 16.0; \n" \ + "vec3 gammaRGB = texColor.rgb; \n" \ + "float cieY = dot(CIE_Y_FROM_RGB_WEIGHTS, gammaRGB); \n" \ + "float curveTexCoord1D = cieY * (CURVE_TEXTURE_WIDTH * CURVE_TEXTURE_HEIGHT - 1.0); \n" \ + "float curveTexCoord2DRowIdx = floor(curveTexCoord1D / CURVE_TEXTURE_WIDTH); \n" \ + "float curveTexCoord2DSubRowIdx = (curveTexCoord1D - curveTexCoord2DRowIdx * CURVE_TEXTURE_WIDTH); \n" \ + "vec2 curveTexCoord2D = vec2((curveTexCoord2DSubRowIdx + 0.5) * TEXEL_WIDTH_HEIGHT, (curveTexCoord2DRowIdx + 0.5) * TEXEL_WIDTH_HEIGHT); \n" \ + "float cieYCurved = texture2D(s_curveTexture, curveTexCoord2D).a; \n" \ + "float rgbScale = (cieY == 0.0) ? 1.0 : cieYCurved / cieY; \n" \ + "float rgbOffset = (cieY == 0.0) ? cieYCurved : 0.0; \n" \ + "gl_FragColor = vec4(gammaRGB * rgbScale + vec3(rgbOffset, rgbOffset, rgbOffset), texColor.a);" static const char k_VertexShader[] = "varying vec2 v_texCoord; \n" @@ -99,12 +89,12 @@ static const char k_FragmentShaderExternal[] = static const unsigned char k_BlackCrushMitigationCurve[] = { - 0,4,6,8,10,11,12,13,14,15,16,17,18,19,20,21, - 22,23,24,24,25,25,26,26,27,27,28,28,29,29,30,31, - 32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, - 48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63, - 64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79, - 80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95, + 16,16,17,18,19,20,20,21,22,23,24,24,25,26,27,28, + 28,29,30,31,32,32,33,34,35,36,36,37,38,39,40,40, + 41,42,43,44,44,45,46,47,48,48,49,50,51,54,54,55, + 56,57,58,59,59,60,61,62,63,63,64,65,66,67,67,68, + 69,70,71,71,72,73,74,75,75,76,77,78,79,79,80,81, + 82,83,83,84,85,86,87,87,88,89,90,91,92,93,94,95, 96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111, 112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, From a6d6f9ede9b80a62bd2a58ff1a6966eda61fb389 Mon Sep 17 00:00:00 2001 From: utopiafallen Date: Fri, 28 Oct 2022 08:31:14 +0000 Subject: [PATCH 13/28] Fix false colors Video compression can introduce false colors since all compressors are lossy, and when that happens, the false colors can be emphasized by the black crush mitigation. To fix this, the shader explicitly neutralizes pixels below a threshold (currently 4/255) before applying any compensation curves. --- viddec.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/viddec.cpp b/viddec.cpp index de9025bc..55797d0e 100644 --- a/viddec.cpp +++ b/viddec.cpp @@ -18,9 +18,15 @@ static uint64_t s_LastPaintFinishedTime; #define assertNoGLError() assert(!glGetError()) -// Assume gl_FragColor is in sRGB space and do a poor approximate conversion to linear. -// After conversion to XYZ space, curve the Y value up to brighten dark values and -// then convert back to sRGB. +// Given RGB values in gamma space, compute per-pixel luminance and then apply a correction curve +// to boost near black values. Working in gamma space is important because gamma corrected (OETF +// adjusted) values allocate far more bits to dimmer values than linear because the human visual +// system is more sensitive to changes in darks than in lights (e.g. sRGB's OETF effectively +// allocates 50% of the 0-255 bit values to represent the 0-0.25 linear light values). +// +// One thing to watch out for is that video encoding can introduce false color in near black values +// and that will be emphasized when trying to apply the curve so we manually neutralize near black +// values to prevent introduction of false color. #define fragmentShader_BlackCrushMitigation() \ "vec3 CIE_Y_FROM_RGB_WEIGHTS = vec3(0.2126, 0.7152, 0.0722); \n" \ "float TEXEL_WIDTH_HEIGHT = 0.0625; \n" \ @@ -32,10 +38,11 @@ static uint64_t s_LastPaintFinishedTime; "float curveTexCoord2DRowIdx = floor(curveTexCoord1D / CURVE_TEXTURE_WIDTH); \n" \ "float curveTexCoord2DSubRowIdx = (curveTexCoord1D - curveTexCoord2DRowIdx * CURVE_TEXTURE_WIDTH); \n" \ "vec2 curveTexCoord2D = vec2((curveTexCoord2DSubRowIdx + 0.5) * TEXEL_WIDTH_HEIGHT, (curveTexCoord2DRowIdx + 0.5) * TEXEL_WIDTH_HEIGHT); \n" \ - "float cieYCurved = texture2D(s_curveTexture, curveTexCoord2D).a; \n" \ + "float cieYCurved = texture2D(s_curveTexture, curveTexCoord2D).a; \n" \ "float rgbScale = (cieY == 0.0) ? 1.0 : cieYCurved / cieY; \n" \ "float rgbOffset = (cieY == 0.0) ? cieYCurved : 0.0; \n" \ - "gl_FragColor = vec4(gammaRGB * rgbScale + vec3(rgbOffset, rgbOffset, rgbOffset), texColor.a);" + "gammaRGB = (cieY <= 0.015625) ? vec3(cieY, cieY, cieY) : gammaRGB; \n" \ + "gl_FragColor = vec4(gammaRGB * rgbScale + vec3(rgbOffset, rgbOffset, rgbOffset), texColor.a); \n" static const char k_VertexShader[] = "varying vec2 v_texCoord; \n" @@ -54,7 +61,7 @@ static const char k_FragmentShader2D[] = "uniform sampler2D s_texture; \n" "uniform sampler2D s_curveTexture; \n" "void main() \n" - "{" + "{ \n" " vec4 texColor = texture2D(s_texture, v_texCoord); \n" " gl_FragColor = texColor; \n" fragmentShader_BlackCrushMitigation() @@ -67,7 +74,7 @@ static const char k_FragmentShaderRectangle[] = "uniform sampler2DRect s_texture; \n" "uniform sampler2D s_curveTexture; \n" "void main() \n" - "{" + "{ \n" " vec4 texColor = texture2DRect(s_texture, v_texCoord).rgba; \n" " gl_FragColor = texColor; \n" fragmentShader_BlackCrushMitigation() @@ -80,7 +87,7 @@ static const char k_FragmentShaderExternal[] = "uniform samplerExternalOES s_texture; \n" "uniform sampler2D s_curveTexture; \n" "void main() \n" - "{" + "{ \n" " vec4 texColor = texture2D(s_texture, v_texCoord); \n" " gl_FragColor = texColor; \n" fragmentShader_BlackCrushMitigation() From deaa24148aec1cc6bb7429d4b6b00a390018e6d4 Mon Sep 17 00:00:00 2001 From: utopiafallen Date: Tue, 1 Nov 2022 06:50:47 +0000 Subject: [PATCH 14/28] Better fix for corrupted colors Turns out, the supplied texture can contain negative RGB values. I'm assuming that compression artifacts are causing the invalid channel values so now I make sure to clamp input RGB to [0,1] range before computing lookup coordinates for the gamma ramp. Also simplified the gamma index to be based on max RGB value instead of luminance. Just seeing if this produces more visually pleasing results. --- viddec.cpp | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/viddec.cpp b/viddec.cpp index 55797d0e..7752f6ed 100644 --- a/viddec.cpp +++ b/viddec.cpp @@ -24,25 +24,32 @@ static uint64_t s_LastPaintFinishedTime; // system is more sensitive to changes in darks than in lights (e.g. sRGB's OETF effectively // allocates 50% of the 0-255 bit values to represent the 0-0.25 linear light values). // -// One thing to watch out for is that video encoding can introduce false color in near black values -// and that will be emphasized when trying to apply the curve so we manually neutralize near black -// values to prevent introduction of false color. +// One thing to watch out for is that video compression can introduce negative RGB values. #define fragmentShader_BlackCrushMitigation() \ "vec3 CIE_Y_FROM_RGB_WEIGHTS = vec3(0.2126, 0.7152, 0.0722); \n" \ "float TEXEL_WIDTH_HEIGHT = 0.0625; \n" \ "float CURVE_TEXTURE_WIDTH = 16.0; \n" \ "float CURVE_TEXTURE_HEIGHT = 16.0; \n" \ - "vec3 gammaRGB = texColor.rgb; \n" \ - "float cieY = dot(CIE_Y_FROM_RGB_WEIGHTS, gammaRGB); \n" \ - "float curveTexCoord1D = cieY * (CURVE_TEXTURE_WIDTH * CURVE_TEXTURE_HEIGHT - 1.0); \n" \ + "vec3 gammaRGB = max(texColor.rgb, vec3(0,0,0)); \n" \ + "float maxRGB = max(gammaRGB.r, max(gammaRGB.g, gammaRGB.b)); \n"\ + "float curveTexCoord1D = maxRGB * (CURVE_TEXTURE_WIDTH * CURVE_TEXTURE_HEIGHT - 1.0); \n" \ "float curveTexCoord2DRowIdx = floor(curveTexCoord1D / CURVE_TEXTURE_WIDTH); \n" \ "float curveTexCoord2DSubRowIdx = (curveTexCoord1D - curveTexCoord2DRowIdx * CURVE_TEXTURE_WIDTH); \n" \ "vec2 curveTexCoord2D = vec2((curveTexCoord2DSubRowIdx + 0.5) * TEXEL_WIDTH_HEIGHT, (curveTexCoord2DRowIdx + 0.5) * TEXEL_WIDTH_HEIGHT); \n" \ - "float cieYCurved = texture2D(s_curveTexture, curveTexCoord2D).a; \n" \ - "float rgbScale = (cieY == 0.0) ? 1.0 : cieYCurved / cieY; \n" \ - "float rgbOffset = (cieY == 0.0) ? cieYCurved : 0.0; \n" \ - "gammaRGB = (cieY <= 0.015625) ? vec3(cieY, cieY, cieY) : gammaRGB; \n" \ + "float maxRGBCurved = texture2D(s_curveTexture, curveTexCoord2D).a; \n" \ + "float rgbScale = (maxRGB == 0.0) ? 1.0 : maxRGBCurved / maxRGB; \n" \ + "float rgbOffset = (maxRGB == 0.0) ? maxRGBCurved : 0.0; \n" \ "gl_FragColor = vec4(gammaRGB * rgbScale + vec3(rgbOffset, rgbOffset, rgbOffset), texColor.a); \n" + //"float cieY = dot(CIE_Y_FROM_RGB_WEIGHTS, gammaRGB); \n" \ + //"float curveTexCoord1D = cieY * (CURVE_TEXTURE_WIDTH * CURVE_TEXTURE_HEIGHT - 1.0); \n" \ + //"float curveTexCoord2DRowIdx = floor(curveTexCoord1D / CURVE_TEXTURE_WIDTH); \n" \ + //"float curveTexCoord2DSubRowIdx = (curveTexCoord1D - curveTexCoord2DRowIdx * CURVE_TEXTURE_WIDTH); \n" \ + //"vec2 curveTexCoord2D = vec2((curveTexCoord2DSubRowIdx + 0.5) * TEXEL_WIDTH_HEIGHT, (curveTexCoord2DRowIdx + 0.5) * TEXEL_WIDTH_HEIGHT); \n" \ + //"float cieYCurved = texture2D(s_curveTexture, curveTexCoord2D).a; \n" \ + //"float rgbScale = (cieY == 0.0) ? 1.0 : cieYCurved / cieY; \n" \ + //"float rgbOffset = (cieY == 0.0) ? cieYCurved : 0.0; \n" \ + //"gammaRGB = mix(vec3(cieY, cieY, cieY), gammaRGB, min( cieY / 0.03125, 1.0 )); \n" \ + //"gl_FragColor = vec4(gammaRGB * rgbScale + vec3(rgbOffset, rgbOffset, rgbOffset), texColor.a); \n" static const char k_VertexShader[] = "varying vec2 v_texCoord; \n" @@ -114,6 +121,27 @@ static const unsigned char k_BlackCrushMitigationCurve[] = 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; +/* +static const unsigned char k_BlackCrushMitigationCurve[] = +{ + 0,2,3,4,5,6,7,8,10,11,12,13,14,15,16,18, + 19,20,21,22,24,25,26,27,29,30,31,32,34,35,36,37, + 39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54, + 55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70, + 70,71,71,72,72,73,73,74,74,75,75,76,76,77,78,79, + 80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95, + 96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111, + 112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, + 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, + 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159, + 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175, + 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191, + 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207, + 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223, + 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239, + 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 +};*/ + static const unsigned char k_IdentityCurve[] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, From 96818908bea95c49443370b48b606418d90bbe75 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Mon, 31 Oct 2022 17:34:01 -0500 Subject: [PATCH 15/28] Plumb moonlight-common-c log messages into the console --- connectionlistener.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/connectionlistener.cpp b/connectionlistener.cpp index bfc79f86..3174a18d 100644 --- a/connectionlistener.cpp +++ b/connectionlistener.cpp @@ -45,9 +45,14 @@ void MoonlightInstance::ClDisplayTransientMessage(const char* message) { void MoonlightInstance::ClLogMessage(const char* format, ...) { va_list va; + char message[1024]; + va_start(va, format); - vfprintf(stderr, format, va); + vsnprintf(message, sizeof(message), format, va); va_end(va); + + pp::Var response(std::string("LogMsg: ") + std::string(message)); + g_Instance->PostMessage(response); } CONNECTION_LISTENER_CALLBACKS MoonlightInstance::s_ClCallbacks = { From 842e8695f6b6ede860bb1dc7a75a4bdb3d24a78d Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Mon, 31 Oct 2022 17:54:09 -0500 Subject: [PATCH 16/28] Plumb RTSP session URL into LiStartConnection() --- main.cpp | 11 ++++++++--- moonlight.hpp | 1 + static/js/index.js | 6 ++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/main.cpp b/main.cpp index 20dc2cde..a5ccfd57 100644 --- a/main.cpp +++ b/main.cpp @@ -130,6 +130,7 @@ void* MoonlightInstance::ConnectionThreadFunc(void* context) { serverInfo.address = me->m_Host.c_str(); serverInfo.serverInfoAppVersion = me->m_AppVersion.c_str(); serverInfo.serverInfoGfeVersion = me->m_GfeVersion.c_str(); + serverInfo.rtspSessionUrl = me->m_RtspUrl.c_str(); err = LiStartConnection(&serverInfo, &me->m_StreamConfig, @@ -201,9 +202,10 @@ void MoonlightInstance::HandleStartStream(int32_t callbackId, pp::VarArray args) std::string rikey = args.Get(5).AsString(); std::string rikeyid = args.Get(6).AsString(); std::string mouse_lock = args.Get(7).AsString(); - std::string blackCrushMitigationEnable = args.Get(8).AsString(); - std::string appversion = args.Get(9).AsString(); - std::string gfeversion = args.Get(10).AsString(); + std::string appversion = args.Get(8).AsString(); + std::string gfeversion = args.Get(9).AsString(); + std::string rtspurl = args.Get(10).AsString(); + std::string blackCrushMitigationEnable = args.Get(11)).AsString(); pp::Var response("Setting stream width to: " + width); PostMessage(response); @@ -225,6 +227,8 @@ void MoonlightInstance::HandleStartStream(int32_t callbackId, pp::VarArray args) PostMessage(response); response = ("Setting mouse lock to: " + mouse_lock); PostMessage(response); + response = ("Setting RTSP URL to: " + rtspurl); + PostMessage(response); response = ("Setting black crush mitigation to: " + blackCrushMitigationEnable); PostMessage(response); @@ -251,6 +255,7 @@ void MoonlightInstance::HandleStartStream(int32_t callbackId, pp::VarArray args) m_Host = host; m_AppVersion = appversion; m_GfeVersion = gfeversion; + m_RtspUrl = rtspurl; m_MouseLockingFeatureEnabled = stoi(mouse_lock); m_BlackCrushMitigationEnable = stoi(blackCrushMitigationEnable); diff --git a/moonlight.hpp b/moonlight.hpp index ec29711f..f297779c 100644 --- a/moonlight.hpp +++ b/moonlight.hpp @@ -179,6 +179,7 @@ class MoonlightInstance : public pp::Instance, public pp::MouseLock { std::string m_Host; std::string m_AppVersion; std::string m_GfeVersion; + std::string m_RtspUrl; bool m_MouseLockingFeatureEnabled; STREAM_CONFIGURATION m_StreamConfig; bool m_Running; diff --git a/static/js/index.js b/static/js/index.js index b00163c6..15e9dcab 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -664,7 +664,8 @@ function startGame(host, appID) { } sendMessage('startRequest', [host.address, streamWidth, streamHeight, frameRate, - bitrate.toString(), rikey, rikeyid.toString(), mouse_lock_enabled, black_crush_mitigation_enabled, host.appVersion, host.gfeVersion + bitrate.toString(), rikey, rikeyid.toString(), mouse_lock_enabled, host.appVersion, host.gfeVersion, + $root.find('sessionUrl0').text().trim(), black_crush_mitigation_enabled ]); }, function(failedResumeApp) { console.eror('%c[index.js, startGame]', 'color:green;', 'Failed to resume the app! Returned error was' + failedResumeApp); @@ -701,7 +702,8 @@ function startGame(host, appID) { } sendMessage('startRequest', [host.address, streamWidth, streamHeight, frameRate, - bitrate.toString(), rikey, rikeyid.toString(), mouse_lock_enabled, black_crush_mitigation_enabled, host.appVersion + bitrate.toString(), rikey, rikeyid.toString(), mouse_lock_enabled, host.appVersion, + $root.find('sessionUrl0').text().trim(), black_crush_mitigation_enabled ]); }, function(failedLaunchApp) { console.error('%c[index.js, launchApp]', 'color: green;', 'Failed to launch app width id: ' + appID + '\nReturned error was: ' + failedLaunchApp); From 373524aecad68cc296078955788fcfd2a770f8b1 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Mon, 31 Oct 2022 18:00:04 -0500 Subject: [PATCH 17/28] Fix passing GFE version to LiStartConnection() --- static/js/index.js | 2 +- static/js/utils.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/js/index.js b/static/js/index.js index 15e9dcab..3a261478 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -702,7 +702,7 @@ function startGame(host, appID) { } sendMessage('startRequest', [host.address, streamWidth, streamHeight, frameRate, - bitrate.toString(), rikey, rikeyid.toString(), mouse_lock_enabled, host.appVersion, + bitrate.toString(), rikey, rikeyid.toString(), mouse_lock_enabled, host.appVersion, host.gfeVersion, $root.find('sessionUrl0').text().trim(), black_crush_mitigation_enabled ]); }, function(failedLaunchApp) { diff --git a/static/js/utils.js b/static/js/utils.js index 9e47562c..e28e6ee5 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -95,7 +95,7 @@ function NvHTTP(address, clientUid, userEnteredAddress = '') { this.userEnteredAddress = userEnteredAddress; // if the user entered an address, we keep it on hand to try when polling this.serverUid = ''; - this.GfeVersion = ''; + this.gfeVersion = ''; this.supportedDisplayModes = {}; // key: y-resolution:x-resolution, value: array of supported framerates (only ever seen 30 or 60, here) this.gputype = ''; this.numofapps = 0; @@ -261,7 +261,7 @@ NvHTTP.prototype = { string += 'current game: ' + this.currentGame + '\r\n'; string += 'server major version: ' + this.serverMajorVersion + '\r\n'; string += 'appversion: ' + this.appVersion + '\r\n'; - string += 'GFE version: ' + this.GfeVersion + '\r\n'; + string += 'GFE version: ' + this.gfeVersion + '\r\n'; string += 'gpu type: ' + this.gputype + '\r\n'; string += 'number of apps: ' + this.numofapps + '\r\n'; string += 'supported display modes: ' + '\r\n'; @@ -301,7 +301,7 @@ NvHTTP.prototype = { } try { // these aren't critical for functionality, and don't necessarily exist in older GFE versions. - this.GfeVersion = $root.find('GfeVersion').text().trim(); + this.gfeVersion = $root.find('GfeVersion').text().trim(); this.gputype = $root.find('gputype').text().trim(); this.numofapps = $root.find('numofapps').text().trim(); // now for the hard part: parsing the supported streaming From 795e8fc4329f0469b2615e71cf0335725d8d061e Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Mon, 31 Oct 2022 18:15:23 -0500 Subject: [PATCH 18/28] Update moonlight-common-c --- moonlight-common-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moonlight-common-c b/moonlight-common-c index 92400909..6418c631 160000 --- a/moonlight-common-c +++ b/moonlight-common-c @@ -1 +1 @@ -Subproject commit 9240090983d588bf7c40138c9a23ac1403c551f7 +Subproject commit 6418c631baeea2c1227594a2d554d77e7c8995eb From 3596b18295778e44a604c96d8fb5cf80cad86c55 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Mon, 31 Oct 2022 18:15:36 -0500 Subject: [PATCH 19/28] Fix typo in error path --- static/js/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/index.js b/static/js/index.js index 3a261478..699bd0e7 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -668,7 +668,7 @@ function startGame(host, appID) { $root.find('sessionUrl0').text().trim(), black_crush_mitigation_enabled ]); }, function(failedResumeApp) { - console.eror('%c[index.js, startGame]', 'color:green;', 'Failed to resume the app! Returned error was' + failedResumeApp); + console.error('%c[index.js, startGame]', 'color:green;', 'Failed to resume the app! Returned error was' + failedResumeApp); showApps(host); return; }); From dfc0ab5e93a724258578b2c5566bf91b3d1c10cf Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 6 Nov 2022 19:45:34 -0600 Subject: [PATCH 20/28] Update moonlight-common-c --- moonlight-common-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moonlight-common-c b/moonlight-common-c index 6418c631..50c0a51b 160000 --- a/moonlight-common-c +++ b/moonlight-common-c @@ -1 +1 @@ -Subproject commit 6418c631baeea2c1227594a2d554d77e7c8995eb +Subproject commit 50c0a51b10ecc5b3415ea78c21d96d679e2288f9 From 0dfe4c370ff00f7a76b233390d0d989d20dd16e2 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 6 Nov 2022 20:20:45 -0600 Subject: [PATCH 21/28] Improvements to haptic error handling - Move gamepad index check to the JS side to simplify the code - Handle gamepads that don't support haptics --- gamepad.cpp | 8 -------- static/js/messages.js | 5 ++++- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/gamepad.cpp b/gamepad.cpp index c18dff87..eac6979a 100644 --- a/gamepad.cpp +++ b/gamepad.cpp @@ -132,14 +132,6 @@ void MoonlightInstance::PollGamepads() { void MoonlightInstance::ClControllerRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor) { - PP_GamepadsSampleData gamepadData; - g_Instance->m_GamepadApi->Sample(g_Instance->pp_instance(), &gamepadData); - - // We must determine which gamepads are connected before sending rumble events. - const unsigned short activeGamepadMask = static_cast(GetActiveGamepadMask(gamepadData)); - if ((activeGamepadMask & (1 << controllerNumber)) == 0) - return; - const float weakMagnitude = static_cast(highFreqMotor) / static_cast(UINT16_MAX); const float strongMagnitude = static_cast(lowFreqMotor) / static_cast(UINT16_MAX); diff --git a/static/js/messages.js b/static/js/messages.js index 3a0970dc..b6348ce8 100644 --- a/static/js/messages.js +++ b/static/js/messages.js @@ -87,7 +87,10 @@ function handleMessage(msg) { const weakMagnitude = parseFloat(eventData[1]); const strongMagnitude = parseFloat(eventData[2]); console.log("Playing rumble on gamepad " + gamepadIdx + " with weakMagnitude " + weakMagnitude + " and strongMagnitude " + strongMagnitude); - navigator.getGamepads()[gamepadIdx].vibrationActuator.playEffect('dual-rumble', { + + // We may not actually have a gamepad at this index. + // Even if we do have a gamepad, it may not have a vibrationActuator associated with it. + navigator.getGamepads()[gamepadIdx]?.vibrationActuator?.playEffect('dual-rumble', { startDelay: 0, duration: 5000, // Moonlight should be sending another rumble event when stopping. weakMagnitude: weakMagnitude, From f4468cd3b7a9ddfd8e20b75b6f9f3e05e367793f Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 6 Nov 2022 21:18:35 -0600 Subject: [PATCH 22/28] Fix mysterious Y offset in input coordinates --- input.cpp | 5 +---- static/js/index.js | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/input.cpp b/input.cpp index 7f096255..981f2172 100644 --- a/input.cpp +++ b/input.cpp @@ -283,11 +283,8 @@ bool MoonlightInstance::HandleInputEvent(const pp::InputEvent& event) { sqrt(pow(m_LastTouchUpPoint.x() - touchPoint.x(), 2) + pow(m_LastTouchUpPoint.y() - touchPoint.y(), 2)) > TOUCH_DEAD_ZONE_RADIUS) { // Scale the touch coordinates to the video rect - // - // For some reason, the x coordinate is already relative to the plugin rect, - // while the y coordinate is not. No clue why that is the case but oh well... short x = MIN(MAX(touchPoint.x(), 0), m_PluginRect.width()); - short y = MIN(MAX(touchPoint.y() - m_PluginRect.y(), 0), m_PluginRect.height()); + short y = MIN(MAX(touchPoint.y(), 0), m_PluginRect.height()); // Update the mouse position prior to sending the button down LiSendMousePositionEvent(x, y, m_PluginRect.width(), m_PluginRect.height()); diff --git a/static/js/index.js b/static/js/index.js index 699bd0e7..41a47257 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -743,7 +743,7 @@ function fullscreenNaclModule() { var module = $("#nacl_module")[0]; module.width = zoom * streamWidth; module.height = zoom * streamHeight; - module.style.paddingTop = ((screenHeight - module.height) / 2) + "px"; + module.style.marginTop = ((screenHeight - module.height) / 2) + "px"; } function stopGameWithConfirmation() { From 9f789336d639ab98f41ead36e281769c25bf83f7 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 6 Nov 2022 21:23:36 -0600 Subject: [PATCH 23/28] Fix mouse position glitches near the edges in absolute mode --- input.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/input.cpp b/input.cpp index 981f2172..0db7f609 100644 --- a/input.cpp +++ b/input.cpp @@ -148,7 +148,10 @@ void MoonlightInstance::ReportMouseMovement() { LiSendMouseMoveEvent(m_MouseDeltaX, m_MouseDeltaY); m_MouseDeltaX = m_MouseDeltaY = 0; } else if (m_MousePositionX != 0 || m_MousePositionY != 0) { - LiSendMousePositionEvent(m_MousePositionX, m_MousePositionY, m_PluginRect.width(), m_PluginRect.height()); + // Clamp the input coordinates to the plugin area + short x = MIN(MAX(m_MousePositionX, 0), m_PluginRect.width()); + short y = MIN(MAX(m_MousePositionY, 0), m_PluginRect.height()); + LiSendMousePositionEvent(x, y, m_PluginRect.width(), m_PluginRect.height()); m_MousePositionX = 0; m_MousePositionY = 0; } From b40562b8fdf0819c37dab7447a4d89d2ef18bcc2 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 6 Nov 2022 21:42:58 -0600 Subject: [PATCH 24/28] Fix last frame from previous session displaying when starting a new one --- static/js/index.js | 3 +++ static/js/messages.js | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/static/js/index.js b/static/js/index.js index 41a47257..59ed7b2e 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -724,6 +724,9 @@ function playGameMode() { $("#main-content").addClass("fullscreen"); $("#listener").addClass("fullscreen"); + // Hide the NaCl module until the first frame is rendered + $("#nacl_module")[0].style.opacity = 0.0 + fullscreenNaclModule(); $('#loadingSpinner').css('display', 'inline-block'); } diff --git a/static/js/messages.js b/static/js/messages.js index b6348ce8..c9ecf42d 100644 --- a/static/js/messages.js +++ b/static/js/messages.js @@ -80,7 +80,8 @@ function handleMessage(msg) { // FIXME: Really use a dialog snackbarLogLong(msg.data.replace('DialogMsg: ', '')); } else if (msg.data === 'displayVideo') { - $("#listener").addClass("fullscreen"); + // Show the video stream now + $("#nacl_module")[0].style.opacity = 1.0; } else if (msg.data.indexOf('controllerRumble: ' ) === 0) { const eventData = msg.data.split( ' ' )[1].split(','); const gamepadIdx = parseInt(eventData[0]); From acb4c974cdf1c0e5d53d8422cdf440ba99ac94fb Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 6 Nov 2022 21:44:33 -0600 Subject: [PATCH 25/28] Fix garbled audio playing at the start of each stream after the first one --- auddec.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/auddec.cpp b/auddec.cpp index 798ad5a3..2cccc4f6 100644 --- a/auddec.cpp +++ b/auddec.cpp @@ -11,8 +11,8 @@ // at a time. static short s_CircularBuffer[CIRCULAR_BUFFER_SIZE][FRAME_SIZE * MAX_CHANNEL_COUNT]; -static int s_ReadIndex = 0; -static int s_WriteIndex = 0; +static int s_ReadIndex; +static int s_WriteIndex; static void AudioPlayerSampleCallback(void* samples, uint32_t buffer_size, void* data) { // It should only ask us for complete buffers @@ -36,6 +36,9 @@ static void AudioPlayerSampleCallback(void* samples, uint32_t buffer_size, void* int MoonlightInstance::AudDecInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig, void* context, int flags) { int rc; + + // Reset the ring buffer to empty + s_ReadIndex = s_WriteIndex = 0; g_Instance->m_OpusDecoder = opus_multistream_decoder_create(opusConfig->sampleRate, opusConfig->channelCount, From 26a95d38eff8b871431250ae2e9631cfeb277b71 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 6 Nov 2022 22:10:50 -0600 Subject: [PATCH 26/28] Add release build script --- do-release.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 do-release.sh diff --git a/do-release.sh b/do-release.sh new file mode 100755 index 00000000..55996f65 --- /dev/null +++ b/do-release.sh @@ -0,0 +1,16 @@ +fail() +{ + echo "$1" 1>&2 + exit 1 +} + +git diff-index --quiet HEAD -- || fail "Release builds must not have unstaged changes!" + +rm moonlight-chrome.zip +make clean || fail "Clean failed" +make -j$(nproc) || fail "Build failed" + + +zip moonlight-chrome.zip -r . -i pnacl/Release/moonlight-chrome.* -i manifest.json -i index.html -i LICENSE || fail "Zip failed" +zip moonlight-chrome.zip -r icons || fail "Zip failed" +zip moonlight-chrome.zip -r static || fail "Zip failed" \ No newline at end of file From 4a89829531261de8f30d9333d3aed55401c35489 Mon Sep 17 00:00:00 2001 From: utopiafallen Date: Mon, 7 Nov 2022 08:12:57 +0000 Subject: [PATCH 27/28] Fix stray ')' introduced when rebasing --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index a5ccfd57..bd5ca74b 100644 --- a/main.cpp +++ b/main.cpp @@ -205,7 +205,7 @@ void MoonlightInstance::HandleStartStream(int32_t callbackId, pp::VarArray args) std::string appversion = args.Get(8).AsString(); std::string gfeversion = args.Get(9).AsString(); std::string rtspurl = args.Get(10).AsString(); - std::string blackCrushMitigationEnable = args.Get(11)).AsString(); + std::string blackCrushMitigationEnable = args.Get(11).AsString(); pp::Var response("Setting stream width to: " + width); PostMessage(response); From f4eaaa096ac609e7fb85b4cb1a909e02bbb72c09 Mon Sep 17 00:00:00 2001 From: utopiafallen Date: Tue, 3 Jan 2023 21:26:04 +0000 Subject: [PATCH 28/28] Skip black crush mitigation in shader when mitigation is disabled Getting weird artifacting with black crush enabled on high contrast areas, probably need to tune the curve behavior to better hide compression artifacts. For now, the shader fully skips the curve look up if the mitigation is disabled. --- viddec.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/viddec.cpp b/viddec.cpp index 7752f6ed..dc8c6621 100644 --- a/viddec.cpp +++ b/viddec.cpp @@ -26,6 +26,7 @@ static uint64_t s_LastPaintFinishedTime; // // One thing to watch out for is that video compression can introduce negative RGB values. #define fragmentShader_BlackCrushMitigation() \ + "if (!s_blackCrushMitigate) return; \n" \ "vec3 CIE_Y_FROM_RGB_WEIGHTS = vec3(0.2126, 0.7152, 0.0722); \n" \ "float TEXEL_WIDTH_HEIGHT = 0.0625; \n" \ "float CURVE_TEXTURE_WIDTH = 16.0; \n" \ @@ -67,6 +68,7 @@ static const char k_FragmentShader2D[] = "varying vec2 v_texCoord; \n" "uniform sampler2D s_texture; \n" "uniform sampler2D s_curveTexture; \n" + "uniform bool s_blackCrushMitigate; \n" "void main() \n" "{ \n" " vec4 texColor = texture2D(s_texture, v_texCoord); \n" @@ -80,6 +82,7 @@ static const char k_FragmentShaderRectangle[] = "varying vec2 v_texCoord; \n" "uniform sampler2DRect s_texture; \n" "uniform sampler2D s_curveTexture; \n" + "uniform bool s_blackCrushMitigate; \n" "void main() \n" "{ \n" " vec4 texColor = texture2DRect(s_texture, v_texCoord).rgba; \n" @@ -93,6 +96,7 @@ static const char k_FragmentShaderExternal[] = "varying vec2 v_texCoord; \n" "uniform samplerExternalOES s_texture; \n" "uniform sampler2D s_curveTexture; \n" + "uniform bool s_blackCrushMitigate; \n" "void main() \n" "{ \n" " vec4 texColor = texture2D(s_texture, v_texCoord); \n" @@ -485,10 +489,13 @@ void MoonlightInstance::PaintPicture(void) { // Only make these state changes if we've changed from the last texture type if (m_CurrentPicture.texture_target != s_LastTextureType) { + GLuint activeShaderProgram = 0; + if (m_CurrentPicture.texture_target == GL_TEXTURE_2D) { if (!g_Instance->m_Texture2DShader.program) { g_Instance->m_Texture2DShader = CreateProgram(k_VertexShader, k_FragmentShader2D); } + activeShaderProgram = g_Instance->m_Texture2DShader.program; glUseProgram(g_Instance->m_Texture2DShader.program); glUniform2f(g_Instance->m_Texture2DShader.texcoord_scale_location, 1.0, 1.0); } @@ -496,6 +503,7 @@ void MoonlightInstance::PaintPicture(void) { if (!g_Instance->m_RectangleArbShader.program) { g_Instance->m_RectangleArbShader = CreateProgram(k_VertexShader, k_FragmentShaderRectangle); } + activeShaderProgram = g_Instance->m_RectangleArbShader.program; glUseProgram(g_Instance->m_RectangleArbShader.program); glUniform2f(g_Instance->m_RectangleArbShader.texcoord_scale_location, m_CurrentPicture.texture_size.width, m_CurrentPicture.texture_size.height); @@ -504,10 +512,15 @@ void MoonlightInstance::PaintPicture(void) { if (!g_Instance->m_ExternalOesShader.program) { g_Instance->m_ExternalOesShader = CreateProgram(k_VertexShader, k_FragmentShaderExternal); } + activeShaderProgram = g_Instance->m_ExternalOesShader.program; glUseProgram(g_Instance->m_ExternalOesShader.program); glUniform2f(g_Instance->m_ExternalOesShader.texcoord_scale_location, 1.0, 1.0); } + glUniform1i(glGetUniformLocation(activeShaderProgram, "s_blackCrushMitigate"), m_BlackCrushMitigationEnable); + glActiveTexture(GL_TEXTURE1); + glBindTexture(GL_TEXTURE_2D, m_curveTexture); + glActiveTexture(GL_TEXTURE0); s_LastTextureType = m_CurrentPicture.texture_target;