Skip to content

Commit 270dc03

Browse files
manoreken2manoreken2
committed
code merged
1 parent 2c1cc22 commit 270dc03

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+728
-34753
lines changed

‎AviToExrSequence/AviToExrSequence.vcxproj

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,22 @@
4545
<PropertyGroup Label="UserMacros" />
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4747
<LinkIncremental>true</LinkIncremental>
48-
<LibraryPath>..\HDR10Capture2019\Contrib\lib;$(LibraryPath)</LibraryPath>
48+
<LibraryPath>..\Contrib\lib;$(LibraryPath)</LibraryPath>
49+
<IntDir>$(ProjectDir)$(Platform)\$(Configuration)\</IntDir>
4950
</PropertyGroup>
5051
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
5152
<LinkIncremental>false</LinkIncremental>
52-
<LibraryPath>..\HDR10Capture2019\Contrib\lib;$(LibraryPath)</LibraryPath>
53+
<LibraryPath>..\Contrib\lib;$(LibraryPath)</LibraryPath>
54+
<IntDir>$(ProjectDir)$(Platform)\$(Configuration)\</IntDir>
5355
</PropertyGroup>
5456
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5557
<ClCompile>
5658
<WarningLevel>Level3</WarningLevel>
5759
<SDLCheck>true</SDLCheck>
5860
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5961
<ConformanceMode>true</ConformanceMode>
60-
<AdditionalIncludeDirectories>..\HDR10Capture2019;..\HDR10Capture2019\Contrib\include;..\HDR10Capture2019\Contrib\include\OpenEXR</AdditionalIncludeDirectories>
62+
<AdditionalIncludeDirectories>..\Common;..\Contrib\include;..\Contrib\include\OpenEXR</AdditionalIncludeDirectories>
63+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
6164
</ClCompile>
6265
<Link>
6366
<SubSystem>Console</SubSystem>
@@ -73,7 +76,8 @@
7376
<SDLCheck>true</SDLCheck>
7477
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7578
<ConformanceMode>true</ConformanceMode>
76-
<AdditionalIncludeDirectories>..\HDR10Capture2019;..\HDR10Capture2019\Contrib\include;..\HDR10Capture2019\Contrib\include\OpenEXR</AdditionalIncludeDirectories>
79+
<AdditionalIncludeDirectories>..\Common;..\Contrib\include;..\Contrib\include\OpenEXR</AdditionalIncludeDirectories>
80+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
7781
</ClCompile>
7882
<Link>
7983
<SubSystem>Console</SubSystem>
@@ -84,21 +88,21 @@
8488
</Link>
8589
</ItemDefinitionGroup>
8690
<ItemGroup>
87-
<ClCompile Include="..\HDR10Capture2019\MLAviCommon.cpp" />
88-
<ClCompile Include="..\HDR10Capture2019\MLAviReader.cpp" />
89-
<ClCompile Include="..\HDR10Capture2019\MLAviWriter.cpp" />
90-
<ClCompile Include="..\HDR10Capture2019\MLConverter.cpp" />
91-
<ClCompile Include="..\HDR10Capture2019\MLExrWriter.cpp" />
92-
<ClCompile Include="..\HDR10Capture2019\MLImage.cpp" />
91+
<ClCompile Include="..\Common\MLAviCommon.cpp" />
92+
<ClCompile Include="..\Common\MLAviReader.cpp" />
93+
<ClCompile Include="..\Common\MLAviWriter.cpp" />
94+
<ClCompile Include="..\Common\MLConverter.cpp" />
95+
<ClCompile Include="..\Common\MLExrWriter.cpp" />
96+
<ClCompile Include="..\Common\MLImage2.cpp" />
9397
<ClCompile Include="Main.cpp" />
9498
</ItemGroup>
9599
<ItemGroup>
96-
<ClInclude Include="..\HDR10Capture2019\MLAVICommon.h" />
97-
<ClInclude Include="..\HDR10Capture2019\MLAviReader.h" />
98-
<ClInclude Include="..\HDR10Capture2019\MLAviWriter.h" />
99-
<ClInclude Include="..\HDR10Capture2019\MLConverter.h" />
100-
<ClInclude Include="..\HDR10Capture2019\MLExrWriter.h" />
101-
<ClInclude Include="..\HDR10Capture2019\MLImage.h" />
100+
<ClInclude Include="..\Common\MLAVICommon.h" />
101+
<ClInclude Include="..\Common\MLAviReader.h" />
102+
<ClInclude Include="..\Common\MLAviWriter.h" />
103+
<ClInclude Include="..\Common\MLConverter.h" />
104+
<ClInclude Include="..\Common\MLExrWriter.h" />
105+
<ClInclude Include="..\Common\MLImage2.h" />
102106
</ItemGroup>
103107
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
104108
<ImportGroup Label="ExtensionTargets">

‎AviToExrSequence/AviToExrSequence.vcxproj.filters

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,51 @@
1313
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
1414
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
1515
</Filter>
16-
<Filter Include="HDR10Capture">
17-
<UniqueIdentifier>{5f731e82-8318-4c1e-9cf4-13299cb343bf}</UniqueIdentifier>
16+
<Filter Include="Common">
17+
<UniqueIdentifier>{189698b9-e8df-425a-880c-f9d3c06d021e}</UniqueIdentifier>
1818
</Filter>
1919
</ItemGroup>
2020
<ItemGroup>
21-
<ClCompile Include="..\HDR10Capture2019\MLAviCommon.cpp">
22-
<Filter>HDR10Capture</Filter>
21+
<ClCompile Include="Main.cpp">
22+
<Filter>Source Files</Filter>
2323
</ClCompile>
24-
<ClCompile Include="..\HDR10Capture2019\MLAviReader.cpp">
25-
<Filter>HDR10Capture</Filter>
24+
<ClCompile Include="..\Common\MLAviCommon.cpp">
25+
<Filter>Common</Filter>
2626
</ClCompile>
27-
<ClCompile Include="..\HDR10Capture2019\MLAviWriter.cpp">
28-
<Filter>HDR10Capture</Filter>
27+
<ClCompile Include="..\Common\MLAviReader.cpp">
28+
<Filter>Common</Filter>
2929
</ClCompile>
30-
<ClCompile Include="..\HDR10Capture2019\MLExrWriter.cpp">
31-
<Filter>HDR10Capture</Filter>
30+
<ClCompile Include="..\Common\MLAviWriter.cpp">
31+
<Filter>Common</Filter>
3232
</ClCompile>
33-
<ClCompile Include="..\HDR10Capture2019\MLImage.cpp">
34-
<Filter>HDR10Capture</Filter>
33+
<ClCompile Include="..\Common\MLConverter.cpp">
34+
<Filter>Common</Filter>
3535
</ClCompile>
36-
<ClCompile Include="..\HDR10Capture2019\MLConverter.cpp">
37-
<Filter>HDR10Capture</Filter>
36+
<ClCompile Include="..\Common\MLExrWriter.cpp">
37+
<Filter>Common</Filter>
3838
</ClCompile>
39-
<ClCompile Include="Main.cpp">
40-
<Filter>Source Files</Filter>
39+
<ClCompile Include="..\Common\MLImage2.cpp">
40+
<Filter>Common</Filter>
4141
</ClCompile>
4242
</ItemGroup>
4343
<ItemGroup>
44-
<ClInclude Include="..\HDR10Capture2019\MLAVICommon.h">
45-
<Filter>HDR10Capture</Filter>
44+
<ClInclude Include="..\Common\MLAVICommon.h">
45+
<Filter>Common</Filter>
4646
</ClInclude>
47-
<ClInclude Include="..\HDR10Capture2019\MLAviReader.h">
48-
<Filter>HDR10Capture</Filter>
47+
<ClInclude Include="..\Common\MLAviReader.h">
48+
<Filter>Common</Filter>
4949
</ClInclude>
50-
<ClInclude Include="..\HDR10Capture2019\MLAviWriter.h">
51-
<Filter>HDR10Capture</Filter>
50+
<ClInclude Include="..\Common\MLAviWriter.h">
51+
<Filter>Common</Filter>
5252
</ClInclude>
53-
<ClInclude Include="..\HDR10Capture2019\MLExrWriter.h">
54-
<Filter>HDR10Capture</Filter>
53+
<ClInclude Include="..\Common\MLConverter.h">
54+
<Filter>Common</Filter>
5555
</ClInclude>
56-
<ClInclude Include="..\HDR10Capture2019\MLImage.h">
57-
<Filter>HDR10Capture</Filter>
56+
<ClInclude Include="..\Common\MLExrWriter.h">
57+
<Filter>Common</Filter>
5858
</ClInclude>
59-
<ClInclude Include="..\HDR10Capture2019\MLConverter.h">
60-
<Filter>HDR10Capture</Filter>
59+
<ClInclude Include="..\Common\MLImage2.h">
60+
<Filter>Common</Filter>
6161
</ClInclude>
6262
</ItemGroup>
6363
</Project>

‎AviToExrSequence/Main.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ Process(const wchar_t* inAviPath, const char* outExrPrefix, const bool PQ) {
2727

2828
MLConverter::ColorSpace cs = MLConverter::CS_Rec709;
2929
MLColorGamutType gamut = ML_CG_Rec709;
30-
MLImage::GammaType gamma = MLImage::MLG_G22;
30+
MLImage2::GammaType gamma = MLImage2::MLG_G22;
3131
if (PQ) {
3232
cs = MLConverter::CS_Rec2020;
3333
gamut = ML_CG_Rec2020;
34-
gamma = MLImage::MLG_ST2084;
34+
gamma = MLImage2::MLG_ST2084;
3535
}
3636

3737
uint8_t* buf1 = nullptr;
@@ -86,10 +86,10 @@ Process(const wchar_t* inAviPath, const char* outExrPrefix, const bool PQ) {
8686
assert(0);
8787
}
8888

89-
MLImage mi;
89+
MLImage2 mi;
9090
mi.Init(imgFmt.biWidth, imgFmt.biHeight,
91-
MLImage::IFFT_CapturedImg,
92-
MLImage::BFT_UIntR10G10B10A2,
91+
MLImage2::IFFT_CapturedImg,
92+
MLImage2::BFT_UIntR10G10B10A2,
9393
gamut, gamma,
9494
10, 3, imgFmt.biSizeImage, buf2);
9595

‎Common/MLBmpReader.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/// BMPファイルを読む。
99
/// </summary>
1010
/// <returns>0:成功。負の数:失敗。1:BMPファイルでは無かった。</returns>
11-
int MLBmpRead(const wchar_t* filePath, MLImage& img_return) {
11+
int MLBmpRead(const wchar_t* filePath, MLImage2& img_return) {
1212
FILE* fp = nullptr;
1313

1414
int ercd = _wfopen_s(&fp, filePath, L"rb");
@@ -49,38 +49,38 @@ int MLBmpRead(const wchar_t* filePath, MLImage& img_return) {
4949
int orig_bit_depth = 8;
5050
int orig_num_channels = 3;
5151
MLColorGamutType colorGamut = ML_CG_Rec709;
52-
MLImage::GammaType gammaType = MLImage::MLG_G22;
53-
MLImage::BitFormatType bitFmt = MLImage::BFT_UIntR8G8B8A8;
52+
MLImage2::GammaType gammaType = MLImage2::MLG_G22;
53+
MLImage2::BitFormatType bitFmt = MLImage2::BFT_UIntR8G8B8A8;
5454
switch (bmpih.biBitCount) {
5555
case 24:
5656
orig_bit_depth = 8;
5757
orig_num_channels = 3;
58-
bitFmt = MLImage::BFT_UIntR8G8B8A8;
58+
bitFmt = MLImage2::BFT_UIntR8G8B8A8;
5959
colorGamut = ML_CG_Rec709;
60-
gammaType = MLImage::MLG_G22;
60+
gammaType = MLImage2::MLG_G22;
6161
break;
6262
case 32:
6363
orig_bit_depth = 8;
6464
orig_num_channels = 4;
65-
bitFmt = MLImage::BFT_UIntR8G8B8A8;
65+
bitFmt = MLImage2::BFT_UIntR8G8B8A8;
6666
colorGamut = ML_CG_Rec709;
67-
gammaType = MLImage::MLG_G22;
67+
gammaType = MLImage2::MLG_G22;
6868
break;
6969
case 48:
7070
orig_bit_depth = 16;
7171
orig_num_channels = 3;
7272
// 16bit画像の時HDR10 PQ画像が入っているという想定。
73-
bitFmt = MLImage::BFT_UIntR16G16B16A16;
73+
bitFmt = MLImage2::BFT_UIntR16G16B16A16;
7474
colorGamut = ML_CG_Rec2020;
75-
gammaType = MLImage::MLG_ST2084;
75+
gammaType = MLImage2::MLG_ST2084;
7676
break;
7777
case 64:
7878
orig_bit_depth = 16;
7979
orig_num_channels = 4;
8080
// 16bit画像の時HDR10 PQ画像が入っているという想定。
81-
bitFmt = MLImage::BFT_UIntR16G16B16A16;
81+
bitFmt = MLImage2::BFT_UIntR16G16B16A16;
8282
colorGamut = ML_CG_Rec2020;
83-
gammaType = MLImage::MLG_ST2084;
83+
gammaType = MLImage2::MLG_ST2084;
8484
break;
8585
default:
8686
// ここには来ない。
@@ -103,7 +103,7 @@ int MLBmpRead(const wchar_t* filePath, MLImage& img_return) {
103103

104104
if (orig_bit_depth == 8) {
105105
img_return.Term();
106-
img_return.Init(width, height, MLImage::IFFT_BMP, bitFmt,
106+
img_return.Init(width, height, MLImage2::IFFT_BMP, bitFmt,
107107
colorGamut,
108108
gammaType,
109109
orig_bit_depth,
@@ -113,7 +113,7 @@ int MLBmpRead(const wchar_t* filePath, MLImage& img_return) {
113113
for (int y = 0; y < height; ++y) {
114114
for (int x = 0; x < width; ++x) {
115115
// 24bit BMPはBGR、左から右、下から上の順に値が入っている。
116-
// MLImageはRGBA、左から右、上から下の順。
116+
// MLImage2はRGBA、左から右、上から下の順。
117117
int readP = (x + (height - y - 1) * width) * orig_num_channels;
118118
int writeP = (x + y * width) * 4;
119119

@@ -129,7 +129,7 @@ int MLBmpRead(const wchar_t* filePath, MLImage& img_return) {
129129
}
130130
} else if (orig_bit_depth == 16) {
131131
img_return.Term();
132-
img_return.Init(width, height, MLImage::IFFT_BMP, bitFmt,
132+
img_return.Init(width, height, MLImage2::IFFT_BMP, bitFmt,
133133
colorGamut,
134134
gammaType,
135135
orig_bit_depth,

‎Common/MLBmpReader.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include "MLImage.h"
3+
#include "MLImage2.h"
44

55
/// <summary>
66
/// BMPファイルを読む。
77
/// </summary>
88
/// <returns>0:成功。負の数:失敗。1:BMPファイルでは無かった。</returns>
9-
int MLBmpRead(const wchar_t* filePath, MLImage& img_return);
9+
int MLBmpRead(const wchar_t* filePath, MLImage2& img_return);

‎Common/MLBmpWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ FloatToUint16(float v) {
1818
/// 24bit BMP または 48bit BMPファイルを書き込む。
1919
/// </summary>
2020
/// <returns>0:成功。負の数:失敗。</returns>
21-
int MLBmpWrite(const wchar_t* filePath, MLImage& img)
21+
int MLBmpWrite(const wchar_t* filePath, MLImage2& img)
2222
{
2323
FILE* fp = nullptr;
2424
int ercd = _wfopen_s(&fp, filePath, L"wb");
@@ -30,7 +30,7 @@ int MLBmpWrite(const wchar_t* filePath, MLImage& img)
3030
int64_t imgBytes = 0;
3131
uint8_t* imgTo = nullptr;
3232
int biBitCount = 0;
33-
if (img.bitFormat == MLImage::BFT_UIntR8G8B8A8) {
33+
if (img.bitFormat == MLImage2::BFT_UIntR8G8B8A8) {
3434
// 24bit BGR画像データ作成。
3535
biBitCount = 24;
3636
imgBytes = (int64_t)img.width * img.height * 3 * sizeof(uint8_t); // 3==書き込みデータのnumCh

‎Common/MLBmpWriter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3-
#include "MLImage.h"
3+
#include "MLImage2.h"
44

55
/// <summary>
66
/// 48bit BMPファイルを書き込む。
77
/// </summary>
88
/// <returns>0:成功。負の数:失敗。</returns>
9-
int MLBmpWrite(const wchar_t* filePath, MLImage& img);
9+
int MLBmpWrite(const wchar_t* filePath, MLImage2& img);
1010

‎Common/MLColorConvShaderConstants.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#pragma once
22

33
#include <DirectXMath.h>
4-
#include "MLImage.h"
4+
#include "MLImage2.h"
55

66

77
struct MLColorConvShaderConstants {
88
DirectX::XMMATRIX colorConvMat;
99
DirectX::XMFLOAT4 outOfRangeColor;
10-
int imgGammaType; //< MLImage::GammaType
10+
int imgGammaType; //< MLImage2::GammaType
1111
int flags; //< FlagsType
1212
float outOfRangeNits;
1313
float scale;

0 commit comments

Comments
 (0)