From 45fa3d2c372736b698d657d2c28988c7c08a4757 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sun, 16 Oct 2022 16:40:52 +0200 Subject: [PATCH] Added a pillarboxThreshold property to control these values for the video element. --- es-core/src/ThemeData.cpp | 1 + es-core/src/components/VideoComponent.cpp | 7 ++++++ es-core/src/components/VideoComponent.h | 1 + .../src/components/VideoFFmpegComponent.cpp | 24 ++++++++++++------- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/es-core/src/ThemeData.cpp b/es-core/src/ThemeData.cpp index 2a1c9c48c..495d03516 100644 --- a/es-core/src/ThemeData.cpp +++ b/es-core/src/ThemeData.cpp @@ -123,6 +123,7 @@ std::map> {"audio", BOOLEAN}, {"interpolation", STRING}, {"pillarboxes", BOOLEAN}, + {"pillarboxThreshold", NORMALIZED_PAIR}, {"scanlines", BOOLEAN}, {"delay", FLOAT}, {"fadeInTime", FLOAT}, diff --git a/es-core/src/components/VideoComponent.cpp b/es-core/src/components/VideoComponent.cpp index d0627e166..4cb76b6c5 100644 --- a/es-core/src/components/VideoComponent.cpp +++ b/es-core/src/components/VideoComponent.cpp @@ -25,6 +25,7 @@ VideoComponent::VideoComponent() , mTargetSize {0.0f, 0.0f} , mVideoAreaPos {0.0f, 0.0f} , mVideoAreaSize {0.0f, 0.0f} + , mPillarboxThreshold {0.85f, 0.90f} , mStartTime {0} , mIsPlaying {false} , mIsActuallyPlaying {false} @@ -256,6 +257,12 @@ void VideoComponent::applyTheme(const std::shared_ptr& theme, if (elem->has("pillarboxes")) mDrawPillarboxes = elem->get("pillarboxes"); + if (elem->has("pillarboxThreshold")) { + const glm::vec2 pillarboxThreshold {elem->get("pillarboxThreshold")}; + mPillarboxThreshold.x = glm::clamp(pillarboxThreshold.x, 0.2f, 1.0f); + mPillarboxThreshold.y = glm::clamp(pillarboxThreshold.y, 0.2f, 1.0f); + } + if (elem->has("scanlines")) mRenderScanlines = elem->get("scanlines"); diff --git a/es-core/src/components/VideoComponent.h b/es-core/src/components/VideoComponent.h index d5dddf14d..8072930a0 100644 --- a/es-core/src/components/VideoComponent.h +++ b/es-core/src/components/VideoComponent.h @@ -110,6 +110,7 @@ protected: glm::vec2 mTargetSize; glm::vec2 mVideoAreaPos; glm::vec2 mVideoAreaSize; + glm::vec2 mPillarboxThreshold; std::shared_ptr mTexture; std::string mStaticImagePath; std::string mDefaultImagePath; diff --git a/es-core/src/components/VideoFFmpegComponent.cpp b/es-core/src/components/VideoFFmpegComponent.cpp index 2d9960ce7..fa318a70f 100644 --- a/es-core/src/components/VideoFFmpegComponent.cpp +++ b/es-core/src/components/VideoFFmpegComponent.cpp @@ -103,7 +103,6 @@ void VideoFFmpegComponent::resize() mSize.y *= resizeScale.y; } - mSize.y = std::round(mSize.y); mSize.x = (mSize.y / textureSize.y) * textureSize.x; } else { @@ -113,11 +112,11 @@ void VideoFFmpegComponent::resize() // If only one component is set, we resize in a way that maintains aspect ratio. if (!mTargetSize.x && mTargetSize.y) { - mSize.y = std::round(mTargetSize.y); + mSize.y = mTargetSize.y; mSize.x = (mSize.y / textureSize.y) * textureSize.x; } else if (mTargetSize.x && !mTargetSize.y) { - mSize.y = std::round((mTargetSize.x / textureSize.x) * textureSize.y); + mSize.y = (mTargetSize.x / textureSize.x) * textureSize.y; mSize.x = (mSize.y / textureSize.y) * textureSize.x; } } @@ -933,6 +932,11 @@ void VideoFFmpegComponent::calculateBlackRectangle() // otherwise it will exactly match the video size. The reason to add a black rectangle // behind videos in this second instance is that the scanline rendering will make the // video partially transparent so this may avoid some unforseen issues with some themes. + // In general, adding very narrow pillarboxes or letterboxes doesn't look good, so by + // default this is not done unless the size of the video vs the overall video area is + // above the threshold defined by mPillarboxThreshold. By default this is set to 0.85 + // for the X axis and 0.90 for the Y axis, but this is theme-controllable via the + // pillarboxThreshold property. if (mVideoAreaPos != glm::vec2 {0.0f, 0.0f} && mVideoAreaSize != glm::vec2 {0.0f, 0.0f}) { mVideoRectangleCoords.clear(); mRectangleOffset = {0.0f, 0.0f}; @@ -949,20 +953,24 @@ void VideoFFmpegComponent::calculateBlackRectangle() // and then scaled, there could be rounding errors that make the video height // slightly higher than allowed. It's only a single pixel or a few pixels, but // it's still visible for some videos. - if (mSize.y < mVideoAreaSize.y && mSize.y / mVideoAreaSize.y < 0.90f) + if (mSize.y < mVideoAreaSize.y && + mSize.y / mVideoAreaSize.y < mPillarboxThreshold.y) rectHeight = mVideoAreaSize.y; else rectHeight = mSize.y; - // Don't add a black border that is too narrow, that's what the 0.85 constant - // takes care of. - if (mSize.x < mVideoAreaSize.x && mSize.x / mVideoAreaSize.x < 0.85f) + if (mSize.x < mVideoAreaSize.x && + mSize.x / mVideoAreaSize.x < mPillarboxThreshold.x) rectWidth = mVideoAreaSize.x; else rectWidth = mSize.x; } // Video is in portrait orientation (or completely square). else { - rectWidth = mVideoAreaSize.x; + if (mSize.x <= mVideoAreaSize.x && + mSize.x / mVideoAreaSize.x < mPillarboxThreshold.x) + rectWidth = mVideoAreaSize.x; + else + rectWidth = mSize.x; rectHeight = mSize.y; } // If an origin value other than 0.5 is used, then create an offset for centering