Skip to content

test(VideoManager): address Windows sink review follow-up #14752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alireza787b wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Open

test(VideoManager): address Windows sink review follow-up #14752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/VideoManager/VideoReceiver/GStreamer/gstqgc/gstqgcvideosinkbin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,9 @@ static gboolean wireGpuPath(GstQgcVideoSinkBin* self, GstElement* videosink, Gst
}
#else
GstElement* glupload = nullptr;
// Keep native GPU memory direct. buildGpuCapsString() also offers system memory, which
// qgcqvideosink maps through its CPU fallback instead of uploading software-decoded frames.
// Keep advertised native GPU formats direct. Formats outside buildGpuCapsString() must
// renegotiate upstream; converting here would also upload software frames instead of
// letting qgcqvideosink use its CPU mapping fallback.
if (!chain.linkChain({capsf, videosink}) || !chain.ghostSink(capsf)) {
GST_ERROR_OBJECT(self, "Failed to link/ghost qgcqvideosink (GPU path)");
return FALSE;
Expand Down
9 changes: 4 additions & 5 deletions test/VideoManager/GStreamer/gstqgc/GStreamerGstQgcTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ void GStreamerTest::_testWindowsGpuSinkPreservesSoftwarePixels()
/*captureCenterPixel*/ true);

QVERIFY2(result.eos, qUtf8Printable(QStringLiteral("Software-frame pipeline: %1").arg(result.errorMessage)));
QTRY_VERIFY_WITH_TIMEOUT(result.frameCount > 0, 2000);
QVERIFY(result.frameCount > 0);
QCOMPARE(result.lastPixelFormat, QVideoFrameFormat::Format_BGRA8888);
QVERIFY2(result.centerPixelValid, "System-memory fallback frame could not be mapped for pixel verification");
QVERIFY2((result.centerPixel.red() > 200) && (result.centerPixel.green() < 50) && (result.centerPixel.blue() < 50),
Expand Down Expand Up @@ -763,14 +763,13 @@ void GStreamerTest::_testWindowsGpuSinkPreservesDirectD3D11Memory()
runPipelineThroughQVideoSink(videoSink, controller,
"video/x-raw,format=NV12,width=320,height=240,framerate=30/1 ! d3d11upload ! "
"video/x-raw(memory:D3D11Memory),format=NV12",
/*numBuffers*/ 5, /*gpuZerocopy*/ true, "pattern=red");
if (!result.eos && (result.errorMessage.contains(QStringLiteral("D3D"), Qt::CaseInsensitive) ||
result.errorMessage.contains(QStringLiteral("device"), Qt::CaseInsensitive))) {
/*numBuffers*/ 5, /*gpuZerocopy*/ true);
if (!result.eos && result.errorMessage.contains(QStringLiteral("d3d11"), Qt::CaseInsensitive)) {
QSKIP(qPrintable(QStringLiteral("D3D11 device unavailable in this runner: %1").arg(result.errorMessage)));
}

QVERIFY2(result.eos, qUtf8Printable(QStringLiteral("D3D11 pipeline: %1").arg(result.errorMessage)));
QTRY_VERIFY_WITH_TIMEOUT(result.frameCount > 0, 2000);
QVERIFY(result.frameCount > 0);
QCOMPARE(result.lastPixelFormat, QVideoFrameFormat::Format_NV12);
#else
QSKIP("D3D11 GPU sink path is only available in supported Windows builds");
Expand Down
Loading