プラグイン有効からWebView2起動完了までの間のキューも利用する

otya128 · Jun 4, 2022 · 4155d1c · 4155d1c
1 parent 0e819fe
commit 4155d1c
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/TVTDataBroadcastingWV2/TVTDataBroadcastingWV2.cpp b/TVTDataBroadcastingWV2/TVTDataBroadcastingWV2.cpp
@@ -318,10 +318,6 @@ bool CDataBroadcastingWV2::GetPluginInfo(TVTest::PluginInfo* pInfo)
 BOOL CALLBACK CDataBroadcastingWV2::StreamCallback(BYTE* pData, void* pClientData)
 {
     auto pThis = (CDataBroadcastingWV2*)pClientData;
-    if (!pThis->webViewLoaded)
-    {
-        return TRUE;
-    }
     if (pThis->packetQueue.enqueuePacket(pData))
     {
         PostMessageW(pThis->hMessageWnd, WM_APP_PACKET, 0, 0);
@@ -364,6 +360,8 @@ bool CDataBroadcastingWV2::OnServiceUpdate()
     }
     // 動画、音声のPESは不要なので削っておく
     this->packetQueue.setPIDsToExclude(std::move(pesPIDList));
+
+    this->packetQueue.clear();
     Tune();
     return true;
 }
@@ -593,6 +591,11 @@ LRESULT CALLBACK CDataBroadcastingWV2::MessageWndProc(HWND hWnd, UINT uMsg, WPAR
     }
     case WM_APP_PACKET:
     {
+        if (!pThis->webView || !pThis->webViewLoaded)
+        {
+            // キューを消費しない
+            break;
+        }
         // スレッドが失速して回復したときなどに応答を維持するためメッセージごとの処理数を制限
         for (int popCount = 0; popCount < 5; popCount++)
         {
@@ -601,10 +604,6 @@ LRESULT CALLBACK CDataBroadcastingWV2::MessageWndProc(HWND hWnd, UINT uMsg, WPAR
             {
                 break;
             }
-            if (!pThis->webView)
-            {
-                continue;
-            }
             WCHAR head[] = LR"({"type":"streamBase64","data":")";
             WCHAR tail[] = LR"("})";
             auto packetBlockSize = packets.value().size();
@@ -1538,7 +1537,6 @@ void CDataBroadcastingWV2::Tune()
             if (_wcsicmp(source.get(), baseUrl.c_str()))
             {
                 this->RestoreVideoWindow();
-                this->packetQueue.clear();
                 this->webView->Navigate(baseUrl.c_str());
                 this->usedKey.basic = true;
                 this->usedKey.dataButton = true;