Skip to content

Commit 7875ca6

Browse files
ReneThraneReneThrane
committed
Release 6.2.4
- Updated zlib version - OpenCL SoftISP Fix denoise kernel issue Change-Id: I2b47505100e62a8a0672f1a8b6f56021fce3bd0b
1 parent f4db193 commit 7875ca6

File tree

10 files changed

+932
-895
lines changed

10 files changed

+932
-895
lines changed

‎DemoApps/OpenCL/SoftISP/Content/isp_kernel.cl‎

Lines changed: 764 additions & 734 deletions
Large diffs are not rendered by default.

‎DemoApps/OpenCL/SoftISP/Fsl.gen‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<FslBuildGen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../FslBuildGen.xsd">
33
<Executable Name="OpenCL.SoftISP" NoInclude="true" CreationYear="2016">
4-
<Default.Platform.Supported Value="false"/>
54
<ImportTemplate Name="DemoAppOpenCL1_2"/>
6-
<Platform Name="Yocto" Supported="true"/>
75
</Executable>
86
</FslBuildGen>

‎DemoApps/OpenCL/SoftISP/source/OptionParser.cpp‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,12 @@ namespace Fsl
6161
}
6262

6363

64-
OptionParser::~OptionParser()
65-
{
66-
}
64+
OptionParser::~OptionParser() = default;
6765

6866

6967
void OptionParser::OnArgumentSetup(std::deque<Option>& rOptions)
7068
{
71-
rOptions.push_back(Option("Enable", OptionArgument::OptionNone, CommandId::DenoiseStatus, "Enable denoise function."));
69+
rOptions.emplace_back("Enable", OptionArgument::OptionNone, CommandId::DenoiseStatus, "Enable denoise function.");
7270
rOptions.emplace_back("c", "m_cycleNum", OptionArgument::OptionRequired, CommandId::CycleNum, "Control the number of cycle");
7371
}
7472

@@ -81,7 +79,7 @@ namespace Fsl
8179
return OptionParseResult::Parsed;
8280
case CommandId::CycleNum:
8381
StringParseUtil::Parse(m_cycleNum, strOptArg);
84-
m_cycleNum = std::max(m_cycleNum, uint32_t(1));
82+
m_cycleNum = std::max(m_cycleNum, static_cast<uint32_t>(1));
8583
return OptionParseResult::Parsed;
8684
default:
8785
return OptionParseResult::NotHandled;

‎DemoApps/OpenCL/SoftISP/source/OptionParser.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,22 @@ namespace Fsl
4242

4343
public:
4444
OptionParser();
45-
~OptionParser();
45+
~OptionParser() override;
4646

4747
bool GetDenoiseStatus() const
4848
{
4949
return m_denoiseStatus;
5050
}
5151

52-
int32_t GetCycleNumStatus() const
52+
uint32_t GetCycleNumStatus() const
5353
{
5454
return m_cycleNum;
5555
}
5656

5757
protected:
58-
virtual void OnArgumentSetup(std::deque<Option>& rOptions) override;
59-
virtual OptionParseResult OnParse(const int32_t cmdId, const StringViewLite& strOptArg) override;
60-
virtual bool OnParsingComplete() override;
58+
void OnArgumentSetup(std::deque<Option>& rOptions) override;
59+
OptionParseResult OnParse(const int32_t cmdId, const StringViewLite& strOptArg) override;
60+
bool OnParsingComplete() override;
6161
};
6262
}
6363

‎DemoApps/OpenCL/SoftISP/source/SoftISP.cpp‎

Lines changed: 139 additions & 122 deletions
Large diffs are not rendered by default.

‎DemoApps/OpenCL/SoftISP/source/SoftISP.hpp‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*
3232
****************************************************************************************************************************************************/
3333

34+
#include <FslBase/Span/Span.hpp>
3435
#include <FslDemoApp/OpenCL/DemoAppOpenCL.hpp>
3536
#include <FslUtil/OpenCL1_2/ContextEx.hpp>
3637
#include <RapidOpenCL1/Buffer.hpp>
@@ -43,25 +44,18 @@ namespace Fsl
4344
{
4445
class SoftISP : public DemoAppOpenCL
4546
{
46-
OpenCL::ContextEx m_context;
47-
cl_device_id m_deviceId;
48-
RapidOpenCL1::CommandQueue m_commandQueue;
4947
bool m_denoiseEn;
5048
int32_t m_cycleNum = 1000;
51-
const std::size_t m_BINS = 256;
52-
const std::size_t m_imgWid = 1920;
53-
const std::size_t m_imgHei = 1080;
54-
const std::size_t m_imgSize = 1920 * 1080;
5549

5650
std::vector<uint8_t> m_dst0;
5751
std::vector<uint8_t> m_dst1;
5852
std::vector<uint8_t> m_dst2;
5953
std::vector<uint8_t> m_dst3;
6054
std::vector<uint8_t> m_dst4;
6155
std::vector<uint8_t> m_dst5;
62-
std::vector<uint8_t> m_YBuf;
63-
std::vector<uint8_t> m_YBufOut;
64-
std::vector<uint8_t> m_UVBuf;
56+
std::vector<uint8_t> m_yBuf;
57+
std::vector<uint8_t> m_yBufOut;
58+
std::vector<uint8_t> m_uvBuf;
6559
int m_pixelValueR;
6660
int m_pixelValueG;
6761
int m_pixelValueB;
@@ -78,13 +72,13 @@ namespace Fsl
7872
std::vector<RapidOpenCL1::Buffer> m_deviceDist;
7973

8074
public:
81-
SoftISP(const DemoAppConfig& config);
82-
~SoftISP();
75+
explicit SoftISP(const DemoAppConfig& config);
76+
~SoftISP() override;
8377

8478
protected:
85-
virtual void Run() override;
79+
void Run() override;
8680
void AllocateMemory(const cl_context context, const std::size_t size);
87-
void CopyToBMP(Bitmap& bitmap, const IO::Path& fileName, const void* ptr);
81+
void CopyToBMP(Bitmap& rBitmap, const IO::Path& fileName, const Span<uint8_t> span);
8882
};
8983
}
9084

‎Project.gen‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<FslBuildGenProjectRoot Version="1">
3-
<Project Name="DemoFramework" ShortName="DF" Version="6.2.3" DefaultTemplate="DF" DefaultPackageLanguage="C++" DefaultCompany="NXP" RequirePackageCreationYear="true" ToolConfigFile=".Config/FslBuildGen.xml">
3+
<Project Name="DemoFramework" ShortName="DF" Version="6.2.4" DefaultTemplate="DF" DefaultPackageLanguage="C++" DefaultCompany="NXP" RequirePackageCreationYear="true" ToolConfigFile=".Config/FslBuildGen.xml">
44
<!-- Add a base package that all other packages dependent on -->
55
<AddBasePackage Name="Platform"/>
66
<AddRootDirectory Name="$(FSL_GRAPHICS_SDK)"/>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- #AG_PROJECT_CAPTION_BEGIN# -->
2-
# DemoFramework 6.2.3
2+
# DemoFramework 6.2.4
33
<!-- #AG_PROJECT_CAPTION_END# -->
44

55
A multi-platform framework for fast and easy demo development.

‎SCR-gtec-demo-framework.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Package: gtec-demo-framework.git
2-
Version: 6.2.3
2+
Version: 6.2.4
33
Outgoing License: BSD-3-Clause
44
License File: License.md
55
Package Category: Graphics
66
Type of Content: source
77
Description and comments: Graphics sample applications
8-
Release Location: https://github.com/NXPmicro/gtec-demo-framework -b 6.2.3
8+
Release Location: https://github.com/NXPmicro/gtec-demo-framework -b 6.2.4
99
Origin: NXP (BSD-3-clause)
1010
Demo Framework
1111
Sascha Willems - Vulkan demo (MIT) - https://github.com/SaschaWillems/Vulkan

‎ThirdParty/Recipe/zlib_1_3/Fsl.gen‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<Default.Platform.Supported Value="false"/>
55

66
<Platform Name="Android" Supported="false">
7-
<ExperimentalRecipe Name="ZLIB" Version="1.3" FindTargetName="ZLIB::ZLIB">
7+
<ExperimentalRecipe Name="ZLIB" Version="1.3.1" FindTargetName="ZLIB::ZLIB">
88
<Pipeline>
9-
<Download URL="https://zlib.net/zlib-1.3.tar.gz" Hash="ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e"/>
10-
<Unpack File="zlib-1.3.tar.gz" OutputPath="zlib-1.3"/>
9+
<Download URL="https://zlib.net/zlib-1.3.1.tar.gz" Hash="9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23"/>
10+
<Unpack File="zlib-1.3.1.tar.gz" OutputPath="zlib-1.3.1"/>
1111
<CMakeBuild Project="" Target="install" Configuration="release" OutputPath="_Install"/>
1212
</Pipeline>
1313
<Installation>
@@ -22,10 +22,10 @@
2222

2323

2424
<Platform Name="Ubuntu;QNX" Supported="true">
25-
<ExperimentalRecipe Name="ZLIB" Version="1.3" FindTargetName="ZLIB::ZLIB">
25+
<ExperimentalRecipe Name="ZLIB" Version="1.3.1" FindTargetName="ZLIB::ZLIB">
2626
<Pipeline>
27-
<Download URL="https://zlib.net/zlib-1.3.tar.gz" Hash="ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e"/>
28-
<Unpack File="zlib-1.3.tar.gz" OutputPath="zlib-1.3"/>
27+
<Download URL="https://zlib.net/zlib-1.3.1.tar.gz" Hash="9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23"/>
28+
<Unpack File="zlib-1.3.1.tar.gz" OutputPath="zlib-1.3.1"/>
2929
<CMakeBuild Project="" Target="install" Configuration="debug;release" OutputPath="_Install"/>
3030
</Pipeline>
3131
<Installation>
@@ -39,10 +39,10 @@
3939
</Platform>
4040

4141
<Platform Name="Windows" Supported="true">
42-
<ExperimentalRecipe Name="ZLIB" Version="1.3">
42+
<ExperimentalRecipe Name="ZLIB" Version="1.3.1">
4343
<Pipeline>
44-
<Download URL="https://zlib.net/zlib-1.3.tar.gz" Hash="ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e"/>
45-
<Unpack File="zlib-1.3.tar.gz" OutputPath="zlib-1.3"/>
44+
<Download URL="https://zlib.net/zlib-1.3.1.tar.gz" Hash="9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23"/>
45+
<Unpack File="zlib-1.3.1.tar.gz" OutputPath="zlib-1.3.1"/>
4646
<CMakeBuild Project="" Target="install" Configuration="release" OutputPath="_Install"/>
4747
</Pipeline>
4848
<Installation>

0 commit comments

Comments
 (0)