added ofxHapPlayer as default Mosaic codec for video player object

Author: d3cod3

README.md

@@ -77,6 +77,8 @@ In order to build ofxVisualProgramming, you'll need this addons:
 
 #### [ofxJSON](https://github.com/jeffcrouse/ofxJSON)
 
+#### [ofxHapPlayer](https://github.com/d3cod3/ofxHapPlayer)
+
 #### [ofxImGui](https://github.com/d3cod3/ofxImGui)
 
 #### [ofxInfiniteCanvas](https://github.com/d3cod3/ofxInfiniteCanvas)
@@ -125,6 +127,7 @@ git clone https://github.com/arturoc/ofxEasing
 git clone https://github.com/d3cod3/ofxFFmpegRecorder
 git clone https://github.com/Akira-Hayasaka/ofxGLEditor
 git clone https://github.com/jeffcrouse/ofxJSON
+git clone https://github.com/d3cod3/ofxHapPlayer
 git clone https://github.com/d3cod3/ofxImGui
 git clone https://github.com/d3cod3/ofxInfiniteCanvas
 git clone --branch=of-0.10.0 https://github.com/d3cod3/ofxLua
@@ -402,6 +405,8 @@ ofxGLEditor original addon by [Akira Hayasaka](https://github.com/Akira-Hayasaka
 
 ofxJSON original addon by [Jeff Crouse](https://github.com/jeffcrouse/)
 
+ofxHapPlayer original addon by [Tom Butterworth](https://github.com/bangnoise)
+
 ofxImGui original addon by [Jason Van Cleave](https://github.com/jvcleave)
 
 ofxInfiniteCanvas original addon by [Roy Macdonald](https://github.com/roymacdonald)

addon_config.mk

@@ -26,7 +26,7 @@ common:
 	# or use += in several lines
         ADDON_DEPENDENCIES = ofxAssimpModelLoader ofxGui ofxKinect ofxNetwork ofxOpenCv ofxOsc ofxSvg ofxVectorGraphics ofxXmlSettings
         ADDON_DEPENDENCIES += ofxAudioAnalyzer ofxAudioFile ofxBTrack ofxChromaKeyShader ofxCv ofxEasing ofxFFmpegRecorder ofxGLEditor
-        ADDON_DEPENDENCIES += ofxJSON ofxInfiniteCanvas ofxLua ofxMidi ofxMtlMapping2D
+        ADDON_DEPENDENCIES += ofxJSON ofxHapPlayer ofxInfiniteCanvas ofxLua ofxMidi ofxMtlMapping2D
         ADDON_DEPENDENCIES += ofxPDSP ofxTimeline ofxWarp
         ADDON_DEPENDENCIES += ofxImGui
 

src/objects/video/VideoPlayer.cpp

@@ -57,7 +57,7 @@ VideoPlayer::VideoPlayer() : PatchObject("video player"){
 
     this->initInletsState();
 
-    video = new ofVideoPlayer();
+    video = new ofxHapPlayer();
 
     lastMessage         = "";
     isNewObject         = false;
@@ -155,7 +155,8 @@ void VideoPlayer::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRen
             static_cast<ofTexture *>(_outletParams[0])->allocate(video->getWidth(),video->getHeight(),GL_RGB);
             static_cast<ofTexture *>(_outletParams[0])->clear();
         }else{
-            static_cast<ofTexture *>(_outletParams[0])->loadData(video->getPixels());
+            //static_cast<ofTexture *>(_outletParams[0])->loadData(video->getPixels());
+            *static_cast<ofTexture *>(_outletParams[0]) = *video->getTexture();
         }
 
         // listen to message control (_inletParams[0])
@@ -217,6 +218,8 @@ void VideoPlayer::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRen
             if(video->isPlaying()){ // play
                video->update();
 
+               //ofLog(OF_LOG_NOTICE,"%s: duration = %f",this->getName().c_str(),video->getDuration());
+
                // preload first video frame into outlet texture
                if(preloadFirstFrame && video->getCurrentFrame() > 0){
                    preloadFirstFrame = false;
@@ -315,7 +318,7 @@ void VideoPlayer::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
     canvasZoom = _nodeCanvas.GetCanvasScale();
 
     // file dialog
-    if(ImGuiEx::getFileDialog(fileDialog, loadVideoFlag, "Select a video file", imgui_addons::ImGuiFileBrowser::DialogMode::OPEN, ".mov,.mp4,.mpg,.mpeg,.avi", "", scaleFactor)){
+    if(ImGuiEx::getFileDialog(fileDialog, loadVideoFlag, "Select a video file encoded with the HAP codec", imgui_addons::ImGuiFileBrowser::DialogMode::OPEN, ".mov,.mp4,.mpg,.mpeg,.avi", "", scaleFactor)){
         ofFile file (fileDialog.selected_path);
         if (file.exists()){
             filepath = copyFileToPatchFolder(this->patchFolderPath,file.getAbsolutePath());
@@ -350,7 +353,7 @@ void VideoPlayer::drawObjectNodeConfig(){
     if (ImGui::IsItemHovered()){
         ImGui::BeginTooltip();
         ImGui::PushTextWrapPos(ImGui::GetFontSize() * 35.0f);
-        ImGui::TextUnformatted("Open a video file. Compatible extensions: .mov .mp4 .mpg .mpeg");
+        ImGui::TextUnformatted("Open a video file. Compatible extensions: .mov .mp4 .mpg .mpeg .avi. Compatible codec: HAP");
         ImGui::PopTextWrapPos();
         ImGui::EndTooltip();
     }
@@ -408,11 +411,11 @@ void VideoPlayer::drawObjectNodeConfig(){
     }
 
     ImGuiEx::ObjectInfo(
-                "Simple object for playing video files. In mac OSX you can upload .mov and .mp4 files; in linux .mp4, .mpeg and .mpg, while in windows .mp4 and .avi can be used.",
+                "Simple object for playing video files. It use the HAP codec as standard, so you can use only videos encoded with HAP. More info here: https://hap.video/using-hap.html",
                 "https://mosaic.d3cod3.org/reference.php?r=video-player", scaleFactor);
 
     // file dialog
-    if(ImGuiEx::getFileDialog(fileDialog, loadVideoFlag, "Select a video file", imgui_addons::ImGuiFileBrowser::DialogMode::OPEN, ".mov,.mp4,.mpg,.mpeg,.avi", "", scaleFactor)){
+    if(ImGuiEx::getFileDialog(fileDialog, loadVideoFlag, "Select a video file encoded with the HAP codec", imgui_addons::ImGuiFileBrowser::DialogMode::OPEN, "*.*", "", scaleFactor)){
         ofFile file (fileDialog.selected_path);
         if (file.exists()){
             filepath = copyFileToPatchFolder(this->patchFolderPath,file.getAbsolutePath());

src/objects/video/VideoPlayer.h

@@ -39,6 +39,8 @@
 #include "ImGuiFileBrowser.h"
 #include "IconsFontAwesome5.h"
 
+#include "ofxHapPlayer.h"
+
 class VideoPlayer : public PatchObject {
 
 public:
@@ -59,7 +61,7 @@ class VideoPlayer : public PatchObject {
     void            loadVideoFile();
 
 
-    ofVideoPlayer*      video;
+    ofxHapPlayer*       video;
     float               posX, posY, drawW, drawH;
     bool                isNewObject;
     bool                isFileLoaded;