8000 G-API gst source gray support by dbudniko · Pull Request #21560 · opencv/opencv · GitHub
[go: up one dir, main page]
Skip to content

G-API gst source gray support #21560

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

Merged
merged 71 commits into from
Feb 8, 2022
Merged

G-API gst source gray support #21560

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
e0cb364
gray draft
Jan 25, 2022
a7e0ea8
Merge remote-tracking branch 'origin/4.x' into dbudniko/gapi_media_fo…
Jan 25, 2022
a5956e6
remove uv_plane from gray code path
Jan 25, 2022
198e6e1
trying to address comments from Asya (accessors are modified)
Jan 27, 2022
52adfdc
try to push one more time
Jan 27, 2022
987ce91
address more c 8000 omments from Asya and Sergey
Jan 27, 2022
bd796c8
add gray to streaming tests
Jan 27, 2022
6795ecf
some gray source corrections and copy gray frame
Jan 27, 2022
10bc6fd
try to fix copy frame gray test
Jan 27, 2022
338473e
try to add reshape gray test
Jan 27, 2022
76a6735
fix test source
Jan 27, 2022
3fc50fa
disable reshape gray test
Jan 27, 2022
1886642
debug prints
Jan 28, 2022
7a308cb
Merge branch 'dbudniko/gapi_media_format_gray' of github.com:dbudniko…
Jan 28, 2022
e7e98ec
try to convert BGR to gray
Jan 28, 2022
10d6b76
roll back
Jan 28, 2022
8e83d55
try to fix gray reshape test
Jan 28, 2022
add328f
clean up
Jan 28, 2022
7983d37
try bgr to gray again
Jan 28, 2022
7f3fdb7
try to add media frame tests
Jan 28, 2022
da64f69
size media frame gray test
Jan 28, 2022
8446626
more comments are addressed
Jan 31, 2022
f74f205
rmat on mat adapter
Jan 31, 2022
1fae2d0
more streaming tests
Jan 31, 2022
f8a0dca
try to add more test instances
Jan 31, 2022
155a2cd
try to fix accuracy
Jan 31, 2022
1884dd0
remove source type gray
Jan 31, 2022
d89a8d4
streaming tests fix - source type gray
Jan 31, 2022
a272fe1
fix streaming test logic
Jan 31, 2022
e025398
try to fix test
Jan 31, 2022
22282c9
clean up
Jan 31, 2022
0ce365f
return back single flag
Jan 31, 2022
0153a46
remove redundant coma
Feb 1, 2022
273d007
fix assert to fix debug tests run
Feb 1, 2022
d5f6a53
draft to test build
Feb 2, 2022
ba0ad34
build fixed
Feb 2, 2022
02e1acd
some clean up and formatting
Feb 2, 2022
68dcd3f
tests are fixed
Feb 3, 2022
bfeeea3
CAPS suggestion from Asya is added - build OK tests OK
Feb 3, 2022
4edd04f
media adapter gray logic draft
Feb 3, 2022
93248ca
try to fix build
Feb 3, 2022
86048f7
try to fix BGR warning. Not clear how to do it properly
Feb 3, 2022
08bc99d
Merge remote-tracking branch 'origin/4.x' into dbudniko/gapi_media_fo…
Feb 3, 2022
bc36b0a
more offsets and pointers
Feb 3, 2022
270e827
try to fix build
Feb 3, 2022
ad74b03
try to add separate nv12 and gray8 tests
Feb 3, 2022
81a2bb3
try to fix tests
Feb 3, 2022
181adbe
try to fix tests build
Feb 3, 2022
3fc47e9
one more attempt to fix kernel
Feb 3, 2022
630a365
try to enable GRAY8 test
Feb 3, 2022
04d495a
try to fix gray8 test
Feb 3, 2022
436b083
more attempts
Feb 3, 2022
cc70cfe
more fixes
Feb 3, 2022
0a27161
further extension of tests
Feb 3, 2022
898c60b
more tests
Feb 3, 2022
9961c68
try to add multisource tests
Feb 3, 2022
41212cb
clean up and try to use default in switches
Feb 3, 2022
48d4ce2
more clean-ups
Feb 3, 2022
8306134
NV12 check
Feb 4, 2022
487f9b0
try to fix build and clean up
Feb 4, 2022
574ac9a
compile args fix
Feb 4, 2022
561cd42
build fixed
Feb 4, 2022
aa2d906
fix logic
Feb 4, 2022
c1e191a
try to fix computation
Feb 4, 2022
d7c8cce
build ok tests ok
Feb 4, 2022
9b2a150
refactor tests
Feb 4, 2022
ab338ef
clean up
Feb 4, 2022
29e8acb
assert fix
Feb 4, 2022
be281dd
more comments are addressed
Feb 7, 2022
7e310a6
Address comments from Orest
Feb 7, 2022
fe2927d
roll back
Feb 7, 2022
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
Prev Previous commit
Next Next commit
more comments are addressed
  • Loading branch information
Dmitry Budnikov authored and Dmitry Budnikov committed Feb 7, 2022
commit be281dd58c0ff916864a8c8928ce2d4344e60b09
4 changes: 4 additions & 0 deletions modules/gapi/src/streaming/gstreamer/gstreamersource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,12 @@ void GStreamerSource::Priv::prepareVideoMeta()
switch (m_type) {
case GST_VIDEO_FORMAT_NV12: {
m_mediaFrameMeta = GFrameDesc{ cv::MediaFormat::NV12, cv::Size(width, height) };
GAPI_Assert(GST_VIDEO_INFO_N_PLANES(&m_videoInfo) == 2);
break;
}
case GST_VIDEO_FORMAT_GRAY8: {
m_mediaFrameMeta = GFrameDesc{ cv::MediaFormat::GRAY, cv::Size(width, height) };
Copy link
Contributor

Choose a reason for hiding this comment

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

so is it GRAY or GRAY8? I believe I've seen GRAY8 somewhere in the doxygen comments (and I believe it is quite legit)

Copy link
Author

Choose a reason for hiding this comment

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

There are different Gst gray formats. GRAY8 GRAY16. MediaFormat GRAY assumes 8-bit integer numbers. Should we align our naming approach with Gst. I have some doubts that 16 bit will be asked by someone.

Copy link
Contributor

Choose a reason for hiding this comment

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

I have some doubts that 16 bit will be asked by someone.

It seem to be useful for some scenarios, see #18694. Furthermore, there are two variants of this format: GRAY16_LE and GRAY16_BE

GAPI_Assert(GST_VIDEO_INFO_N_PLANES(&m_videoInfo) == 1);
break;
}
default: {
Expand Down Expand Up @@ -291,6 +293,7 @@ bool GStreamerSource::Priv::retrieveFrame(cv::Mat& data)
GAPI_Assert((uint8_t*)GST_VIDEO_FRAME_PLANE_DATA(&videoFrame, 1) ==
(uint8_t*)GST_VIDEO_FRAME_PLANE_DATA(&videoFrame, 0) +
GST_VIDEO_FRAME_PLANE_OFFSET(&videoFrame, 1));
GAPI_Assert(GST_VIDEO_INFO_N_PLANES(&m_videoInfo) == 2);

cv::Mat y(m_matMeta.size, CV_8UC1,
(uint8_t*)GST_VIDEO_FRAME_PLANE_DATA(&videoFrame, 0) +
Expand All @@ -305,6 +308,7 @@ bool GStreamerSource::Priv::retrieveFrame(cv::Mat& data)
break;
}
case GST_VIDEO_FORMAT_GRAY8: {
GAPI_Assert(GST_VIDEO_INFO_N_PLANES(&m_videoInfo) == 1);
cv::Mat y(m_matMeta.size, CV_8UC1,
(uint8_t*)GST_VIDEO_FRAME_PLANE_DATA(&videoFrame, 0) +
GST_VIDEO_FRAME_PLANE_OFFSET(&videoFrame, 0),
Expand Down
2 changes: 1 addition & 1 deletion modules/gapi/src/streaming/gstreamer/gstreamersource_priv.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class GStreamerSource::Priv
bool m_isPipelinePlaying = false;

int64_t m_frameId = 0L;
size_t m_type = 0;
size_t m_type = 0; //Gstreamer video format type

protected:
void configureAppsink();
Expand Down
0