third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed roi inference to always produce even sizes for nv12

Browse Source
This commit is contained in:
Ruslan Garnov
2019-05-13 18:41:08 +03:00
parent b2abd8ca41
commit 50af4df1d7
2 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/src/backends/fluid/gfluidbackend.cpp
+22 -1
View File
@@ -648,6 +648,7 @@ void cv::gimpl::GFluidExecutable::initBufferRois(std::vector<int>& readStarts,
cv::gapi::own::Rect produced = rois[m_id_map.at(data.rc)];
// Apply resize-specific roi transformations
cv::gapi::own::Rect resized;
switch (fg.metadata(oh).get<FluidUnit>().k.m_kind)
{
@@ -657,8 +658,28 @@ void cv::gimpl::GFluidExecutable::initBufferRois(std::vector<int>& readStarts,
default: GAPI_Assert(false);
}
// All below transformations affect roi of the writer, preserve read start position here
int readStart = resized.y;
cv::gapi::own::Rect roi = adjFilterRoi(resized, fd.border_size, in_meta.size.height);
// Extend required input roi (both y and height) to be even if it's produced by NV12toRGB
if (!in_node->inNodes().empty()) {
auto in_data_producer = in_node->inNodes().front();
if (fg.metadata(in_data_producer).get<FluidUnit>().k.m_kind == GFluidKernel::Kind::NV12toRGB) {
if (resized.y % 2 != 0) {
resized.y--;
resized.height++;
}
if (resized.height % 2 != 0) {
resized.height++;
}
}
}
// Apply filter-specific roi transformations, clip to image size
// Note: done even for non-filter kernels as applies border-related transformations
// (required in the case when there are multiple readers with different border requirements)
auto roi = adjFilterRoi(resized, fd.border_size, in_meta.size.height);
auto in_id = m_id_map.at(in_data.rc);
if (rois[in_id] == cv::gapi::own::Rect{})