Got text to display proprerly in the Preview window.

Almost got video playback working.
98ahni · Aug 29, 2024 · 0af2711 · 0af2711
1 parent b2864b2
commit 0af2711
Show file tree

Hide file tree

Showing 10 changed files with 324 additions and 50 deletions.
diff --git a/Source/Extensions/imguiExt.cpp b/Source/Extensions/imguiExt.cpp
@@ -49,6 +49,58 @@ EM_JS(void, create_input, (emscripten::EM_VAL id, emscripten::EM_VAL type, emscr
     input.style.height = height + 'px';
     input.style.opacity = 0;
 });
+EM_JS(emscripten::EM_VAL, load_video, (emscripten::EM_VAL id, emscripten::EM_VAL fs_path), {
+    return Emval.toHandle(new Promise(async(resolve)=>{
+    var imid = Emval.toValue(id);
+    var vid = document.getElementById(imid);
+    if(vid === null){
+        vid = document.createElement('video');
+        vid.id = imid;
+        document.body.insertBefore(vid, document.getElementById('canvas'));
+    }
+	const vidData = FS.readFile(Emval.toValue(fs_path));
+    const vidBlob = new Blob([vidData.buffer], {type: 'video/mp4'});
+    //const vidSource = new (window.ManagedMediaSource || window.MediaSource)();
+    vid.src = URL.createObjectURL(vidBlob);
+    vid.style.position = 'fixed';
+    vid.style.width = 100 + 'px';
+    vid.style.height = 100 + 'px';
+    vid.disablePictureInPicture = true;
+    vid.defaultMuted = true;
+    //vidSource.addEventListener("sourceopen", async ()=>{
+    //    const sourceBuff = vidSource.addSourceBuffer("video/mp4; codecs=\"avc1.4d002a\"");
+    //    const arr = await vidBlob.arrayBuffer();
+    //    sourceBuff.appendBuffer(arr);
+    //    vid.play();
+    //});
+    vid.load();
+    vid.onloadeddata = ()=>{vid.play();resolve();};
+    }));
+});
+EM_JS(void, play_video, (emscripten::EM_VAL id), {
+    let imid = Emval.toValue(id);
+    let vid = document.getElementById(imid);
+    if(vid === null){
+        return;
+    }
+    vid.play();
+});
+EM_JS(void, pause_video, (emscripten::EM_VAL id), {
+    let imid = Emval.toValue(id);
+    let vid = document.getElementById(imid);
+    if(vid === null){
+        return;
+    }
+    vid.pause();
+});
+EM_JS(void, set_video_playback_progress, (emscripten::EM_VAL id, double seconds), {
+    let imid = Emval.toValue(id);
+    let vid = document.getElementById(imid);
+    if(vid === null){
+        return;
+    }
+    vid.currentTime = seconds;
+});
 EM_JS(emscripten::EM_VAL, load_image, (emscripten::EM_VAL id, emscripten::EM_VAL fs_path), {
     return Emval.toHandle(new Promise(async(resolve)=>{
     let imid = Emval.toValue(id);
@@ -62,6 +114,9 @@ EM_JS(emscripten::EM_VAL, load_image, (emscripten::EM_VAL id, emscripten::EM_VAL
     const imgBlob = new Blob([imgData.buffer], {type: 'application/octet-binary'});
     img.src = URL.createObjectURL(imgBlob);
     await img.decode();
+    img.style.position = 'fixed';
+    img.style.width = 1 + 'px';
+    img.style.height = 1 + 'px';
     resolve();}));
 });
 EM_JS(ImTextureID, render_image, (emscripten::EM_VAL id, ImTextureID texture), {
@@ -75,8 +130,17 @@ EM_JS(ImTextureID, render_image, (emscripten::EM_VAL id, ImTextureID texture), {
         canvas = document.createElement('canvas');
         canvas.id = imid + 'canvas';
         document.body.insertBefore(canvas, document.getElementById('canvas'));
-        canvas.width = img.width;
-        canvas.height = img.height;
+        if(img.nodeName == 'IMG'){
+            canvas.width = img.naturalWidth;
+            canvas.height = img.naturalHeight;
+        }
+        else if(img.nodeName == 'VIDEO'){
+            canvas.width = img.videoWidth;
+            canvas.height = img.videoHeight;
+        }
+        canvas.style.position = 'fixed';
+        canvas.style.width = 1 + 'px';
+        canvas.style.height = 1 + 'px';
     }
     var ctx = canvas.getContext('2d', {willReadFrequently:true});
     ctx.drawImage(img, 0, 0);
@@ -240,12 +304,32 @@ void ImGui::Ext::RemoveWindowEvent(const char *anEvent, const char *aJSFunctionN
     remove_window_event(VAR_TO_JS(anEvent), VAR_TO_JS(aJSFunctionName));
 }
 
+void ImGui::Ext::LoadVideo(const char *anID, const char *anFSPath)
+{
+    VAR_FROM_JS(load_video(VAR_TO_JS(anID), VAR_TO_JS(anFSPath))).await();
+}
+
+void ImGui::Ext::PlayVideo(const char *anID)
+{
+    play_video(VAR_TO_JS(anID));
+}
+
+void ImGui::Ext::PauseVideo(const char *anID)
+{
+    pause_video(VAR_TO_JS(anID));
+}
+
+void ImGui::Ext::SetVideoProgress(const char *anID, uint aProgress)
+{
+    set_video_playback_progress(VAR_TO_JS(anID), (double)(aProgress) * .01);
+}
+
 void ImGui::Ext::LoadImage(const char *anID, const char *anFSPath)
 {
     VAR_FROM_JS(load_image(VAR_TO_JS(anID), VAR_TO_JS(anFSPath))).await();
 }
 
-bool ImGui::Ext::RenderImage(const char *anID, ImTextureID& aTexture)
+bool ImGui::Ext::RenderTexture(const char *anID, ImTextureID& aTexture)
 {
     aTexture = render_image(VAR_TO_JS(anID), aTexture);
     return aTexture != 0;

diff --git a/Source/Extensions/imguiExt.h b/Source/Extensions/imguiExt.h
@@ -22,8 +22,12 @@ namespace ImGui{
         void AddWindowEvent(const char* anEvent, const char* aJSFunctionName);
         void RemoveWindowEvent(const char* anEvent, const char* aJSFunctionName);
 
+        void LoadVideo(const char* anID, const char* anFSPath);
+        void PlayVideo(const char* anID);
+        void PauseVideo(const char* anID);
+        void SetVideoProgress(const char* anID, uint aProgress);
         void LoadImage(const char* anID, const char* anFSPath);
-        bool RenderImage(const char* anID, ImTextureID& aTexture);
+        bool RenderTexture(const char* anID, ImTextureID& aTexture);
 
         void SetShortcutEvents();
 

diff --git a/Source/Serialization/KaraokeData.cpp b/Source/Serialization/KaraokeData.cpp
@@ -157,6 +157,11 @@ namespace Serialization
     {
         return myHasOverrideColor ? myOverrideEndColor : myBaseEndColor;
     }
+    bool KaraokeDocument::IsEffectToken(KaraokeToken &aToken)
+    {
+        std::vector<std::string> tags = StringTools::Split(aToken.myValue.data(), std::regex("<[A-Za-z0-9#\"= ]+>"), true);
+        return tags.size() != 0;
+    }
     bool KaraokeDocument::ParseEffectToken(KaraokeToken &aToken)
     {
         std::vector<std::string> tags = StringTools::Split(aToken.myValue.data(), std::regex("<[A-Za-z0-9#\"= ]+>"), true);
@@ -315,7 +320,7 @@ namespace Serialization
             std::error_code ferr;
             std::filesystem::remove("/local/" + myName, ferr);
             std::filesystem::copy(aPath, "/local", std::filesystem::copy_options::overwrite_existing);
-            FileHandler::SyncLocalFS();
+            //FileHandler::SyncLocalFS();
         }
         myPath = aPath;
         myFileID = aFileID;
@@ -512,7 +517,7 @@ namespace Serialization
         docFile << Serialize();
         printf("Auto saved to '/local/%s'.\n", pathName.filename().string().data());
         docFile.close();
-        FileHandler::SyncLocalFS();
+        //FileHandler::SyncLocalFS();
         myIsAutoDirty = false;
         return myPath;
     }

diff --git a/Source/Serialization/KaraokeData.h b/Source/Serialization/KaraokeData.h
@@ -58,6 +58,7 @@ namespace Serialization
         uint GetFontSize();
         uint GetStartColor();
         uint GetEndColor();
+        bool IsEffectToken(KaraokeToken& aToken);
         bool ParseEffectToken(KaraokeToken& aToken);
         void SetColor(uint aStartColor);
         void SetColor(uint aStartColor, uint anEndColor);

diff --git a/Source/Windows/AudioPlayback.cpp b/Source/Windows/AudioPlayback.cpp
@@ -289,7 +289,7 @@ void AudioPlayback::SaveLocalBackup()
     if(!ourInstance->myPath.contains("local"))
     {
         std::filesystem::copy(ourInstance->myPath, "/local", std::filesystem::copy_options::overwrite_existing);
-        FileHandler::SyncLocalFS();
+        //FileHandler::SyncLocalFS();
     }
 }