Skip to content

Commit

Permalink
GenericRendererModule (#284)
Browse files Browse the repository at this point in the history 
* merged Eglrenderer into Imageviewer

* added moretests and did code refactoring

* added ifdef condition

* addressed PR comments

* added if def condition in the constructor

* reafctoring
  • Loading branch information
@venkat0907
venkat0907 authored Aug 16, 2023
1 parent abddb05 commit 16b7548
Show file tree
Hide file tree
Showing 4 changed files with 389 additions and 42 deletions.
1 change: 1 addition & 0 deletions base/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,7 @@ SET(UT_FILES
test/jpegdecodercv_tests.cpp
test/Imageresizecv_tests.cpp
test/faciallandmarkscv_tests.cpp
test/imageviewermodule_tests.cpp
test/ImageEncodeCV_tests.cpp
test/rotatecv_tests.cpp
test/affinetransform_tests.cpp
Expand Down
59 changes: 46 additions & 13 deletions base/include/ImageViewerModule.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,66 @@

#include "Module.h"

class DetailRenderer;
class DetailEgl;
class DetailImageviewer;

class ImageViewerModuleProps : public ModuleProps
{
public:
ImageViewerModuleProps(const string& _strTitle) : ModuleProps()
#if defined(__arm__) || defined(__aarch64__)
ImageViewerModuleProps(uint32_t _x_offset, uint32_t _y_offset, uint32_t _width, uint32_t _height, bool _displayOnTop = true) : ModuleProps()
{
x_offset = _x_offset;
y_offset = _y_offset;
height = _height;
width = _width;
displayOnTop = _displayOnTop ? 1 : 0;
}
ImageViewerModuleProps(uint32_t _x_offset, uint32_t _y_offset, bool _displayOnTop = true) : ModuleProps()
{
x_offset = _x_offset;
y_offset = _y_offset;
height = 0;
width = 0;
displayOnTop = _displayOnTop ? 1 : 0;
}
ImageViewerModuleProps(const string &_strTitle) : ModuleProps()
{
strTitle = _strTitle;
}
#else
ImageViewerModuleProps(const string &_strTitle) : ModuleProps()
{
strTitle = _strTitle;
}
#endif

uint32_t x_offset = 0;
uint32_t y_offset = 0;
uint32_t height;
uint32_t width;
bool displayOnTop;
string strTitle;
};

class ImageViewerModule : public Module {
class ImageViewerModule : public Module
{
public:
ImageViewerModule(ImageViewerModuleProps _props=ImageViewerModuleProps(""));
ImageViewerModule(ImageViewerModuleProps _props);
virtual ~ImageViewerModule();
bool init();
bool term();
bool closeWindow();
bool createWindow(int width, int height);

protected:
bool process(frame_container& frames);
bool processSOS(frame_sp& frame);
bool process(frame_container &frames);
bool processSOS(frame_sp &frame);
bool validateInputPins();
bool shouldTriggerSOS();
private:
class Detail;
boost::shared_ptr<Detail> mDetail;
};




void addInputPin(framemetadata_sp &metadata, string &pinId);
bool handleCommand(Command::CommandType type, frame_sp &frame);
boost::shared_ptr<DetailRenderer> mDetail;
ImageViewerModuleProps mProps;
};
239 changes: 210 additions & 29 deletions base/src/ImageViewerModule.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,93 +8,274 @@
#include "Logger.h"
#include "Utils.h"

class ImageViewerModule::Detail
#if defined(__arm__) || defined(__aarch64__)
#include "ApraNvEglRenderer.h"
#include "DMAFDWrapper.h"
#include "Command.h"
#endif

class DetailRenderer
{

public:
Detail(std::string& strTitle): mStrTitle(strTitle) {}
DetailRenderer(ImageViewerModuleProps &_props) : props(_props) {}

~DetailRenderer()
{
#if defined(__arm__) || defined(__aarch64__)
destroyWindow();
#endif
}

// arm:EGL Renderer , linux/windows:imshow

~Detail() {}
virtual bool view() = 0;

void setMatImg(RawImageMetadata* rawMetadata)
bool eglInitializer(uint32_t _height, uint32_t _width)
{
mImg = Utils::getMatHeader(rawMetadata);
#if defined(__arm__) || defined(__aarch64__)
uint32_t displayHeight, displayWidth;
NvEglRenderer::getDisplayResolution(displayWidth, displayHeight);
if (props.height != 0 && props.width != 0)
{
props.x_offset += (displayWidth - props.width) / 2;
props.y_offset += (displayHeight - props.height) / 2;
renderer = NvEglRenderer::createEglRenderer(__TIMESTAMP__, props.width, props.height, props.x_offset, props.y_offset, props.displayOnTop);
}
else
{

props.x_offset += (displayWidth - _width) / 2;
props.y_offset += (displayHeight - _height) / 2;
renderer = NvEglRenderer::createEglRenderer(__TIMESTAMP__, _width, _height, props.x_offset, props.y_offset, props.displayOnTop);
}
if (!renderer)
{
LOG_ERROR << "Failed to create EGL renderer";
return false;
}
#endif
return true;
}

void showImage(frame_sp& frame)
bool destroyWindow()
{
mImg.data = (uchar *)frame->data();
cv::imshow(mStrTitle, mImg);
cv::waitKey(1); //use 33 for linux Grrr
#if defined(__arm__) || defined(__aarch64__)
if (renderer)
{
delete renderer;
}
#else
return true;
#endif
}

bool shouldTriggerSOS()
{
#if defined(__arm__) || defined(__aarch64__)
return !renderer;
#else
return !mImg.rows;
#endif
}

private:
cv::Mat mImg;
std::string mStrTitle;

void setMatImg(RawImageMetadata *rawMetadata)
{
mImg = Utils::getMatHeader(rawMetadata);
}

void showImage(frame_sp &frame)
{
mImg.data = (uchar *)frame->data();
cv::imshow(props.strTitle, mImg);
cv::waitKey(1);
}

public:
frame_sp inputFrame;
ImageViewerModuleProps props;

protected:
cv::Mat mImg;
#if defined(__arm__) || defined(__aarch64__)
NvEglRenderer *renderer = nullptr;
#endif
};

ImageViewerModule::ImageViewerModule(ImageViewerModuleProps _props) : Module(SINK, "ImageViewerModule", _props) {
mDetail.reset(new Detail(_props.strTitle));
}
ImageViewerModule::ImageViewerModule(ImageViewerModuleProps _props) : Module(SINK, "ImageViewerModule", _props), mProps(_props) {}

ImageViewerModule::~ImageViewerModule() {}

class DetailEgl : public DetailRenderer
{
public:
DetailEgl(ImageViewerModuleProps &_props) : DetailRenderer(_props) {}

bool view()
{
#if defined(__arm__) || defined(__aarch64__)
renderer->render((static_cast<DMAFDWrapper *>(inputFrame->data()))->getFd());
#endif
return true;
}
};

class DetailImageviewer : public DetailRenderer
{
public:
DetailImageviewer(ImageViewerModuleProps &_props) : DetailRenderer(_props) {}

bool view()
{
showImage(inputFrame);
return true;
}
};

bool ImageViewerModule::validateInputPins()
{
if (getNumberOfInputPins() != 1)
{
LOG_ERROR << "<" << getId() << ">::validateInputPins size is expected to be 1. Actual<" << getNumberOfInputPins() << ">";
return false;
}

framemetadata_sp metadata = getFirstInputMetadata();
FrameMetadata::FrameType frameType = metadata->getFrameType();
FrameMetadata::MemType inputMemType = metadata->getMemType();

#if defined(__arm__) || defined(__aarch64__)
if (inputMemType != FrameMetadata::MemType::DMABUF)
{
LOG_ERROR << "<" << getId() << ">::validateInputPins input memType is expected to be DMABUF. Actual<" << inputMemType << ">";
return false;
}
if (frameType != FrameMetadata::RAW_IMAGE && frameType != FrameMetadata::RAW_IMAGE_PLANAR)
{
LOG_ERROR << "<" << getId() << ">::validateInputPins input frameType is expected to be RAW_IMAGE or RAW_IMAGE_PLANAR. Actual<" << frameType << ">";
return false;
}
#else
if (frameType != FrameMetadata::RAW_IMAGE)
{
LOG_ERROR << "<" << getId() << ">::validateInputPins input frameType is expected to be RAW_IMAGE. Actual<" << frameType << ">";
return false;
}

#endif
return true;
}

bool ImageViewerModule::init()
void ImageViewerModule::addInputPin(framemetadata_sp &metadata, string &pinId)
{
Module::addInputPin(metadata, pinId);
#if defined(__arm__) || defined(__aarch64__)
mDetail.reset(new DetailEgl(mProps));
#else
mDetail.reset(new DetailImageviewer(mProps));
#endif
}

bool ImageViewerModule::init()
{
if (!Module::init())
{
return false;
}
return true;

return true;
}

bool ImageViewerModule::term() { return Module::term(); }

bool ImageViewerModule::process(frame_container& frames)
bool ImageViewerModule::process(frame_container &frames)
{
auto frame = getFrameByType(frames, FrameMetadata::RAW_IMAGE);
if (isFrameEmpty(frame))
mDetail->inputFrame = frames.cbegin()->second;
if (isFrameEmpty(mDetail->inputFrame))
{
return true;
}

mDetail->showImage(frame);
mDetail->view();
return true;
}

bool ImageViewerModule::processSOS(frame_sp& frame)
bool ImageViewerModule::processSOS(frame_sp &frame)
{
auto metadata = frame->getMetadata();
mDetail->setMatImg(FrameMetadataFactory::downcast<RawImageMetadata>(metadata));
auto inputMetadata = frame->getMetadata();
auto frameType = inputMetadata->getFrameType();
FrameMetadata::MemType mInputMemType = inputMetadata->getMemType();
#if defined(__arm__) || defined(__aarch64__)
int width = 0;
int height = 0;
switch (frameType)
{
case FrameMetadata::FrameType::RAW_IMAGE:
{
auto metadata = FrameMetadataFactory::downcast<RawImageMetadata>(inputMetadata);
width = metadata->getWidth();
height = metadata->getHeight();
}
break;
case FrameMetadata::FrameType::RAW_IMAGE_PLANAR:
{
auto metadata = FrameMetadataFactory::downcast<RawImagePlanarMetadata>(inputMetadata);
width = metadata->getWidth(0);
height = metadata->getHeight(0);
}
break;
default:
throw AIPException(AIP_FATAL, "Unsupported FrameType<" + std::to_string(frameType) + ">");
}

mDetail->eglInitializer(height, width);
#else
mDetail->setMatImg(FrameMetadataFactory::downcast<RawImageMetadata>(inputMetadata));
#endif
return true;
}

bool ImageViewerModule::shouldTriggerSOS()
{
return mDetail->shouldTriggerSOS();
}

bool ImageViewerModule::handleCommand(Command::CommandType type, frame_sp &frame)
{
#if defined(__arm__) || defined(__aarch64__)
if (type == Command::CommandType::DeleteWindow)
{
mDetail->destroyWindow();
return true;
}
else if (type == Command::CommandType::CreateWindow)
{
EglRendererCreateWindow cmd;
getCommand(cmd, frame);
mDetail->eglInitializer(cmd.width, cmd.height);
return true;
}
return Module::handleCommand(type, frame);
#else
return true;
#endif
}

bool ImageViewerModule::closeWindow()
{
#if defined(__arm__) || defined(__aarch64__)
EglRendererCloseWindow cmd;
return queueCommand(cmd);
#else
return true;
#endif
}

bool ImageViewerModule::createWindow(int width, int height)
{
#if defined(__arm__) || defined(__aarch64__)
EglRendererCreateWindow cmd;
cmd.width = width;
cmd.height = height;
return queueCommand(cmd);
#else
return true;
#endif
}
Loading

0 comments on commit 16b7548

Please sign in to comment.