From 6dd14d3e87c970c3e7e4fbe977b2e6db5bd56757 Mon Sep 17 00:00:00 2001 From: arturo Date: Wed, 26 Feb 2014 13:09:11 +0100 Subject: [PATCH] moved examples to _ instead of -, windows PG breaks on that add common timestamps to all channels --- .cproject | 8 +- .gitignore | 1 + {example-all => example_all}/Makefile | 0 {example-all => example_all}/Project.xcconfig | 0 {example-all => example_all}/addons.make | 0 .../bin/data/ring.wav | Bin .../bin/data/settings_example.xml | 0 {example-all => example_all}/config.make | 0 {example-all => example_all}/config.ofroot.mk | 0 .../example-all.xcodeproj/project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../xcschemes/example-all Debug.xcscheme | 0 .../xcschemes/example-all Release.xcscheme | 0 .../openFrameworks-Info.plist | 0 {example-all => example_all}/src/main.cpp | 0 {example-all => example_all}/src/ofApp.cpp | 9 +- {example-all => example_all}/src/ofApp.h | 0 {example-all => example_all}/src/ofxFPS.cpp | 0 {example-all => example_all}/src/ofxFPS.h | 0 example_audio/.cproject | 42 +++++++++ example_audio/.project | 27 ++++++ example_audio/.settings/language.settings.xml | 11 +++ {example-audio => example_audio}/Makefile | 0 .../Project.xcconfig | 0 {example-audio => example_audio}/addons.make | 0 .../bin/data/settings_example.xml | 0 {example-audio => example_audio}/config.make | 0 .../config.ofroot.mk | 0 .../example-audio.xcodeproj/project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../xcschemes/example-audio Debug.xcscheme | 0 .../xcschemes/example-audio Release.xcscheme | 0 .../openFrameworks-Info.plist | 0 {example-audio => example_audio}/src/main.cpp | 0 .../src/ofApp.cpp | 0 {example-audio => example_audio}/src/ofApp.h | 0 .../Makefile | 0 .../Project.xcconfig | 0 .../addons.make | 0 .../bin/data/settings_example.xml | 0 .../config.make | 0 .../config.ofroot.mk | 0 .../project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../example-osc_over_rtp Debug.xcscheme | 0 .../example-osc_over_rtp Release.xcscheme | 0 .../openFrameworks-Info.plist | 0 .../src/main.cpp | 0 .../src/ofApp.cpp | 0 .../src/ofApp.h | 0 example_video_audio/, | 5 ++ .../Makefile | 0 .../Project.xcconfig | 0 .../addons.make | 0 .../bin/data/settings_example.xml | 0 .../config.make | 0 .../config.ofroot.mk | 0 .../project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../example-video_audio Debug.xcscheme | 0 .../example-video_audio Release.xcscheme | 0 .../openFrameworks-Info.plist | 0 .../src/main.cpp | 0 .../src/ofApp.cpp | 0 .../src/ofApp.h | 0 .../Makefile | 0 .../Project.xcconfig | 0 .../addons.make | 0 .../bin/data/settings_example.xml | 0 .../config.make | 0 .../config.ofroot.mk | 0 .../project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../example-video_audio_LAN Debug.xcscheme | 0 .../example-video_audio_LAN Release.xcscheme | 0 .../openFrameworks-Info.plist | 0 .../src/main.cpp | 0 .../src/ofApp.cpp | 0 .../src/ofApp.h | 0 .../Makefile | 0 .../Project.xcconfig | 0 .../addons.make | 0 .../bin/data/settings_example.xml | 0 .../config.make | 0 .../config.ofroot.mk | 0 .../project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../example-video_audio_osc Debug.xcscheme | 0 .../example-video_audio_osc Release.xcscheme | 0 .../openFrameworks-Info.plist | 0 .../src/main.cpp | 0 .../src/ofApp.cpp | 0 .../src/ofApp.h | 0 src/ofxGstRTPServer.cpp | 80 ++++++++---------- src/ofxGstRTPServer.h | 9 +- 95 files changed, 133 insertions(+), 59 deletions(-) rename {example-all => example_all}/Makefile (100%) rename {example-all => example_all}/Project.xcconfig (100%) rename {example-all => example_all}/addons.make (100%) rename {example-all => example_all}/bin/data/ring.wav (100%) rename {example-all => example_all}/bin/data/settings_example.xml (100%) rename {example-all => example_all}/config.make (100%) rename {example-all => example_all}/config.ofroot.mk (100%) rename {example-all => example_all}/example-all.xcodeproj/project.pbxproj (100%) rename {example-all => example_all}/example-all.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {example-all => example_all}/example-all.xcodeproj/xcshareddata/xcschemes/example-all Debug.xcscheme (100%) rename {example-all => example_all}/example-all.xcodeproj/xcshareddata/xcschemes/example-all Release.xcscheme (100%) rename {example-all => example_all}/openFrameworks-Info.plist (100%) rename {example-all => example_all}/src/main.cpp (100%) rename {example-all => example_all}/src/ofApp.cpp (98%) rename {example-all => example_all}/src/ofApp.h (100%) rename {example-all => example_all}/src/ofxFPS.cpp (100%) rename {example-all => example_all}/src/ofxFPS.h (100%) create mode 100644 example_audio/.cproject create mode 100644 example_audio/.project create mode 100644 example_audio/.settings/language.settings.xml rename {example-audio => example_audio}/Makefile (100%) rename {example-audio => example_audio}/Project.xcconfig (100%) rename {example-audio => example_audio}/addons.make (100%) rename {example-audio => example_audio}/bin/data/settings_example.xml (100%) rename {example-audio => example_audio}/config.make (100%) rename {example-audio => example_audio}/config.ofroot.mk (100%) rename {example-audio => example_audio}/example-audio.xcodeproj/project.pbxproj (100%) rename {example-audio => example_audio}/example-audio.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {example-audio => example_audio}/example-audio.xcodeproj/xcshareddata/xcschemes/example-audio Debug.xcscheme (100%) rename {example-audio => example_audio}/example-audio.xcodeproj/xcshareddata/xcschemes/example-audio Release.xcscheme (100%) rename {example-audio => example_audio}/openFrameworks-Info.plist (100%) rename {example-audio => example_audio}/src/main.cpp (100%) rename {example-audio => example_audio}/src/ofApp.cpp (100%) rename {example-audio => example_audio}/src/ofApp.h (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/Makefile (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/Project.xcconfig (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/addons.make (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/bin/data/settings_example.xml (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/config.make (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/config.ofroot.mk (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/example-osc_over_rtp.xcodeproj/project.pbxproj (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/example-osc_over_rtp.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/example-osc_over_rtp.xcodeproj/xcshareddata/xcschemes/example-osc_over_rtp Debug.xcscheme (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/example-osc_over_rtp.xcodeproj/xcshareddata/xcschemes/example-osc_over_rtp Release.xcscheme (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/openFrameworks-Info.plist (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/src/main.cpp (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/src/ofApp.cpp (100%) rename {example-osc_over_rtp => example_osc_over_rtp}/src/ofApp.h (100%) create mode 100644 example_video_audio/, rename {example-video_audio => example_video_audio}/Makefile (100%) rename {example-video_audio => example_video_audio}/Project.xcconfig (100%) rename {example-video_audio => example_video_audio}/addons.make (100%) rename {example-video_audio => example_video_audio}/bin/data/settings_example.xml (100%) rename {example-video_audio => example_video_audio}/config.make (100%) rename {example-video_audio => example_video_audio}/config.ofroot.mk (100%) rename {example-video_audio => example_video_audio}/example-video_audio.xcodeproj/project.pbxproj (100%) rename {example-video_audio => example_video_audio}/example-video_audio.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {example-video_audio => example_video_audio}/example-video_audio.xcodeproj/xcshareddata/xcschemes/example-video_audio Debug.xcscheme (100%) rename {example-video_audio => example_video_audio}/example-video_audio.xcodeproj/xcshareddata/xcschemes/example-video_audio Release.xcscheme (100%) rename {example-video_audio => example_video_audio}/openFrameworks-Info.plist (100%) rename {example-video_audio => example_video_audio}/src/main.cpp (100%) rename {example-video_audio => example_video_audio}/src/ofApp.cpp (100%) rename {example-video_audio => example_video_audio}/src/ofApp.h (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/Makefile (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/Project.xcconfig (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/addons.make (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/bin/data/settings_example.xml (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/config.make (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/config.ofroot.mk (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/example-video_audio_LAN.xcodeproj/project.pbxproj (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/example-video_audio_LAN.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/example-video_audio_LAN.xcodeproj/xcshareddata/xcschemes/example-video_audio_LAN Debug.xcscheme (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/example-video_audio_LAN.xcodeproj/xcshareddata/xcschemes/example-video_audio_LAN Release.xcscheme (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/openFrameworks-Info.plist (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/src/main.cpp (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/src/ofApp.cpp (100%) rename {example-video_audio_LAN => example_video_audio_LAN}/src/ofApp.h (100%) rename {example-video_audio_osc => example_video_audio_osc}/Makefile (100%) rename {example-video_audio_osc => example_video_audio_osc}/Project.xcconfig (100%) rename {example-video_audio_osc => example_video_audio_osc}/addons.make (100%) rename {example-video_audio_osc => example_video_audio_osc}/bin/data/settings_example.xml (100%) rename {example-video_audio_osc => example_video_audio_osc}/config.make (100%) rename {example-video_audio_osc => example_video_audio_osc}/config.ofroot.mk (100%) rename {example-video_audio_osc => example_video_audio_osc}/example-video_audio_osc.xcodeproj/project.pbxproj (100%) rename {example-video_audio_osc => example_video_audio_osc}/example-video_audio_osc.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {example-video_audio_osc => example_video_audio_osc}/example-video_audio_osc.xcodeproj/xcshareddata/xcschemes/example-video_audio_osc Debug.xcscheme (100%) rename {example-video_audio_osc => example_video_audio_osc}/example-video_audio_osc.xcodeproj/xcshareddata/xcschemes/example-video_audio_osc Release.xcscheme (100%) rename {example-video_audio_osc => example_video_audio_osc}/openFrameworks-Info.plist (100%) rename {example-video_audio_osc => example_video_audio_osc}/src/main.cpp (100%) rename {example-video_audio_osc => example_video_audio_osc}/src/ofApp.cpp (100%) rename {example-video_audio_osc => example_video_audio_osc}/src/ofApp.h (100%) diff --git a/.cproject b/.cproject index ad82421..78e872a 100644 --- a/.cproject +++ b/.cproject @@ -1,18 +1,16 @@ - - - + - + @@ -20,7 +18,7 @@ - + diff --git a/.gitignore b/.gitignore index 91e143c..eea7eb2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ example*/obj/** example*/bin/* !example*/bin/data example*/bin/data/settings.xml +settings.xml diff --git a/example-all/Makefile b/example_all/Makefile similarity index 100% rename from example-all/Makefile rename to example_all/Makefile diff --git a/example-all/Project.xcconfig b/example_all/Project.xcconfig similarity index 100% rename from example-all/Project.xcconfig rename to example_all/Project.xcconfig diff --git a/example-all/addons.make b/example_all/addons.make similarity index 100% rename from example-all/addons.make rename to example_all/addons.make diff --git a/example-all/bin/data/ring.wav b/example_all/bin/data/ring.wav similarity index 100% rename from example-all/bin/data/ring.wav rename to example_all/bin/data/ring.wav diff --git a/example-all/bin/data/settings_example.xml b/example_all/bin/data/settings_example.xml similarity index 100% rename from example-all/bin/data/settings_example.xml rename to example_all/bin/data/settings_example.xml diff --git a/example-all/config.make b/example_all/config.make similarity index 100% rename from example-all/config.make rename to example_all/config.make diff --git a/example-all/config.ofroot.mk b/example_all/config.ofroot.mk similarity index 100% rename from example-all/config.ofroot.mk rename to example_all/config.ofroot.mk diff --git a/example-all/example-all.xcodeproj/project.pbxproj b/example_all/example-all.xcodeproj/project.pbxproj similarity index 100% rename from example-all/example-all.xcodeproj/project.pbxproj rename to example_all/example-all.xcodeproj/project.pbxproj diff --git a/example-all/example-all.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example_all/example-all.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from example-all/example-all.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to example_all/example-all.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/example-all/example-all.xcodeproj/xcshareddata/xcschemes/example-all Debug.xcscheme b/example_all/example-all.xcodeproj/xcshareddata/xcschemes/example-all Debug.xcscheme similarity index 100% rename from example-all/example-all.xcodeproj/xcshareddata/xcschemes/example-all Debug.xcscheme rename to example_all/example-all.xcodeproj/xcshareddata/xcschemes/example-all Debug.xcscheme diff --git a/example-all/example-all.xcodeproj/xcshareddata/xcschemes/example-all Release.xcscheme b/example_all/example-all.xcodeproj/xcshareddata/xcschemes/example-all Release.xcscheme similarity index 100% rename from example-all/example-all.xcodeproj/xcshareddata/xcschemes/example-all Release.xcscheme rename to example_all/example-all.xcodeproj/xcshareddata/xcschemes/example-all Release.xcscheme diff --git a/example-all/openFrameworks-Info.plist b/example_all/openFrameworks-Info.plist similarity index 100% rename from example-all/openFrameworks-Info.plist rename to example_all/openFrameworks-Info.plist diff --git a/example-all/src/main.cpp b/example_all/src/main.cpp similarity index 100% rename from example-all/src/main.cpp rename to example_all/src/main.cpp diff --git a/example-all/src/ofApp.cpp b/example_all/src/ofApp.cpp similarity index 98% rename from example-all/src/ofApp.cpp rename to example_all/src/ofApp.cpp index b6947a7..6b464f3 100644 --- a/example-all/src/ofApp.cpp +++ b/example_all/src/ofApp.cpp @@ -150,6 +150,7 @@ void ofApp::exit(){ void ofApp::update(){ { kinect.update(); + GstClockTime now = rtp.getServer().getTimeStamp(); if(kinect.isFrameNewVideo()){ fpsRGB.newFrame(); @@ -157,7 +158,7 @@ void ofApp::update(){ { //kinectUpdater.signalNewKinectFrame(); - rtp.getServer().newFrame(kinect.getPixelsRef()); + rtp.getServer().newFrame(kinect.getPixelsRef(),now); } } @@ -174,9 +175,9 @@ void ofApp::update(){ { //kinectUpdater.signalNewKinectFrame(); if(depth16){ - rtp.getServer().newFrameDepth(kinect.getRawDepthPixelsRef()); + rtp.getServer().newFrameDepth(kinect.getRawDepthPixelsRef(),now); }else{ - rtp.getServer().newFrameDepth(kinect.getDepthPixelsRef()); + rtp.getServer().newFrameDepth(kinect.getDepthPixelsRef(),now); } } @@ -196,7 +197,7 @@ void ofApp::update(){ msg.addFloatArg(blob[i].y); } } - rtp.getServer().newOscMsg(msg); + rtp.getServer().newOscMsg(msg,now); } if(drawState==LocalPointCloud){ diff --git a/example-all/src/ofApp.h b/example_all/src/ofApp.h similarity index 100% rename from example-all/src/ofApp.h rename to example_all/src/ofApp.h diff --git a/example-all/src/ofxFPS.cpp b/example_all/src/ofxFPS.cpp similarity index 100% rename from example-all/src/ofxFPS.cpp rename to example_all/src/ofxFPS.cpp diff --git a/example-all/src/ofxFPS.h b/example_all/src/ofxFPS.h similarity index 100% rename from example-all/src/ofxFPS.h rename to example_all/src/ofxFPS.h diff --git a/example_audio/.cproject b/example_audio/.cproject new file mode 100644 index 0000000..46ae6f4 --- /dev/null +++ b/example_audio/.cproject @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example_audio/.project b/example_audio/.project new file mode 100644 index 0000000..ceea002 --- /dev/null +++ b/example_audio/.project @@ -0,0 +1,27 @@ + + + example-audio + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/example_audio/.settings/language.settings.xml b/example_audio/.settings/language.settings.xml new file mode 100644 index 0000000..bd4c270 --- /dev/null +++ b/example_audio/.settings/language.settings.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/example-audio/Makefile b/example_audio/Makefile similarity index 100% rename from example-audio/Makefile rename to example_audio/Makefile diff --git a/example-audio/Project.xcconfig b/example_audio/Project.xcconfig similarity index 100% rename from example-audio/Project.xcconfig rename to example_audio/Project.xcconfig diff --git a/example-audio/addons.make b/example_audio/addons.make similarity index 100% rename from example-audio/addons.make rename to example_audio/addons.make diff --git a/example-audio/bin/data/settings_example.xml b/example_audio/bin/data/settings_example.xml similarity index 100% rename from example-audio/bin/data/settings_example.xml rename to example_audio/bin/data/settings_example.xml diff --git a/example-audio/config.make b/example_audio/config.make similarity index 100% rename from example-audio/config.make rename to example_audio/config.make diff --git a/example-audio/config.ofroot.mk b/example_audio/config.ofroot.mk similarity index 100% rename from example-audio/config.ofroot.mk rename to example_audio/config.ofroot.mk diff --git a/example-audio/example-audio.xcodeproj/project.pbxproj b/example_audio/example-audio.xcodeproj/project.pbxproj similarity index 100% rename from example-audio/example-audio.xcodeproj/project.pbxproj rename to example_audio/example-audio.xcodeproj/project.pbxproj diff --git a/example-audio/example-audio.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example_audio/example-audio.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from example-audio/example-audio.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to example_audio/example-audio.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/example-audio/example-audio.xcodeproj/xcshareddata/xcschemes/example-audio Debug.xcscheme b/example_audio/example-audio.xcodeproj/xcshareddata/xcschemes/example-audio Debug.xcscheme similarity index 100% rename from example-audio/example-audio.xcodeproj/xcshareddata/xcschemes/example-audio Debug.xcscheme rename to example_audio/example-audio.xcodeproj/xcshareddata/xcschemes/example-audio Debug.xcscheme diff --git a/example-audio/example-audio.xcodeproj/xcshareddata/xcschemes/example-audio Release.xcscheme b/example_audio/example-audio.xcodeproj/xcshareddata/xcschemes/example-audio Release.xcscheme similarity index 100% rename from example-audio/example-audio.xcodeproj/xcshareddata/xcschemes/example-audio Release.xcscheme rename to example_audio/example-audio.xcodeproj/xcshareddata/xcschemes/example-audio Release.xcscheme diff --git a/example-audio/openFrameworks-Info.plist b/example_audio/openFrameworks-Info.plist similarity index 100% rename from example-audio/openFrameworks-Info.plist rename to example_audio/openFrameworks-Info.plist diff --git a/example-audio/src/main.cpp b/example_audio/src/main.cpp similarity index 100% rename from example-audio/src/main.cpp rename to example_audio/src/main.cpp diff --git a/example-audio/src/ofApp.cpp b/example_audio/src/ofApp.cpp similarity index 100% rename from example-audio/src/ofApp.cpp rename to example_audio/src/ofApp.cpp diff --git a/example-audio/src/ofApp.h b/example_audio/src/ofApp.h similarity index 100% rename from example-audio/src/ofApp.h rename to example_audio/src/ofApp.h diff --git a/example-osc_over_rtp/Makefile b/example_osc_over_rtp/Makefile similarity index 100% rename from example-osc_over_rtp/Makefile rename to example_osc_over_rtp/Makefile diff --git a/example-osc_over_rtp/Project.xcconfig b/example_osc_over_rtp/Project.xcconfig similarity index 100% rename from example-osc_over_rtp/Project.xcconfig rename to example_osc_over_rtp/Project.xcconfig diff --git a/example-osc_over_rtp/addons.make b/example_osc_over_rtp/addons.make similarity index 100% rename from example-osc_over_rtp/addons.make rename to example_osc_over_rtp/addons.make diff --git a/example-osc_over_rtp/bin/data/settings_example.xml b/example_osc_over_rtp/bin/data/settings_example.xml similarity index 100% rename from example-osc_over_rtp/bin/data/settings_example.xml rename to example_osc_over_rtp/bin/data/settings_example.xml diff --git a/example-osc_over_rtp/config.make b/example_osc_over_rtp/config.make similarity index 100% rename from example-osc_over_rtp/config.make rename to example_osc_over_rtp/config.make diff --git a/example-osc_over_rtp/config.ofroot.mk b/example_osc_over_rtp/config.ofroot.mk similarity index 100% rename from example-osc_over_rtp/config.ofroot.mk rename to example_osc_over_rtp/config.ofroot.mk diff --git a/example-osc_over_rtp/example-osc_over_rtp.xcodeproj/project.pbxproj b/example_osc_over_rtp/example-osc_over_rtp.xcodeproj/project.pbxproj similarity index 100% rename from example-osc_over_rtp/example-osc_over_rtp.xcodeproj/project.pbxproj rename to example_osc_over_rtp/example-osc_over_rtp.xcodeproj/project.pbxproj diff --git a/example-osc_over_rtp/example-osc_over_rtp.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example_osc_over_rtp/example-osc_over_rtp.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from example-osc_over_rtp/example-osc_over_rtp.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to example_osc_over_rtp/example-osc_over_rtp.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/example-osc_over_rtp/example-osc_over_rtp.xcodeproj/xcshareddata/xcschemes/example-osc_over_rtp Debug.xcscheme b/example_osc_over_rtp/example-osc_over_rtp.xcodeproj/xcshareddata/xcschemes/example-osc_over_rtp Debug.xcscheme similarity index 100% rename from example-osc_over_rtp/example-osc_over_rtp.xcodeproj/xcshareddata/xcschemes/example-osc_over_rtp Debug.xcscheme rename to example_osc_over_rtp/example-osc_over_rtp.xcodeproj/xcshareddata/xcschemes/example-osc_over_rtp Debug.xcscheme diff --git a/example-osc_over_rtp/example-osc_over_rtp.xcodeproj/xcshareddata/xcschemes/example-osc_over_rtp Release.xcscheme b/example_osc_over_rtp/example-osc_over_rtp.xcodeproj/xcshareddata/xcschemes/example-osc_over_rtp Release.xcscheme similarity index 100% rename from example-osc_over_rtp/example-osc_over_rtp.xcodeproj/xcshareddata/xcschemes/example-osc_over_rtp Release.xcscheme rename to example_osc_over_rtp/example-osc_over_rtp.xcodeproj/xcshareddata/xcschemes/example-osc_over_rtp Release.xcscheme diff --git a/example-osc_over_rtp/openFrameworks-Info.plist b/example_osc_over_rtp/openFrameworks-Info.plist similarity index 100% rename from example-osc_over_rtp/openFrameworks-Info.plist rename to example_osc_over_rtp/openFrameworks-Info.plist diff --git a/example-osc_over_rtp/src/main.cpp b/example_osc_over_rtp/src/main.cpp similarity index 100% rename from example-osc_over_rtp/src/main.cpp rename to example_osc_over_rtp/src/main.cpp diff --git a/example-osc_over_rtp/src/ofApp.cpp b/example_osc_over_rtp/src/ofApp.cpp similarity index 100% rename from example-osc_over_rtp/src/ofApp.cpp rename to example_osc_over_rtp/src/ofApp.cpp diff --git a/example-osc_over_rtp/src/ofApp.h b/example_osc_over_rtp/src/ofApp.h similarity index 100% rename from example-osc_over_rtp/src/ofApp.h rename to example_osc_over_rtp/src/ofApp.h diff --git a/example_video_audio/, b/example_video_audio/, new file mode 100644 index 0000000..05791f9 --- /dev/null +++ b/example_video_audio/, @@ -0,0 +1,5 @@ + +talk.google.com +telekinect2@gmail.com +telekinect34* + diff --git a/example-video_audio/Makefile b/example_video_audio/Makefile similarity index 100% rename from example-video_audio/Makefile rename to example_video_audio/Makefile diff --git a/example-video_audio/Project.xcconfig b/example_video_audio/Project.xcconfig similarity index 100% rename from example-video_audio/Project.xcconfig rename to example_video_audio/Project.xcconfig diff --git a/example-video_audio/addons.make b/example_video_audio/addons.make similarity index 100% rename from example-video_audio/addons.make rename to example_video_audio/addons.make diff --git a/example-video_audio/bin/data/settings_example.xml b/example_video_audio/bin/data/settings_example.xml similarity index 100% rename from example-video_audio/bin/data/settings_example.xml rename to example_video_audio/bin/data/settings_example.xml diff --git a/example-video_audio/config.make b/example_video_audio/config.make similarity index 100% rename from example-video_audio/config.make rename to example_video_audio/config.make diff --git a/example-video_audio/config.ofroot.mk b/example_video_audio/config.ofroot.mk similarity index 100% rename from example-video_audio/config.ofroot.mk rename to example_video_audio/config.ofroot.mk diff --git a/example-video_audio/example-video_audio.xcodeproj/project.pbxproj b/example_video_audio/example-video_audio.xcodeproj/project.pbxproj similarity index 100% rename from example-video_audio/example-video_audio.xcodeproj/project.pbxproj rename to example_video_audio/example-video_audio.xcodeproj/project.pbxproj diff --git a/example-video_audio/example-video_audio.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example_video_audio/example-video_audio.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from example-video_audio/example-video_audio.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to example_video_audio/example-video_audio.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/example-video_audio/example-video_audio.xcodeproj/xcshareddata/xcschemes/example-video_audio Debug.xcscheme b/example_video_audio/example-video_audio.xcodeproj/xcshareddata/xcschemes/example-video_audio Debug.xcscheme similarity index 100% rename from example-video_audio/example-video_audio.xcodeproj/xcshareddata/xcschemes/example-video_audio Debug.xcscheme rename to example_video_audio/example-video_audio.xcodeproj/xcshareddata/xcschemes/example-video_audio Debug.xcscheme diff --git a/example-video_audio/example-video_audio.xcodeproj/xcshareddata/xcschemes/example-video_audio Release.xcscheme b/example_video_audio/example-video_audio.xcodeproj/xcshareddata/xcschemes/example-video_audio Release.xcscheme similarity index 100% rename from example-video_audio/example-video_audio.xcodeproj/xcshareddata/xcschemes/example-video_audio Release.xcscheme rename to example_video_audio/example-video_audio.xcodeproj/xcshareddata/xcschemes/example-video_audio Release.xcscheme diff --git a/example-video_audio/openFrameworks-Info.plist b/example_video_audio/openFrameworks-Info.plist similarity index 100% rename from example-video_audio/openFrameworks-Info.plist rename to example_video_audio/openFrameworks-Info.plist diff --git a/example-video_audio/src/main.cpp b/example_video_audio/src/main.cpp similarity index 100% rename from example-video_audio/src/main.cpp rename to example_video_audio/src/main.cpp diff --git a/example-video_audio/src/ofApp.cpp b/example_video_audio/src/ofApp.cpp similarity index 100% rename from example-video_audio/src/ofApp.cpp rename to example_video_audio/src/ofApp.cpp diff --git a/example-video_audio/src/ofApp.h b/example_video_audio/src/ofApp.h similarity index 100% rename from example-video_audio/src/ofApp.h rename to example_video_audio/src/ofApp.h diff --git a/example-video_audio_LAN/Makefile b/example_video_audio_LAN/Makefile similarity index 100% rename from example-video_audio_LAN/Makefile rename to example_video_audio_LAN/Makefile diff --git a/example-video_audio_LAN/Project.xcconfig b/example_video_audio_LAN/Project.xcconfig similarity index 100% rename from example-video_audio_LAN/Project.xcconfig rename to example_video_audio_LAN/Project.xcconfig diff --git a/example-video_audio_LAN/addons.make b/example_video_audio_LAN/addons.make similarity index 100% rename from example-video_audio_LAN/addons.make rename to example_video_audio_LAN/addons.make diff --git a/example-video_audio_LAN/bin/data/settings_example.xml b/example_video_audio_LAN/bin/data/settings_example.xml similarity index 100% rename from example-video_audio_LAN/bin/data/settings_example.xml rename to example_video_audio_LAN/bin/data/settings_example.xml diff --git a/example-video_audio_LAN/config.make b/example_video_audio_LAN/config.make similarity index 100% rename from example-video_audio_LAN/config.make rename to example_video_audio_LAN/config.make diff --git a/example-video_audio_LAN/config.ofroot.mk b/example_video_audio_LAN/config.ofroot.mk similarity index 100% rename from example-video_audio_LAN/config.ofroot.mk rename to example_video_audio_LAN/config.ofroot.mk diff --git a/example-video_audio_LAN/example-video_audio_LAN.xcodeproj/project.pbxproj b/example_video_audio_LAN/example-video_audio_LAN.xcodeproj/project.pbxproj similarity index 100% rename from example-video_audio_LAN/example-video_audio_LAN.xcodeproj/project.pbxproj rename to example_video_audio_LAN/example-video_audio_LAN.xcodeproj/project.pbxproj diff --git a/example-video_audio_LAN/example-video_audio_LAN.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example_video_audio_LAN/example-video_audio_LAN.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from example-video_audio_LAN/example-video_audio_LAN.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to example_video_audio_LAN/example-video_audio_LAN.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/example-video_audio_LAN/example-video_audio_LAN.xcodeproj/xcshareddata/xcschemes/example-video_audio_LAN Debug.xcscheme b/example_video_audio_LAN/example-video_audio_LAN.xcodeproj/xcshareddata/xcschemes/example-video_audio_LAN Debug.xcscheme similarity index 100% rename from example-video_audio_LAN/example-video_audio_LAN.xcodeproj/xcshareddata/xcschemes/example-video_audio_LAN Debug.xcscheme rename to example_video_audio_LAN/example-video_audio_LAN.xcodeproj/xcshareddata/xcschemes/example-video_audio_LAN Debug.xcscheme diff --git a/example-video_audio_LAN/example-video_audio_LAN.xcodeproj/xcshareddata/xcschemes/example-video_audio_LAN Release.xcscheme b/example_video_audio_LAN/example-video_audio_LAN.xcodeproj/xcshareddata/xcschemes/example-video_audio_LAN Release.xcscheme similarity index 100% rename from example-video_audio_LAN/example-video_audio_LAN.xcodeproj/xcshareddata/xcschemes/example-video_audio_LAN Release.xcscheme rename to example_video_audio_LAN/example-video_audio_LAN.xcodeproj/xcshareddata/xcschemes/example-video_audio_LAN Release.xcscheme diff --git a/example-video_audio_LAN/openFrameworks-Info.plist b/example_video_audio_LAN/openFrameworks-Info.plist similarity index 100% rename from example-video_audio_LAN/openFrameworks-Info.plist rename to example_video_audio_LAN/openFrameworks-Info.plist diff --git a/example-video_audio_LAN/src/main.cpp b/example_video_audio_LAN/src/main.cpp similarity index 100% rename from example-video_audio_LAN/src/main.cpp rename to example_video_audio_LAN/src/main.cpp diff --git a/example-video_audio_LAN/src/ofApp.cpp b/example_video_audio_LAN/src/ofApp.cpp similarity index 100% rename from example-video_audio_LAN/src/ofApp.cpp rename to example_video_audio_LAN/src/ofApp.cpp diff --git a/example-video_audio_LAN/src/ofApp.h b/example_video_audio_LAN/src/ofApp.h similarity index 100% rename from example-video_audio_LAN/src/ofApp.h rename to example_video_audio_LAN/src/ofApp.h diff --git a/example-video_audio_osc/Makefile b/example_video_audio_osc/Makefile similarity index 100% rename from example-video_audio_osc/Makefile rename to example_video_audio_osc/Makefile diff --git a/example-video_audio_osc/Project.xcconfig b/example_video_audio_osc/Project.xcconfig similarity index 100% rename from example-video_audio_osc/Project.xcconfig rename to example_video_audio_osc/Project.xcconfig diff --git a/example-video_audio_osc/addons.make b/example_video_audio_osc/addons.make similarity index 100% rename from example-video_audio_osc/addons.make rename to example_video_audio_osc/addons.make diff --git a/example-video_audio_osc/bin/data/settings_example.xml b/example_video_audio_osc/bin/data/settings_example.xml similarity index 100% rename from example-video_audio_osc/bin/data/settings_example.xml rename to example_video_audio_osc/bin/data/settings_example.xml diff --git a/example-video_audio_osc/config.make b/example_video_audio_osc/config.make similarity index 100% rename from example-video_audio_osc/config.make rename to example_video_audio_osc/config.make diff --git a/example-video_audio_osc/config.ofroot.mk b/example_video_audio_osc/config.ofroot.mk similarity index 100% rename from example-video_audio_osc/config.ofroot.mk rename to example_video_audio_osc/config.ofroot.mk diff --git a/example-video_audio_osc/example-video_audio_osc.xcodeproj/project.pbxproj b/example_video_audio_osc/example-video_audio_osc.xcodeproj/project.pbxproj similarity index 100% rename from example-video_audio_osc/example-video_audio_osc.xcodeproj/project.pbxproj rename to example_video_audio_osc/example-video_audio_osc.xcodeproj/project.pbxproj diff --git a/example-video_audio_osc/example-video_audio_osc.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example_video_audio_osc/example-video_audio_osc.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from example-video_audio_osc/example-video_audio_osc.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to example_video_audio_osc/example-video_audio_osc.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/example-video_audio_osc/example-video_audio_osc.xcodeproj/xcshareddata/xcschemes/example-video_audio_osc Debug.xcscheme b/example_video_audio_osc/example-video_audio_osc.xcodeproj/xcshareddata/xcschemes/example-video_audio_osc Debug.xcscheme similarity index 100% rename from example-video_audio_osc/example-video_audio_osc.xcodeproj/xcshareddata/xcschemes/example-video_audio_osc Debug.xcscheme rename to example_video_audio_osc/example-video_audio_osc.xcodeproj/xcshareddata/xcschemes/example-video_audio_osc Debug.xcscheme diff --git a/example-video_audio_osc/example-video_audio_osc.xcodeproj/xcshareddata/xcschemes/example-video_audio_osc Release.xcscheme b/example_video_audio_osc/example-video_audio_osc.xcodeproj/xcshareddata/xcschemes/example-video_audio_osc Release.xcscheme similarity index 100% rename from example-video_audio_osc/example-video_audio_osc.xcodeproj/xcshareddata/xcschemes/example-video_audio_osc Release.xcscheme rename to example_video_audio_osc/example-video_audio_osc.xcodeproj/xcshareddata/xcschemes/example-video_audio_osc Release.xcscheme diff --git a/example-video_audio_osc/openFrameworks-Info.plist b/example_video_audio_osc/openFrameworks-Info.plist similarity index 100% rename from example-video_audio_osc/openFrameworks-Info.plist rename to example_video_audio_osc/openFrameworks-Info.plist diff --git a/example-video_audio_osc/src/main.cpp b/example_video_audio_osc/src/main.cpp similarity index 100% rename from example-video_audio_osc/src/main.cpp rename to example_video_audio_osc/src/main.cpp diff --git a/example-video_audio_osc/src/ofApp.cpp b/example_video_audio_osc/src/ofApp.cpp similarity index 100% rename from example-video_audio_osc/src/ofApp.cpp rename to example_video_audio_osc/src/ofApp.cpp diff --git a/example-video_audio_osc/src/ofApp.h b/example_video_audio_osc/src/ofApp.h similarity index 100% rename from example-video_audio_osc/src/ofApp.h rename to example_video_audio_osc/src/ofApp.h diff --git a/src/ofxGstRTPServer.cpp b/src/ofxGstRTPServer.cpp index 3c2d07f..4be1646 100644 --- a/src/ofxGstRTPServer.cpp +++ b/src/ofxGstRTPServer.cpp @@ -640,7 +640,7 @@ void ofxGstRTPServer::on_new_ssrc_handler(GstBin *rtpbin, guint session, guint s void ofxGstRTPServer::update(ofEventArgs & args){ if(ofGetFrameNum()%60==0){ - if(videoSSRC!=0 && videoSessionNumber!=-1){ + if(videoSSRC!=0 && videoSessionNumber!=guint(-1)){ GObject * internalSession; g_signal_emit_by_name(rtpbin,"get-internal-session",videoSessionNumber,&internalSession,NULL); @@ -706,7 +706,7 @@ void ofxGstRTPServer::update(ofEventArgs & args){ } } - if(depthSSRC!=0 && depthSessionNumber!=-1){ + if(depthSSRC!=0 && depthSessionNumber!=guint(-1)){ GObject * internalSession; g_signal_emit_by_name(rtpbin,"get-internal-session",depthSessionNumber,&internalSession,NULL); @@ -764,7 +764,7 @@ void ofxGstRTPServer::update(ofEventArgs & args){ } } - if(audioSSRC!=0 && audioSessionNumber!=-1){ + if(audioSSRC!=0 && audioSessionNumber!=guint(-1)){ GObject * internalSession; g_signal_emit_by_name(rtpbin,"get-internal-session",audioSessionNumber,&internalSession,NULL); @@ -817,7 +817,7 @@ void ofxGstRTPServer::update(ofEventArgs & args){ } } - if(oscSSRC!=0 && oscSessionNumber!=-1){ + if(oscSSRC!=0 && oscSessionNumber!=guint(-1)){ GObject * internalSession; g_signal_emit_by_name(rtpbin,"get-internal-session",oscSessionNumber,&internalSession,NULL); @@ -933,21 +933,18 @@ void ofxGstRTPServer::emitDepthKeyFrame(){ } -void ofxGstRTPServer::newFrame(ofPixels & pixels){ +void ofxGstRTPServer::newFrame(ofPixels & pixels, GstClockTime timestamp){ // here we push new video frames in the pipeline, it's important // to timestamp them properly so gstreamer can sync them with the // audio. if(!bufferPool || !appSrcVideoRGB) return; - // get current time from the pipeline - GstClock * clock = gst_pipeline_get_clock(GST_PIPELINE(gst.getPipeline())); - gst_object_ref(clock); - GstClockTime time = gst_clock_get_time (clock); - GstClockTime now = time - gst_element_get_base_time(gst.getPipeline()); - gst_object_unref (clock); - + GstClockTime now = timestamp; if(!videoAutoTimestamp){ + if(now==GST_CLOCK_TIME_NONE){ + now = getTimeStamp(); + } if(firstVideoFrame){ prevTimestamp = now; firstVideoFrame = false; @@ -992,21 +989,18 @@ void ofxGstRTPServer::newFrame(ofPixels & pixels){ } -void ofxGstRTPServer::newFrameDepth(ofPixels & pixels){ +void ofxGstRTPServer::newFrameDepth(ofPixels & pixels, GstClockTime timestamp){ // here we push new depth frames in the pipeline, it's important // to timestamp them properly so gstreamer can sync them with the // audio. if(!bufferPoolDepth || !appSrcDepth) return; - // get current time from the pipeline - - GstClock * clock = gst_pipeline_get_clock(GST_PIPELINE(gst.getPipeline())); - gst_object_ref(clock); - GstClockTime time = gst_clock_get_time (clock); - GstClockTime now = time - gst_element_get_base_time(gst.getPipeline()); - gst_object_unref (clock); + GstClockTime now = timestamp; if(!depthAutoTimestamp){ + if(now==GST_CLOCK_TIME_NONE){ + now = getTimeStamp(); + } if(firstDepthFrame){ prevTimestampDepth = now; @@ -1052,7 +1046,7 @@ void ofxGstRTPServer::newFrameDepth(ofPixels & pixels){ } -void ofxGstRTPServer::newFrameDepth(ofShortPixels & pixels){ +void ofxGstRTPServer::newFrameDepth(ofShortPixels & pixels, GstClockTime timestamp){ //unsigned long long time = ofGetElapsedTimeMicros(); // here we push new depth frames in the pipeline, it's important @@ -1061,13 +1055,11 @@ void ofxGstRTPServer::newFrameDepth(ofShortPixels & pixels){ if(!bufferPoolDepth || !appSrcDepth) return; - // get current time from the pipeline - - GstClock * clock = gst_pipeline_get_clock(GST_PIPELINE(gst.getPipeline())); - gst_object_ref(clock); - GstClockTime now = gst_clock_get_time (clock) - gst_element_get_base_time(gst.getPipeline()); - gst_object_unref (clock); + GstClockTime now = timestamp; if(!depthAutoTimestamp){ + if(now==GST_CLOCK_TIME_NONE){ + now = getTimeStamp(); + } if(firstDepthFrame){ prevTimestampDepth = now; @@ -1100,17 +1092,7 @@ void ofxGstRTPServer::newFrameDepth(ofShortPixels & pixels){ } if(sendDepthKeyFrame){ - GstClock * clock = gst_pipeline_get_clock(GST_PIPELINE(gst.getPipeline())); - gst_object_ref(clock); - GstClockTime time = gst_clock_get_time (clock); - GstClockTime now = time - gst_element_get_base_time(gst.getPipeline()); - gst_object_unref (clock); - GstEvent * keyFrameEvent = gst_video_event_new_downstream_force_key_unit(now, - time, - now, - TRUE, - 0); - gst_element_send_event(gst.getPipeline(),keyFrameEvent); + emitDepthKeyFrame(); } // finally push the buffer into the pipeline through the appsrc element @@ -1123,17 +1105,14 @@ void ofxGstRTPServer::newFrameDepth(ofShortPixels & pixels){ } -void ofxGstRTPServer::newOscMsg(ofxOscMessage & msg){ +void ofxGstRTPServer::newOscMsg(ofxOscMessage & msg, GstClockTime timestamp){ if(!appSrcOsc) return; - // get current time from the pipeline - - GstClock * clock = gst_pipeline_get_clock(GST_PIPELINE(gst.getPipeline())); - - gst_object_ref(clock); - GstClockTime now = gst_clock_get_time (clock) - gst_element_get_base_time(gst.getPipeline()); - gst_object_unref (clock); + GstClockTime now = timestamp; if(!oscAutoTimestamp){ + if(now==GST_CLOCK_TIME_NONE){ + now = getTimeStamp(); + } if(firstOscFrame){ prevTimestampOsc = now; @@ -1163,6 +1142,15 @@ void ofxGstRTPServer::newOscMsg(ofxOscMessage & msg){ } } +GstClockTime ofxGstRTPServer::getTimeStamp(){ + if(!gst.isLoaded()) return GST_CLOCK_TIME_NONE; + GstClock * clock = gst_pipeline_get_clock(GST_PIPELINE(gst.getPipeline())); + + gst_object_ref(clock); + GstClockTime now = gst_clock_get_time (clock) - gst_element_get_base_time(gst.getPipeline()); + gst_object_unref (clock); + return now; +} void ofxGstRTPServer::appendMessage( ofxOscMessage& message, osc::OutboundPacketStream& p ) { diff --git a/src/ofxGstRTPServer.h b/src/ofxGstRTPServer.h index 7c298a1..99779d2 100644 --- a/src/ofxGstRTPServer.h +++ b/src/ofxGstRTPServer.h @@ -73,11 +73,12 @@ class ofxGstRTPServer: public ofGstAppSink { void emitVideoKeyFrame(); void emitDepthKeyFrame(); - void newFrame(ofPixels & pixels); - void newFrameDepth(ofPixels & pixels); - void newFrameDepth(ofShortPixels & pixels); + GstClockTime getTimeStamp(); - void newOscMsg(ofxOscMessage & msg); + void newFrame(ofPixels & pixels, GstClockTime timestamp=GST_CLOCK_TIME_NONE); + void newFrameDepth(ofPixels & pixels, GstClockTime timestamp=GST_CLOCK_TIME_NONE); + void newFrameDepth(ofShortPixels & pixels, GstClockTime timestamp=GST_CLOCK_TIME_NONE); + void newOscMsg(ofxOscMessage & msg, GstClockTime timestamp=GST_CLOCK_TIME_NONE); bool on_message(GstMessage * msg);