Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-18 04:45:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(Windows) Video textures were sometimes not aligned correctly horizontally

Browse source
This commit is contained in:
Leon Styhre 2024-06-28 22:17:19 +02:00
parent 56c7d4cf95
commit 38a99abf79
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
es-core/src/components/VideoFFmpegComponent.cpp
View file

@ -54,6 +54,7 @@ VideoFFmpegComponent::VideoFFmpegComponent()
, mVideoTargetQueueSize {0} , mVideoTargetQueueSize {0}
, mAudioTargetQueueSize {0} , mAudioTargetQueueSize {0}
, mVideoTimeBase {0.0l} , mVideoTimeBase {0.0l}
, mLinePaddingComp {0.0f}
, mAccumulatedTime {0.0l} , mAccumulatedTime {0.0l}
, mStartTimeAccumulation {false} , mStartTimeAccumulation {false}
, mDecodedFrame {false} , mDecodedFrame {false}
@ -212,11 +213,13 @@ void VideoFFmpegComponent::render(const glm::mat4& parentTrans)
if (!mDecodedFrame) if (!mDecodedFrame)
return; return;
const float paddingComp {mLinePaddingComp};
// clang-format off // clang-format off
vertices[0] = {{0.0f, 0.0f }, {mTopLeftCrop.x - mCropOffset.x, 1.0f - mBottomRightCrop.y + mCropOffset.y}, 0xFFFFFFFF}; vertices[0] = {{0.0f, 0.0f }, {mTopLeftCrop.x - mCropOffset.x, 1.0f - mBottomRightCrop.y + mCropOffset.y}, 0xFFFFFFFF};
vertices[1] = {{0.0f, mSize.y}, {mTopLeftCrop.x - mCropOffset.x, 1.0f - mTopLeftCrop.y + mCropOffset.y }, 0xFFFFFFFF}; vertices[1] = {{0.0f, mSize.y}, {mTopLeftCrop.x - mCropOffset.x, 1.0f - mTopLeftCrop.y + mCropOffset.y }, 0xFFFFFFFF};
vertices[2] = {{mSize.x, 0.0f }, {(mBottomRightCrop.x * 1.0f) - mCropOffset.x, 1.0f - mBottomRightCrop.y + mCropOffset.y}, 0xFFFFFFFF}; vertices[2] = {{mSize.x, 0.0f }, {(mBottomRightCrop.x * 1.0f) - mCropOffset.x - paddingComp, 1.0f - mBottomRightCrop.y + mCropOffset.y}, 0xFFFFFFFF};
vertices[3] = {{mSize.x, mSize.y}, {(mBottomRightCrop.x * 1.0f) - mCropOffset.x, 1.0f - mTopLeftCrop.y + mCropOffset.y }, 0xFFFFFFFF}; vertices[3] = {{mSize.x, mSize.y}, {(mBottomRightCrop.x * 1.0f) - mCropOffset.x - paddingComp, 1.0f - mTopLeftCrop.y + mCropOffset.y }, 0xFFFFFFFF};
// clang-format on // clang-format on
vertices[0].color = mColorShift; vertices[0].color = mColorShift;
@ -847,6 +850,16 @@ void VideoFFmpegComponent::getProcessedFrames()
const int bytesPerPixel {4}; const int bytesPerPixel {4};
const int width {mVideoFrameResampled->linesize[0] / bytesPerPixel}; const int width {mVideoFrameResampled->linesize[0] / bytesPerPixel};
// For performance reasons the linesize value may padded to a larger size than the
// usable data. This seems to happen mostly (only?) on Windows. If this occurs we
// need to compensate for this when calculating the vertices in render().
if (width != mVideoFrameResampled->width && width > 0) {
const float linePaddingComp {static_cast<float>(width - mVideoFrameResampled->width) /
static_cast<float>(width)};
if (linePaddingComp != 0.0f)
mLinePaddingComp = linePaddingComp;
}
currFrame.width = width; currFrame.width = width;
currFrame.height = mVideoFrameResampled->height; currFrame.height = mVideoFrameResampled->height;

1
es-core/src/components/VideoFFmpegComponent.h
View file

@ -171,6 +171,7 @@ private:
int mVideoFrameReadCount; int mVideoFrameReadCount;
int mVideoFrameDroppedCount; int mVideoFrameDroppedCount;
std::atomic<float> mLinePaddingComp;
std::atomic<double> mAccumulatedTime; std::atomic<double> mAccumulatedTime;
std::atomic<bool> mStartTimeAccumulation; std::atomic<bool> mStartTimeAccumulation;
std::atomic<bool> mDecodedFrame; std::atomic<bool> mDecodedFrame;