captured image to save as 48bit PNG

Author: manoreken2

HDR10Capture2019/HDR10Capture.vcxproj

@@ -32,6 +32,7 @@
     <ClInclude Include="imstb_rectpack.h" />
     <ClInclude Include="imstb_textedit.h" />
     <ClInclude Include="imstb_truetype.h" />
+    <ClInclude Include="MLPngWriter.h" />
     <ClInclude Include="MLSaveSettings.h" />
     <ClInclude Include="Contrib\include\OpenEXR\half.h" />
     <ClInclude Include="Contrib\include\OpenEXR\OpenEXRConfig.h" />
@@ -57,6 +58,7 @@
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="MLDX12Common.cpp" />
     <ClCompile Include="MLImage.cpp" />
+    <ClCompile Include="MLPngWriter.cpp" />
     <ClCompile Include="MLSaveSettings.cpp" />
     <ClCompile Include="MLPngReader.cpp" />
     <ClCompile Include="MLVideoCapUser.cpp" />

HDR10Capture2019/HDR10Capture.vcxproj.filters

@@ -61,6 +61,9 @@
     <ClCompile Include="MLConverter.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="MLPngWriter.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="d3dx12.h">
@@ -147,6 +150,9 @@
     <ClInclude Include="MLConverter.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="MLPngWriter.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="shaderColorConvPS.hlsl">

HDR10Capture2019/MLDX12App.cpp

@@ -9,6 +9,7 @@
 #include "half.h"
 #include "MLImage.h"
 #include "MLPngReader.h"
+#include "MLPngWriter.h"
 #include "MLBmpReader.h"
 #include "MLVideoCaptureEnumToStr.h"
 
@@ -1212,10 +1213,11 @@ MLDX12App::ShowSettingsWindow(void) {
 }
 
 void
-MLDX12App::ShowFileReadWindow(void) {
-    ImGui::Begin("File Read");
+MLDX12App::ShowImageFileRWWindow(void) {
+    int hr = S_OK;
+    ImGui::Begin("File Read / Write");
 
-    if (ImGui::BeginPopupModal("ErrorFileReadPopup", nullptr, ImGuiWindowFlags_AlwaysAutoResize)) {
+    if (ImGui::BeginPopupModal("ErrorImageFileRWPopup", nullptr, ImGuiWindowFlags_AlwaysAutoResize)) {
         ImGui::Text(mErrorFileReadMsg);
         if (ImGui::Button("OK ## EFM", ImVec2(120, 0))) {
             ImGui::CloseCurrentPopup();
@@ -1224,24 +1226,39 @@ MLDX12App::ShowFileReadWindow(void) {
         ImGui::EndPopup();
     }
 
-    ImGui::InputText("Image Filename to Read", mImgFilePath, sizeof mImgFilePath - 1);
-    if (ImGui::Button("Open ##RF0")) {
-        mMutex.lock();
-        int rv = MLBmpRead(mImgFilePath, mShowImg);
-        if (rv == 1) {
-            // ファイルは存在するがBMPではなかった場合。
-            rv = MLPngRead(mImgFilePath, mShowImg);
-            if (rv == 1) {
-                // ファイルは存在するがPNGではなかった場合。
-                rv = MLExrRead(mImgFilePath, mShowImg);
+    if (mState == S_Capturing) {
+        // キャプチャー中。
+        ImGui::InputText("PNG Image Filename to Write", mImgFilePath, sizeof mImgFilePath - 1);
+        if (ImGui::Button("Write PNG ##RF0")) {
+            mMutex.lock();
+            hr = MLPngWrite(mImgFilePath, mShowImg);
+            mMutex.unlock();
+
+            if (FAILED(hr)) {
+                sprintf_s(mErrorFileReadMsg, "Write PNG Image Failed.\nFile Write error : %s", mImgFilePath);
+                ImGui::OpenPopup("ErrorImageFileRWPopup");
             }
         }
-        mMutex.unlock();
-        if (rv < 0) {
-            sprintf_s(mErrorFileReadMsg, "Read Image Failed.\nFile open error : %s", mImgFilePath);
-            ImGui::OpenPopup("ErrorFileReadPopup");
-        } else {
-            mState = S_ImageViewing;
+    } else {
+        ImGui::InputText("Image Filename to Read", mImgFilePath, sizeof mImgFilePath - 1);
+        if (ImGui::Button("Read ##RF0")) {
+            mMutex.lock();
+            hr = MLBmpRead(mImgFilePath, mShowImg);
+            if (hr == 1) {
+                // ファイルは存在するがBMPではなかった場合。
+                hr = MLPngRead(mImgFilePath, mShowImg);
+                if (hr == 1) {
+                    // ファイルは存在するがPNGではなかった場合。
+                    hr = MLExrRead(mImgFilePath, mShowImg);
+                }
+            }
+            mMutex.unlock();
+            if (hr < 0) {
+                sprintf_s(mErrorFileReadMsg, "Read Image Failed.\nFile open error : %s", mImgFilePath);
+                ImGui::OpenPopup("ErrorImageFileRWPopup");
+            } else {
+                mState = S_ImageViewing;
+            }
         }
     }
 
@@ -1252,9 +1269,10 @@ void
 MLDX12App::ImGuiCommands(void) {
     if (mShowImGui) {
         //ImGui::ShowDemoWindow();
-        ShowSettingsWindow();
-        ShowFileReadWindow();
+        // 順番が重要。キャプチャー画像を保存するため。
         ShowVideoCaptureWindow();
+        ShowImageFileRWWindow();
+        ShowSettingsWindow();
     }
 
     ImGui::Render();

HDR10Capture2019/MLDX12App.h

@@ -163,7 +163,7 @@ class MLDX12App : public MLDX12 {
     void DrawFullscreenTexture(TextureEnum texId, MLImage & drawMode);
 
     void ShowSettingsWindow(void);
-    void ShowFileReadWindow(void);
+    void ShowImageFileRWWindow(void);
 
     void UploadImgToGpu(MLImage &ci, ComPtr<ID3D12Resource> &tex, int texIdx);
     void AdjustFullScreenQuadAspectRatio(int w, int h);

HDR10Capture2019/MLPngWriter.cpp

@@ -0,0 +1,138 @@
+#include "MLPngWriter.h"
+#include <png.h>
+#include <stdio.h>
+#include <Windows.h>
+#include <half.h>
+#include <assert.h>
+#include <stdint.h>
+
+static uint16_t
+HtoNS(uint16_t v)
+{
+    return   ((v & 0xff) << 8)
+           | ((v >> 8) & 0xff);
+}
+
+/// <summary>
+/// PNGファイルを書き込む。
+/// </summary>
+/// <returns>0:成功。負の数:失敗。</returns>
+int MLPngWrite(const char* pngFilePath, const MLImage& img)
+{
+    png_structp png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+    if (!png) {
+        printf("Error: png_create_write_struct failed.\n");
+        return E_FAIL;
+    }
+    png_infop info = png_create_info_struct(png);
+    if (!info) {
+        png_destroy_write_struct(&png, &info);
+        printf("Error: png_create_info_struct failed.\n");
+        return E_FAIL;
+    }
+
+    // 書き込む画像データを準備します。
+    uint8_t* data = nullptr;
+    png_bytepp rows = nullptr;
+
+    int bitDepth = 8;
+    if (8 == img.originalBitDepth) {
+        // R8G8B8A8
+        bitDepth = 8;
+        switch (img.bitFormat) {
+        case MLImage::BFT_UIntR8G8B8A8:
+            break;
+        default:
+            // 作ってない。
+            return E_NOTIMPL;
+        }
+
+        rows = (png_bytepp)png_malloc(png, img.height * sizeof(png_bytep));
+        data = new uint8_t[(int64_t)img.width * img.height * 3 * bitDepth / 8];
+        for (int y = 0; y < img.height; ++y) {
+            rows[y] = (png_bytep)(data + (0 + y * img.width) * 3);
+            for (int x = 0; x < img.width; ++x) {
+                const int readPos = (x + y * img.width) * 4;
+
+                const uint8_t r = img.data[readPos + 0];
+                const uint8_t g = img.data[readPos + 1];
+                const uint8_t b = img.data[readPos + 2];
+
+                const int writePos = (x + y * img.width) * 3;
+                data[writePos + 0] = r;
+                data[writePos + 1] = g;
+                data[writePos + 2] = b;
+            }
+        }
+    } else {
+        // R10G10B10A2
+        bitDepth = 16;
+        switch (img.bitFormat) {
+        case MLImage::BFT_UIntR10G10B10A2:
+            break;
+        default:
+            // 作ってない。
+            return E_NOTIMPL;
+        }
+
+        uint32_t* from32 = (uint32_t*)img.data;
+        rows = (png_bytepp)png_malloc(png, img.height * sizeof(png_bytep));
+        data = new uint8_t[(int64_t)img.width * img.height * 3 * bitDepth / 8];
+        uint16_t* data16 = (uint16_t*)data;
+        for (int y = 0; y < img.height; ++y) {
+            rows[y] = (uint8_t*)&data16[(0 + y * img.width) * 3];
+            for (int x = 0; x < img.width; ++x) {
+                const int readPos = (x + y * img.width);
+                const uint32_t v = from32[readPos];
+                // v: AABBBBBB BBBBGGGG GGGGGGRR RRRRRRRR
+
+                uint16_t r = (v << 6) & 0xffc0;
+                uint16_t g = (v >> 4) & 0xffc0;
+                uint16_t b = (v >> 14) & 0xffc0;
+
+                const int writePos = (x + y * img.width) * 3;
+                data16[writePos + 0] = HtoNS(r);
+                data16[writePos + 1] = HtoNS(g);
+                data16[writePos + 2] = HtoNS(b);
+            }
+        }
+    }
+
+    // ここでファイルを書き込みオープン。
+    FILE* fp = nullptr;
+    int ercd = fopen_s(&fp, pngFilePath, "wb");
+    if (0 != ercd || !fp) {
+        printf("Error: PngWrite failed. %s\n", pngFilePath);
+
+        png_free(png, rows);
+        rows = nullptr;
+        
+        png_destroy_write_struct(&png, &info);
+
+        delete[] data;
+        return E_FAIL;
+    }
+
+    png_init_io(png, fp);
+
+    png_set_IHDR(png, info, img.width, img.height, bitDepth, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
+        PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+    png_write_info(png, info);
+    png_set_packing(png);
+
+    png_write_image(png, rows);
+    png_write_end(png, info);
+
+    png_free(png, rows);
+    rows = nullptr;
+
+    png_destroy_write_struct(&png, &info);
+
+    fclose(fp);
+
+    return S_OK;
+}
+
+
+
+

HDR10Capture2019/MLPngWriter.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "MLImage.h"
+
+/// <summary>
+/// PNGファイルを書き込む。
+/// </summary>
+/// <returns>0:成功。負の数:失敗。</returns>
+int MLPngWrite(const char* pngFilePath, const MLImage& img);
+