playback function of Recorded AVI

Author: manoreken2

MLDX12VideoCapture/MLAVICommon.h

@@ -15,6 +15,7 @@ enum MLFOURCC {
     MLFOURCC_strh = 0x68727473,
     MLFOURCC_strf = 0x66727473,
     MLFOURCC_vids = 0x73646976,
+    MLFOURCC_auds = 0x73647561,
     MLFOURCC_v210 = 0x30313276,
     MLFOURCC_AVIX = 0x58495641,
     MLFOURCC_movi = 0x69766f6d,

MLDX12VideoCapture/MLAviReader.cpp

@@ -14,6 +14,28 @@ MLAviReader::~MLAviReader(void)
     Close();
 }
 
+MLVideoTime
+MLAviReader::FrameNrToTime(const int frameNr)
+{
+    MLVideoTime r;
+    memset(&r, 0, sizeof r);
+
+    if (FramesPerSec() == 0) {
+        return r;
+    }
+
+    r.frame = frameNr % FramesPerSec();
+    const int totalSec = frameNr / FramesPerSec();
+
+    r.hour = totalSec / 3600;
+    int remain = totalSec - r.hour * 3600;
+    r.min = remain / 60;
+    remain -= r.min * 60;
+    r.sec = remain;
+
+    return r;
+}
+
 float
 MLAviReader::DurationSec(void) const
 {
@@ -242,7 +264,8 @@ MLAviReader::ReadAviStreamFormatHeader(void)
         return false;
     }
 
-    if (bytes == 40) {
+    if (mAviStreamHeader.fccType == MLFOURCC_vids
+            && bytes == 40) {
         // BITMAPINFOHEADER
         if (40 != fread(&mImageFormat, 1, 40, mFp)) {
             printf("Error: ReadAviStreamFormatHeader() read BITMAPINFOHEADER failed\n");
@@ -320,7 +343,7 @@ MLAviReader::GetImage(const int frameNr, const uint32_t buffBytes, uint8_t *buff
     }
 
     ImagePosBytes pb = mImages[frameNr];
-    if (pb.bytes < buffBytes) {
+    if (buffBytes < pb.bytes) {
         printf("Error: buffBytes is too small\n");
         return E_FAIL;
     }

MLDX12VideoCapture/MLAviReader.h

@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include "Common.h"
 #include "MLAVICommon.h"
+#include "MLVideoTime.h"
 
 class MLAviReader {
 public:
@@ -21,6 +22,8 @@ class MLAviReader {
 
     float DurationSec(void) const;
 
+    MLVideoTime FrameNrToTime(const int frameNr);
+
     /// @return > 0 : copied bytes, negative value: error.
     int GetImage(const int frameNr,
             const uint32_t buffBytes, uint8_t *buff);

MLDX12VideoCapture/MLDX12App.cpp

@@ -72,15 +72,15 @@ MLDX12App::OnInit(void)
 {
     mVideoCaptureDeviceList.Init();
 
-    OutputDebugString(L"OnInit started\n");
+    //OutputDebugString(L"OnInit started\n");
 
     LoadPipeline();
     LoadAssets();
 
     mDx12Imgui.Init(mDevice.Get());
     CreateImguiTexture();
 
-    OutputDebugString(L"OnInit end\n");
+    //OutputDebugString(L"OnInit end\n");
 }
 
 void
@@ -644,14 +644,27 @@ MLDX12App::OnRender(void)
     mCmdQ->ExecuteCommandLists(_countof(ppCommandLists), ppCommandLists);
 
     UpdateCapturedVideoTexture();
+    UpdatePlayVideoTexture();
 
     ThrowIfFailed(mSwapChain->Present(1, 0));
     MoveToNextFrame();
 }
 
 void
-MLDX12App::DrawFullscreenTexture(TextureEnum texId)
+MLDX12App::DrawFullscreenTexture(TextureEnum texId, MLImage::ImageMode drawMode)
 {
+    switch (drawMode) {
+    case MLImage::IM_RGB:
+        mCmdList->SetPipelineState(mPipelineStateRGB.Get());
+        break;
+    case MLImage::IM_YUV:
+        mCmdList->SetPipelineState(mPipelineStateYUV.Get());
+        break;
+    default:
+        assert(0);
+        break;
+    }
+
     mCmdList->SetGraphicsRootSignature(mRootSignature.Get());
 
     ID3D12DescriptorHeap* ppHeaps[] = { mSrvHeap.Get() };
@@ -664,10 +677,6 @@ MLDX12App::DrawFullscreenTexture(TextureEnum texId)
     mCmdList->RSSetViewports(1, &mViewport);
     mCmdList->RSSetScissorRects(1, &mScissorRect);
 
-    mCmdList->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(
-        mRenderTargets[mFrameIdx].Get(), D3D12_RESOURCE_STATE_PRESENT,
-        D3D12_RESOURCE_STATE_RENDER_TARGET));
-
     CD3DX12_CPU_DESCRIPTOR_HANDLE rtvHandle(mRtvHeap->GetCPUDescriptorHandleForHeapStart(),
         mFrameIdx, mRtvDescSize);
     mCmdList->OMSetRenderTargets(1, &rtvHandle, FALSE, nullptr);
@@ -681,31 +690,29 @@ void
 MLDX12App::PopulateCommandList(void)
 {
     ThrowIfFailed(mCmdAllocators[mFrameIdx]->Reset());
+    ThrowIfFailed(mCmdList->Reset(mCmdAllocators[mFrameIdx].Get(), mPipelineStateRGB.Get()));
 
-    switch (mCaptureDrawMode) {
-    case MLImage::IM_RGB:
-        ThrowIfFailed(mCmdList->Reset(mCmdAllocators[mFrameIdx].Get(), mPipelineStateRGB.Get()));
-        break;
-    case MLImage::IM_YUV:
-        ThrowIfFailed(mCmdList->Reset(mCmdAllocators[mFrameIdx].Get(), mPipelineStateYUV.Get()));
-        break;
-    default:
-        break;
-    }
+    mCmdList->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(
+        mRenderTargets[mFrameIdx].Get(), D3D12_RESOURCE_STATE_PRESENT,
+        D3D12_RESOURCE_STATE_RENDER_TARGET));
 
     {   // clear screen
-        const float clearColor[] = {0.0f, 0.2f, 0.4f, 1.0f};
+        const float clearColorRGBA[] = {0.4f, 0.4f, 0.4f, 1.0f};
         CD3DX12_CPU_DESCRIPTOR_HANDLE rtvHandle(mRtvHeap->GetCPUDescriptorHandleForHeapStart(),
             mFrameIdx, mRtvDescSize);
         mCmdList->OMSetRenderTargets(1, &rtvHandle, FALSE, nullptr);
-        mCmdList->ClearRenderTargetView(rtvHandle, clearColor, 0, nullptr);
+        mCmdList->ClearRenderTargetView(rtvHandle, clearColorRGBA, 0, nullptr);
     }
 
     // 全クライアント領域を覆う矩形にテクスチャを貼って描画。
-    DrawFullscreenTexture((TextureEnum)(TE_CAPVIDEO0 + mIdToShowCapVideoTex));
+    DrawFullscreenTexture(
+            (TextureEnum)(TE_CAPVIDEO0 + mIdToShowCapVideoTex),
+            mCaptureDrawMode);
 
     if (0.0f < mPlayAlpha) {
-        DrawFullscreenTexture((TextureEnum)(TE_PLAYVIDEO0 + mIdToShowPlayVideoTex));
+        DrawFullscreenTexture(
+                (TextureEnum)(TE_PLAYVIDEO0 + mIdToShowPlayVideoTex),
+                mPlayDrawMode);
     }
 
     // Start the Dear ImGui frame
@@ -966,7 +973,7 @@ MLDX12App::ShowPlaybackWindow(void)
             if (mAviReader.Open(path)) {
                 const MLBitmapInfoHeader &bi = mAviReader.ImageFormat();
 
-                if (bi.biWidth != 3840 || bi.biHeight != 2160 || bi.biCompression != MLFOURCC_v210) {
+                if (bi.biCompression != MLFOURCC_v210) {
                     sprintf_s(mPlayMsg, "Error: Not supported AVI format : %s", mReadPath);
                     ImGui::OpenPopup("ErrorPlayPopup");
                     mAviReader.Close();
@@ -986,8 +993,18 @@ MLDX12App::ShowPlaybackWindow(void)
             mAviReader.Close();
             mPlayAlpha = 0.0f;
         }
-        ImGui::Text("Total %d frames, %d fps, %.1f sec",
-                mAviReader.NumFrames(), mAviReader.FramesPerSec(), mAviReader.DurationSec());
+        ImGui::Text("%d x %d, %d fps, %.1f sec",
+                mAviReader.ImageFormat().biWidth, mAviReader.ImageFormat().biHeight,
+                mAviReader.FramesPerSec(), mAviReader.DurationSec());
+
+        {
+            // hour:min:sec:frameを算出。
+            auto vt = mAviReader.FrameNrToTime(mPlayFrameNr);
+
+            ImGui::Text("%02d:%02d:%02d:%02d",
+                vt.hour, vt.min, vt.sec, vt.frame);
+        }
+
         // シークバー。
         ImGui::DragInt("Frame number", &mPlayFrameNr, 1.0f, 0, mAviReader.NumFrames() - 1);
 
@@ -1007,8 +1024,6 @@ MLDX12App::ShowPlaybackWindow(void)
                 mConverter.CreateGammaTable(mDrawGamma, mDrawGainR, mDrawGainG, mDrawGainB);
             }
         }
-
-        UpdatePlayVideoTexture();
     }
 
     ImGui::End();
@@ -1175,6 +1190,9 @@ MLDX12App::UpdateVideoTexture(MLImage &ci, ComPtr<ID3D12Resource> &tex, TextureE
         srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
         srvDesc.Texture2D.MipLevels = 1;
         mDevice->CreateShaderResourceView(tex.Get(), &srvDesc, srvHandle);
+    } else {
+        mCmdListTexUpload->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(tex.Get(),
+            D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_COPY_DEST));
     }
 
     // texUploadHeapがスコープから外れる前にcommandListを実行しなければならない。
@@ -1191,9 +1209,6 @@ MLDX12App::UpdateVideoTexture(MLImage &ci, ComPtr<ID3D12Resource> &tex, TextureE
             nullptr,
             IID_PPV_ARGS(&texUploadHeap)));
 
-        mCmdListTexUpload->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(tex.Get(),
-            D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_COPY_DEST));
-
         D3D12_SUBRESOURCE_DATA textureData = {};
         textureData.pData = &ci.data[0];
         textureData.RowPitch = ci.width * pixelBytes;
@@ -1279,7 +1294,7 @@ MLDX12App::UpdatePlayVideoTexture(void)
     }
 
     UpdateVideoTexture(ci, mTexPlayVideo[!mIdToShowPlayVideoTex], 
-            (TextureEnum)(TE_CAPVIDEO0 + !mIdToShowPlayVideoTex));
+            (TextureEnum)(TE_PLAYVIDEO0 + !mIdToShowPlayVideoTex));
 
     mPlayDrawMode = ci.imgMode;
 

MLDX12VideoCapture/MLDX12App.h

@@ -161,7 +161,7 @@ class MLDX12App : public MLDX12, IMLVideoCaptureCallback {
     void CreateImguiTexture(void);
     void ImGuiCommands(void);
 
-    void DrawFullscreenTexture(TextureEnum texId);
+    void DrawFullscreenTexture(TextureEnum texId, MLImage::ImageMode drawMode);
 
     void ShowCaptureSettingsWindow(void);
     void ShowPlaybackWindow(void);

MLDX12VideoCapture/MLDX12VideoCapture.vcxproj

@@ -30,6 +30,7 @@
     <ClInclude Include="imstb_rectpack.h" />
     <ClInclude Include="imstb_textedit.h" />
     <ClInclude Include="imstb_truetype.h" />
+    <ClInclude Include="MLVideoTime.h" />
     <ClInclude Include="WinApp.h" />
   </ItemGroup>
   <ItemGroup>

MLDX12VideoCapture/MLDX12VideoCapture.vcxproj.filters

@@ -80,6 +80,9 @@
     <ClInclude Include="MLImage.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="MLVideoTime.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Main.cpp">

MLDX12VideoCapture/MLVideoTime.h

@@ -0,0 +1,8 @@
+#pragma once
+
+struct MLVideoTime {
+    int hour;
+    int min;
+    int sec;
+    int frame;
+};

MLDX12VideoCapture/Main.cpp

@@ -30,7 +30,7 @@ wWinMain(
 
     MLDX12App app(1920, 1080);
 
-    int rv = WinApp::Run(&app, hInstance, nCmdShow);
+    int rv = WinApp::Run(&app, hInstance, nCmdShow, L"MLDX12VideoCapture");
 
     if (coInitialized) {
         CoUninitialize();

MLDX12VideoCapture/WinApp.cpp

@@ -15,25 +15,30 @@
 #include "imgui_impl_win32.h"
 
 HWND WinApp::mHwnd = nullptr;
+std::wstring WinApp::mTitle = L"WinApp";
 
 int
-WinApp::Run(MLDX12* pDX12, HINSTANCE hInstance, int nCmdShow)
+WinApp::Run(MLDX12* pDX12, HINSTANCE hInstance, int nCmdShow, const wchar_t *title)
 {
+    if (title) {
+        mTitle = title;
+    }
+
     WNDCLASSEX wc = { 0 };
     wc.cbSize = sizeof(WNDCLASSEX);
     wc.style = CS_HREDRAW | CS_VREDRAW;
     wc.lpfnWndProc = WindowProc;
     wc.hInstance = hInstance;
     wc.hCursor = LoadCursor(nullptr, IDC_ARROW);
-    wc.lpszClassName = L"DXSampleClass";
+    wc.lpszClassName = mTitle.c_str();
     RegisterClassEx(&wc);
 
     RECT rect = { 0, 0, static_cast<LONG>(pDX12->Width()), static_cast<LONG>(pDX12->Height()) };
     AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE);
 
     mHwnd = CreateWindow(
         wc.lpszClassName,
-        L"WinApp",
+        mTitle.c_str(),
         WS_OVERLAPPEDWINDOW,
         CW_USEDEFAULT,
         CW_USEDEFAULT,
@@ -100,7 +105,7 @@ WinApp::WindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     case WM_SIZE:
         if (pDX12) {
-            OutputDebugString(L"WM_SIZE\n");
+            //OutputDebugString(L"WM_SIZE\n");
             RECT windowR = {};
             GetWindowRect(hWnd, &windowR);
             pDX12->SetWindowBounds(