diff --git a/base/include/CCNPPI.h b/base/include/CCNPPI.h index 8c9c9adea..95392a2d3 100644 --- a/base/include/CCNPPI.h +++ b/base/include/CCNPPI.h @@ -15,10 +15,10 @@ class CCNPPIProps : public ModuleProps stream = _stream->getCudaStream(); imageType = _imageType; } - + cudastream_sp stream_sp; cudaStream_t stream; - ImageMetadata::ImageType imageType; + ImageMetadata::ImageType imageType; }; class CCNPPI : public Module @@ -52,5 +52,5 @@ class CCNPPI : public Module framemetadata_sp mOutputMetadata; framemetadata_sp mIntermediateMetadata; std::string mOutputPinId; - CCNPPIProps mProps; + CCNPPIProps mProps; }; diff --git a/base/src/CCNPPI.cpp b/base/src/CCNPPI.cpp index e066510ab..daec98a5a 100644 --- a/base/src/CCNPPI.cpp +++ b/base/src/CCNPPI.cpp @@ -10,7 +10,6 @@ class CCNPPI::Detail { public: - Detail(CCNPPIProps& _props) : props(_props) Detail(CCNPPIProps& _props) : props(_props) { nppStreamCtx.hStream = props.stream; @@ -18,10 +17,6 @@ class CCNPPI::Detail ~Detail() {} - //This enum has to match ImageMetadata enums - enum Imageformats - ~Detail() {} - //This enum has to match ImageMetadata enums enum Imageformats { @@ -44,26 +39,6 @@ class CCNPPI::Detail BAYERRG8 }; - const int enumSize = BAYERRG8 + 1; // last enum value of Imageformats plus 1 - UNSET = 0, - MONO = 1, - BGR, - BGRA, - RGB, - RGBA, - YUV411_I = 10, - YUV444, - YUV420, - UYVY, - YUYV, - NV12, - BAYERBG10 = 20, - BAYERBG8, - BAYERGB8, - BAYERGR8, - BAYERRG8 - }; - const int enumSize = BAYERRG8 + 1; // last enum value of Imageformats plus 1 const int conversionTable[37][2] = @@ -104,7 +79,7 @@ class CCNPPI::Detail {15, 4}, // NV12 to RGB {15, 5}, // NV12 to RGBA {15, 12}, // NV12 to YUV420 - {10, 11 } // yuv411 to YUV444 + {10, 11 } // yuv411 to YUV444 }; int convmatrix[BAYERRG8 + 1][BAYERRG8 + 1][2] = { {-1} }; @@ -130,7 +105,7 @@ class CCNPPI::Detail convmatrix[i][j][1] = conversionTable[k][1]; } } - + bool convertMONOtoRGB() { auto status = nppiDup_8u_C1C3R_Ctx(src[0], @@ -149,21 +124,6 @@ class CCNPPI::Detail return true; } - bool convertMONOtoBGR() - { - auto status = nppiDup_8u_C1C3R_Ctx(src[0], - srcPitch[0], - dst[0], - dstPitch[0], - srcSize[0], - nppStreamCtx); - if (status != NPP_SUCCESS) - { - LOG_ERROR << "nppiDup_8u_C1C3R_Ctx failed<" << status << ">"; - return false; - return true; - } - bool convertMONOtoBGR() { auto status = nppiDup_8u_C1C3R_Ctx(src[0], @@ -178,7 +138,6 @@ class CCNPPI::Detail return false; } - return true; } @@ -226,17 +185,6 @@ class CCNPPI::Detail return false; } - status = nppiSet_8u_C4CR_Ctx(255, - dst[0] + 3, - dstPitch[0], - dstSize[0], - nppStreamCtx - ); - if (status != NPP_SUCCESS) - { - LOG_ERROR << "nppiSet_8u_C4CR_Ctx failed<" << status << ">"; - return false; - } status = nppiSet_8u_C4CR_Ctx(255, dst[0] + 3, dstPitch[0], @@ -620,18 +568,6 @@ class CCNPPI::Detail return true; } - bool convertYUV420toMONO() - { - // CUDA MEMCPY Y - auto cudaStatus = cudaMemcpy2DAsync(dst[0], dstPitch[0], src[0], srcPitch[0], srcRowSize[0], srcSize[0].height, cudaMemcpyDeviceToDevice, props.stream); - if (status != NPP_SUCCESS) - { - LOG_ERROR << "nppiBGRToYUV420_8u_AC4P3R_Ctx failed<" << status << ">"; - } - - return true; - } - bool convertYUV420toMONO() { // CUDA MEMCPY Y @@ -748,15 +684,6 @@ class CCNPPI::Detail return true; } - bool convertNV12toYUV420() - { - auto status = nppiNV12ToYUV420_8u_P2P3R_Ctx(src, srcPitch[0], dst, dstPitch, srcSize[0], nppStreamCtx); - - if (status != NPP_SUCCESS) - { - LOG_ERROR << "nppiNV12ToYUV420_8u_P2P3R_Ctx failed<" << status << ">"; - return false; - } bool convertNV12toYUV420() { auto status = nppiNV12ToYUV420_8u_P2P3R_Ctx(src, srcPitch[0], dst, dstPitch, srcSize[0], nppStreamCtx); @@ -789,16 +716,11 @@ class CCNPPI::Detail for (auto i = 0; i < intermediateChannels; i++) { - intermediatedst[i] = static_cast(intermediateBuffer->data()) + intermediateNextPtrOffset[i]; - } - - for (auto i = 0; i < intermediateChannels; i++) - { - intermediatedst[i] = static_cast(intermediateBuffer->data()) + intermediateNextPtrOffset[i]; + intermediatedst[i] = static_cast(intermediateBuffer->data()) + intermediateNextPtrOffset[i]; } switch (inputImageType) - { + { case ImageMetadata::MONO: { switch (outputImageType) @@ -933,8 +855,6 @@ class CCNPPI::Detail default: throw AIPException(AIP_FATAL, "conversion not supported"); } - break; - } } case ImageMetadata::YUV411_I: @@ -947,7 +867,7 @@ class CCNPPI::Detail throw AIPException(AIP_FATAL, "conversion not supported"); } } - } + } return true; } @@ -1053,10 +973,6 @@ class CCNPPI::Detail ImageMetadata::ImageType intermediateImageType; - FrameMetadata::FrameType intermediateFrameType; - ImageMetadata::ImageType intermediateImageType; - - int inputChannels; int outputChannels; const Npp8u* src[4]; @@ -1070,13 +986,6 @@ class CCNPPI::Detail int dstPitch[4]; size_t dstNextPtrOffset[4]; - Npp8u* intermediatedst[4]; - NppiSize intermediateSize[4]; - NppiRect intermediateRect[4]; - int intermediatePitch[4]; - size_t intermediateNextPtrOffset[4]; - - Npp8u* intermediatedst[4]; NppiSize intermediateSize[4]; NppiRect intermediateRect[4]; @@ -1086,22 +995,15 @@ class CCNPPI::Detail CCNPPIProps props; NppStreamContext nppStreamCtx; -public: - int intermediateChannels = 0; - NppiSize srcSize[4]; - bool intermediateConv = false; - public: int intermediateChannels = 0; NppiSize srcSize[4]; bool intermediateConv = false; }; -CCNPPI::CCNPPI(CCNPPIProps _props) : Module(TRANSFORM, "CCNPPI", _props), mProps(_props), mFrameLength(0), mNoChange(false) CCNPPI::CCNPPI(CCNPPIProps _props) : Module(TRANSFORM, "CCNPPI", _props), mProps(_props), mFrameLength(0), mNoChange(false) { mDetail.reset(new Detail(_props)); - mDetail.reset(new Detail(_props)); } CCNPPI::~CCNPPI() {} @@ -1143,7 +1045,6 @@ bool CCNPPI::validateOutputPins() framemetadata_sp metadata = getFirstOutputMetadata(); mOutputFrameType = metadata->getFrameType(); - if (mOutputFrameType != FrameMetadata::RAW_IMAGE && mOutputFrameType != FrameMetadata::RAW_IMAGE_PLANAR) { LOG_ERROR << "<" << getId() << ">::validateOutputPins input frameType is expected to be RAW_IMAGE or RAW_IMAGE_PLANAR. Actual<" << mOutputFrameType << ">"; @@ -1156,7 +1057,6 @@ bool CCNPPI::validateOutputPins() LOG_ERROR << "<" << getId() << ">::validateOutputPins input memType is expected to be CUDA_DEVICE. Actual<" << memType << ">"; return false; } - } return true; } @@ -1168,8 +1068,6 @@ void CCNPPI::addInputPin(framemetadata_sp& metadata, string& pinId) mInputFrameType = metadata->getFrameType(); switch (mProps.imageType) { - switch (mProps.imageType) - { case ImageMetadata::MONO: case ImageMetadata::BGR: case ImageMetadata::BGRA: @@ -1179,8 +1077,6 @@ void CCNPPI::addInputPin(framemetadata_sp& metadata, string& pinId) mOutputMetadata = framemetadata_sp(new RawImageMetadata(FrameMetadata::MemType::CUDA_DEVICE)); break; case ImageMetadata::YUV420: - case ImageMetadata::YUV444: - case ImageMetadata::YUV420: case ImageMetadata::YUV444: mOutputMetadata = framemetadata_sp(new RawImagePlanarMetadata(FrameMetadata::MemType::CUDA_DEVICE)); break; @@ -1190,7 +1086,6 @@ void CCNPPI::addInputPin(framemetadata_sp& metadata, string& pinId) mOutputMetadata->copyHint(*metadata.get()); mOutputPinId = addOutputPin(mOutputMetadata); - mOutputPinId = addOutputPin(mOutputMetadata); } bool CCNPPI::init() @@ -1208,11 +1103,9 @@ bool CCNPPI::term() return Module::term(); } -bool CCNPPI::process(frame_container& frames) bool CCNPPI::process(frame_container& frames) { auto frame = frames.cbegin()->second; - auto frame = frames.cbegin()->second; frame_sp outFrame; frame_sp intermediateFrame; @@ -1221,12 +1114,6 @@ bool CCNPPI::process(frame_container& frames) { intermediateFrameSize = (mDetail->srcSize[0].width) * (mDetail->srcSize[0].height) * (mDetail->intermediateChannels); } - frame_sp intermediateFrame; - size_t intermediateFrameSize = NOT_SET_NUM; - if (mDetail->intermediateConv) - { - intermediateFrameSize = (mDetail->srcSize[0].width) * (mDetail->srcSize[0].height) * (mDetail->intermediateChannels); - } if (!mNoChange) { outFrame = makeFrame(); @@ -1235,23 +1122,15 @@ bool CCNPPI::process(frame_container& frames) intermediateFrame = makeFrame(intermediateFrameSize); } if (!mDetail->execute(frame, outFrame, intermediateFrame)) - if (mDetail->intermediateConv) - { - intermediateFrame = makeFrame(intermediateFrameSize); - } - if (!mDetail->execute(frame, outFrame, intermediateFrame)) { return true; } } - } else { outFrame = frame; } - - intermediateFrame.reset(); - + intermediateFrame.reset(); frames.insert(make_pair(mOutputPinId, outFrame)); send(frames); @@ -1259,8 +1138,6 @@ bool CCNPPI::process(frame_container& frames) return true; } -bool CCNPPI::processSOS(frame_sp& frame) -{ bool CCNPPI::processSOS(frame_sp& frame) { auto metadata = frame->getMetadata(); @@ -1269,20 +1146,15 @@ bool CCNPPI::processSOS(frame_sp& frame) } void CCNPPI::setMetadata(framemetadata_sp& metadata) -{ { mInputFrameType = metadata->getFrameType(); - int width = NOT_SET_NUM; int height = NOT_SET_NUM; int type = NOT_SET_NUM; int depth = NOT_SET_NUM; ImageMetadata::ImageType inputImageType; ImageMetadata::ImageType outputImageType; - int depth = NOT_SET_NUM; - ImageMetadata::ImageType inputImageType; - ImageMetadata::ImageType outputImageType; if (mInputFrameType == FrameMetadata::RAW_IMAGE) { @@ -1298,14 +1170,12 @@ void CCNPPI::setMetadata(framemetadata_sp& metadata) auto rawMetadata = FrameMetadataFactory::downcast(metadata); width = rawMetadata->getWidth(0); height = rawMetadata->getHeight(0); - height = rawMetadata->getHeight(0); depth = rawMetadata->getDepth(); inputImageType = rawMetadata->getImageType(); } mNoChange = false; if (inputImageType == mProps.imageType) - if (inputImageType == mProps.imageType) { mNoChange = true; return; @@ -1315,16 +1185,13 @@ void CCNPPI::setMetadata(framemetadata_sp& metadata) { auto rawOutMetadata = FrameMetadataFactory::downcast(mOutputMetadata); RawImageMetadata outputMetadata(width, height, mProps.imageType, CV_8UC3, 512, depth, FrameMetadata::CUDA_DEVICE, true); - RawImageMetadata outputMetadata(width, height, mProps.imageType, CV_8UC3, 512, depth, FrameMetadata::CUDA_DEVICE, true); rawOutMetadata->setData(outputMetadata); outputImageType = rawOutMetadata->getImageType(); - outputImageType = rawOutMetadata->getImageType(); } else if (mOutputFrameType == FrameMetadata::RAW_IMAGE_PLANAR) { auto rawOutMetadata = FrameMetadataFactory::downcast(mOutputMetadata); RawImagePlanarMetadata outputMetadata(width, height, mProps.imageType, 512, depth); - RawImagePlanarMetadata outputMetadata(width, height, mProps.imageType, 512, depth); rawOutMetadata->setData(outputMetadata); outputImageType = rawOutMetadata->getImageType(); } @@ -1337,27 +1204,6 @@ void CCNPPI::setMetadata(framemetadata_sp& metadata) mIntermediateMetadata = nullptr; - if (inputImageType == ImageMetadata::NV12) - { - if ((outputImageType == ImageMetadata::BGRA) || (outputImageType == ImageMetadata::RGBA)) - { - mDetail->intermediateConv = true; - mIntermediateMetadata = framemetadata_sp(new RawImageMetadata(FrameMetadata::MemType::CUDA_DEVICE)); - auto mrawOutMetadata = FrameMetadataFactory::downcast(mIntermediateMetadata); - RawImageMetadata moutputMetadata(width, height, ImageMetadata::RGB, CV_8UC3, 512, depth, FrameMetadata::CUDA_DEVICE, true); - mrawOutMetadata->setData(moutputMetadata); - } - outputImageType = rawOutMetadata->getImageType(); - } - - mDetail->setConvMatrix(); - if (mDetail->convmatrix[inputImageType][outputImageType][0] == -1 && mDetail->convmatrix[inputImageType][outputImageType][1] == -1) - { - throw AIPException(AIP_FATAL, "conversion not supported"); - } - - mIntermediateMetadata = nullptr; - if (inputImageType == ImageMetadata::NV12) { if ((outputImageType == ImageMetadata::BGRA) || (outputImageType == ImageMetadata::RGBA)) @@ -1372,7 +1218,6 @@ void CCNPPI::setMetadata(framemetadata_sp& metadata) mFrameLength = mOutputMetadata->getDataSize(); mDetail->setMetadata(metadata, mOutputMetadata, mIntermediateMetadata); - mDetail->setMetadata(metadata, mOutputMetadata, mIntermediateMetadata); } bool CCNPPI::shouldTriggerSOS() diff --git a/base/test/ccnppi_tests.cpp b/base/test/ccnppi_tests.cpp index d7d83b6c0..6b5bc3244 100644 --- a/base/test/ccnppi_tests.cpp +++ b/base/test/ccnppi_tests.cpp @@ -47,7 +47,7 @@ struct CCNPPITestsStruct copy1 = boost::shared_ptr(new CudaMemCopy(CudaMemCopyProps(cudaMemcpyHostToDevice, stream))); fileReader->setNext(copy1); - CCNPPIProps CCProps(OimageType,stream); + CCNPPIProps CCProps(OimageType, stream); ccnppi = boost::shared_ptr(new CCNPPI(CCProps)); copy1->setNext(ccnppi); @@ -80,7 +80,7 @@ struct CCNPPITestsStruct } }; -BOOST_AUTO_TEST_CASE(MONO_to_RGB,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(MONO_to_RGB, *boost::unit_test::disabled()) { ImageMetadata::ImageType::MONO; CCNPPITestsStruct f("./data/mono_200x200.raw", 200, 200, ImageMetadata::ImageType::MONO, CV_8UC1, CV_8U, ImageMetadata::ImageType::RGB); @@ -96,13 +96,13 @@ BOOST_AUTO_TEST_CASE(MONO_to_RGB,*boost::unit_test::disabled()) auto outFrame = frames[outputPinId]; BOOST_TEST(outFrame->getMetadata()->getFrameType() == FrameMetadata::RAW_IMAGE); Test_Utils::saveOrCompare("./data/testOutput/mono_to_rgb.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); - + } -BOOST_AUTO_TEST_CASE(MONO_to_BGR,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(MONO_to_BGR, *boost::unit_test::disabled()) { ImageMetadata::ImageType::MONO; - CCNPPITestsStruct f("./data/mono_200x200.raw", 200, 200, ImageMetadata::ImageType::MONO, CV_8UC1,CV_8U, ImageMetadata::ImageType::BGR); + CCNPPITestsStruct f("./data/mono_200x200.raw", 200, 200, ImageMetadata::ImageType::MONO, CV_8UC1, CV_8U, ImageMetadata::ImageType::BGR); f.fileReader->step(); f.copy1->step(); @@ -153,7 +153,7 @@ BOOST_AUTO_TEST_CASE(MONO_to_BGRA, *boost::unit_test::disabled()) Test_Utils::saveOrCompare("./data/testOutput/mono_to_bgra.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(MONO_to_YUV420,* utf::precondition(if_compute_cap_supported())) +BOOST_AUTO_TEST_CASE(MONO_to_YUV420, *utf::precondition(if_compute_cap_supported())) { ImageMetadata::ImageType::MONO; CCNPPITestsStruct f("./data/mono_200x200.raw", 200, 200, ImageMetadata::ImageType::MONO, CV_8UC1, CV_8U, ImageMetadata::ImageType::YUV420); @@ -225,7 +225,7 @@ BOOST_AUTO_TEST_CASE(RGB_to_RGBA, *utf::precondition(if_compute_cap_supported()) Test_Utils::saveOrCompare("./data/testOutput/rgb_to_rgba.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(RGB_to_BGRA,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(RGB_to_BGRA, *boost::unit_test::disabled()) { ImageMetadata::ImageType::RGB; CCNPPITestsStruct f("./data/RGB_320x180.raw", 320, 180, ImageMetadata::ImageType::RGB, CV_8UC3, CV_8U, ImageMetadata::ImageType::BGRA); @@ -261,7 +261,7 @@ BOOST_AUTO_TEST_CASE(RGB_to_YUV420, *utf::precondition(if_compute_cap_supported( Test_Utils::saveOrCompare("./data/testOutput/rgb_to_yuv420.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(BGR_to_MONO,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(BGR_to_MONO, *boost::unit_test::disabled()) { ImageMetadata::ImageType::BGR; CCNPPITestsStruct f("./data/BGR_1080x720.raw", 1080, 720, ImageMetadata::ImageType::BGR, CV_8UC3, CV_8U, ImageMetadata::ImageType::MONO); @@ -279,7 +279,7 @@ BOOST_AUTO_TEST_CASE(BGR_to_MONO,*boost::unit_test::disabled()) Test_Utils::saveOrCompare("./data/testOutput/bgr_to_mono.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(BGR_to_RGB,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(BGR_to_RGB, *boost::unit_test::disabled()) { ImageMetadata::ImageType::BGR; CCNPPITestsStruct f("./data/BGR_1080x720.raw", 1080, 720, ImageMetadata::ImageType::BGR, CV_8UC3, CV_8U, ImageMetadata::ImageType::RGB); @@ -297,7 +297,7 @@ BOOST_AUTO_TEST_CASE(BGR_to_RGB,*boost::unit_test::disabled()) Test_Utils::saveOrCompare("./data/testOutput/bgr_to_rgb.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(BGR_to_RGBA,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(BGR_to_RGBA, *boost::unit_test::disabled()) { ImageMetadata::ImageType::BGR; CCNPPITestsStruct f("./data/BGR_1080x720.raw", 1080, 720, ImageMetadata::ImageType::BGR, CV_8UC3, CV_8U, ImageMetadata::ImageType::RGBA); @@ -315,7 +315,7 @@ BOOST_AUTO_TEST_CASE(BGR_to_RGBA,*boost::unit_test::disabled()) Test_Utils::saveOrCompare("./data/testOutput/bgr_to_rgba.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(BGR_to_BGRA,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(BGR_to_BGRA, *boost::unit_test::disabled()) { ImageMetadata::ImageType::BGR; CCNPPITestsStruct f("./data/BGR_1080x720.raw", 1080, 720, ImageMetadata::ImageType::BGR, CV_8UC3, CV_8U, ImageMetadata::ImageType::BGRA); @@ -333,7 +333,7 @@ BOOST_AUTO_TEST_CASE(BGR_to_BGRA,*boost::unit_test::disabled()) Test_Utils::saveOrCompare("./data/testOutput/bgr_to_bgra.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(BGR_to_YUV420,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(BGR_to_YUV420, *boost::unit_test::disabled()) { ImageMetadata::ImageType::BGR; CCNPPITestsStruct f("./data/BGR_1080x720.raw", 1080, 720, ImageMetadata::ImageType::BGR, CV_8UC3, CV_8U, ImageMetadata::ImageType::YUV420); @@ -441,7 +441,7 @@ BOOST_AUTO_TEST_CASE(RGBA_to_YUV420, *utf::precondition(if_compute_cap_supported Test_Utils::saveOrCompare("./data/testOutput/rgba_to_yuv420.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(BGRA_to_MONO,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(BGRA_to_MONO, *boost::unit_test::disabled()) { ImageMetadata::ImageType::BGRA; CCNPPITestsStruct f("./data/8bit_frame_1280x720_bgra.raw", 1280, 720, ImageMetadata::ImageType::RGBA, CV_8UC4, CV_8U, ImageMetadata::ImageType::MONO); @@ -459,7 +459,7 @@ BOOST_AUTO_TEST_CASE(BGRA_to_MONO,*boost::unit_test::disabled()) Test_Utils::saveOrCompare("./data/testOutput/bgra_to_mono.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(BGRA_to_RGB,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(BGRA_to_RGB, *boost::unit_test::disabled()) { ImageMetadata::ImageType::BGRA; CCNPPITestsStruct f("./data/8bit_frame_1280x720_bgra.raw", 1280, 720, ImageMetadata::ImageType::RGBA, CV_8UC4, CV_8U, ImageMetadata::ImageType::RGB); @@ -477,7 +477,7 @@ BOOST_AUTO_TEST_CASE(BGRA_to_RGB,*boost::unit_test::disabled()) Test_Utils::saveOrCompare("./data/testOutput/bgra_to_rgb.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(BGRA_to_BGR,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(BGRA_to_BGR, *boost::unit_test::disabled()) { ImageMetadata::ImageType::BGRA; CCNPPITestsStruct f("./data/8bit_frame_1280x720_bgra.raw", 1280, 720, ImageMetadata::ImageType::RGBA, CV_8UC4, CV_8U, ImageMetadata::ImageType::BGR); @@ -495,7 +495,7 @@ BOOST_AUTO_TEST_CASE(BGRA_to_BGR,*boost::unit_test::disabled()) Test_Utils::saveOrCompare("./data/testOutput/bgra_to_bgr.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(BGRA_to_RGBA,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(BGRA_to_RGBA, *boost::unit_test::disabled()) { ImageMetadata::ImageType::BGRA; CCNPPITestsStruct f("./data/8bit_frame_1280x720_bgra.raw", 1280, 720, ImageMetadata::ImageType::RGBA, CV_8UC4, CV_8U, ImageMetadata::ImageType::RGBA); @@ -513,7 +513,7 @@ BOOST_AUTO_TEST_CASE(BGRA_to_RGBA,*boost::unit_test::disabled()) Test_Utils::saveOrCompare("./data/testOutput/bgra_to_rgba.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(BGRA_to_YUV420,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(BGRA_to_YUV420, *boost::unit_test::disabled()) { ImageMetadata::ImageType::BGRA; CCNPPITestsStruct f("./data/8bit_frame_1280x720_bgra.raw", 1280, 720, ImageMetadata::ImageType::BGRA, CV_8UC4, CV_8U, ImageMetadata::ImageType::YUV420); @@ -567,7 +567,7 @@ BOOST_AUTO_TEST_CASE(YUV420_to_RGB, *utf::precondition(if_compute_cap_supported( Test_Utils::saveOrCompare("./data/testOutput/YUV420_to_rgb.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(YUV420_to_BGR,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(YUV420_to_BGR, *boost::unit_test::disabled()) { ImageMetadata::ImageType::YUV420; CCNPPITestsStruct f("./data/yuv420_320x180.raw", 320, 180, ImageMetadata::ImageType::YUV420, size_t(0), CV_8U, ImageMetadata::ImageType::BGR); @@ -603,7 +603,7 @@ BOOST_AUTO_TEST_CASE(YUV420_to_RGBA, *utf::precondition(if_compute_cap_supported Test_Utils::saveOrCompare("./data/testOutput/yuv420_to_rgba.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); } -BOOST_AUTO_TEST_CASE(YUV420_to_BGRA,*boost::unit_test::disabled()) +BOOST_AUTO_TEST_CASE(YUV420_to_BGRA, *boost::unit_test::disabled()) { ImageMetadata::ImageType::YUV420; CCNPPITestsStruct f("./data/yuv420_320x180.raw", 320, 180, ImageMetadata::ImageType::YUV420, size_t(0), CV_8U, ImageMetadata::ImageType::BGRA); @@ -624,7 +624,7 @@ BOOST_AUTO_TEST_CASE(YUV420_to_BGRA,*boost::unit_test::disabled()) BOOST_AUTO_TEST_CASE(NV12_to_MONO, *boost::unit_test::disabled()) { ImageMetadata::ImageType::NV12; - CCNPPITestsStruct f("./data/nv12-704x576.raw", 704,576, ImageMetadata::ImageType::NV12, size_t(0), CV_8U, ImageMetadata::ImageType::MONO); + CCNPPITestsStruct f("./data/nv12-704x576.raw", 704, 576, ImageMetadata::ImageType::NV12, size_t(0), CV_8U, ImageMetadata::ImageType::MONO); f.fileReader->step(); f.copy1->step(); @@ -728,7 +728,7 @@ BOOST_AUTO_TEST_CASE(NV12_to_YUV420, *utf::precondition(if_compute_cap_supported BOOST_TEST(outFrame->getMetadata()->getFrameType() == FrameMetadata::RAW_IMAGE_PLANAR); Test_Utils::saveOrCompare("./data/testOutput/nv12_to_yuv420.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); - + } BOOST_AUTO_TEST_CASE(yuv411_I_1920x1080, *utf::precondition(if_compute_cap_supported())) @@ -747,7 +747,7 @@ BOOST_AUTO_TEST_CASE(yuv411_I_1920x1080, *utf::precondition(if_compute_cap_suppo auto outFrame = frames[outputPinId]; BOOST_TEST(outFrame->getMetadata()->getFrameType() == FrameMetadata::RAW_IMAGE_PLANAR); Test_Utils::saveOrCompare("./data/testOutput/yuv411_to_yuv444.raw", (const uint8_t*)outFrame->data(), outFrame->size(), 0); - + } BOOST_AUTO_TEST_CASE(YUV420_to_YUV420, *utf::precondition(if_compute_cap_supported())) @@ -777,7 +777,7 @@ BOOST_AUTO_TEST_CASE(perf, *boost::unit_test::disabled()) auto width = 1920; auto height = 1080; - + auto fileReader = boost::shared_ptr(new FileReaderModule(FileReaderModuleProps("./data/yuv411_I_1920x1080.raw"))); auto metadata = framemetadata_sp(new RawImageMetadata(width, height, ImageMetadata::ImageType::YUV411_I, CV_8UC3, 0, CV_8U, FrameMetadata::HOST, true));