From 12c7449bd73a49ede4dacb90a9b0b7f73eb2e287 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Mon, 27 May 2013 12:40:16 +0100 Subject: quick fix --- rotord/01-future.xml | 30 ------------------------------ rotord/01.xml | 17 ----------------- rotord/01_thumbnail.jpg | Bin 3469 -> 0 bytes rotord/02.xml | 7 ------- rotord/03.xml | 8 -------- rotord/04.xml | 23 ----------------------- rotord/05.xml | 46 ---------------------------------------------- rotord/06.xml | 29 ----------------------------- rotord/07.xml | 11 ----------- rotord/08.xml | 21 --------------------- rotord/09.xml | 20 -------------------- rotord/10.xml | 11 ----------- rotord/graph.cpp | 8 ++++++-- rotord/libavwrapper.cpp | 9 +++++++-- rotord/rendercontext.cpp | 5 +++-- rotord/rotor.cpp | 9 +++++++-- rotord/rotor.h | 10 +++++----- rotord/rotord.xml | 4 ---- rotord/settings.xml | 2 +- rotord/style01.xml | 7 ------- rotord/style02.xml | 7 ------- rotord/styles.xml | 9 --------- 22 files changed, 29 insertions(+), 264 deletions(-) delete mode 100644 rotord/01-future.xml delete mode 100755 rotord/01.xml delete mode 100644 rotord/01_thumbnail.jpg delete mode 100644 rotord/02.xml delete mode 100644 rotord/03.xml delete mode 100644 rotord/04.xml delete mode 100644 rotord/05.xml delete mode 100644 rotord/06.xml delete mode 100644 rotord/07.xml delete mode 100644 rotord/08.xml delete mode 100644 rotord/09.xml delete mode 100644 rotord/10.xml delete mode 100644 rotord/rotord.xml delete mode 100644 rotord/style01.xml delete mode 100644 rotord/style02.xml delete mode 100644 rotord/styles.xml (limited to 'rotord') diff --git a/rotord/01-future.xml b/rotord/01-future.xml deleted file mode 100644 index 03f3f0b..0000000 --- a/rotord/01-future.xml +++ /dev/null @@ -1,30 +0,0 @@ - -Off and on template 命otor 2013 - beats - - segmenter - - signal divide - signal 1 to divide - amount - 2.0 - - - - red - 0.5 - - green - 0.5 - - blue - 0.5 - - - outputs a single 1 every time signal enters a new number - signal to analyse - - outputs data when changed - signal to output - - diff --git a/rotord/01.xml b/rotord/01.xml deleted file mode 100755 index dd34ed8..0000000 --- a/rotord/01.xml +++ /dev/null @@ -1,17 +0,0 @@ - -Sample template 命otor 2013 - beats - - on off - signal 1 to make on off - - performance video - - invert video - invert signal - image to invert - - video output - image to output - - diff --git a/rotord/01_thumbnail.jpg b/rotord/01_thumbnail.jpg deleted file mode 100644 index e44db36..0000000 Binary files a/rotord/01_thumbnail.jpg and /dev/null differ diff --git a/rotord/02.xml b/rotord/02.xml deleted file mode 100644 index 3af92e1..0000000 --- a/rotord/02.xml +++ /dev/null @@ -1,7 +0,0 @@ - -Off and on template 命otor 2013 - - renders the video - video to output - - diff --git a/rotord/03.xml b/rotord/03.xml deleted file mode 100644 index c6fab6e..0000000 --- a/rotord/03.xml +++ /dev/null @@ -1,8 +0,0 @@ - -testcard 穢Rotor 2013 - testcard - - renders the video - video to output - - diff --git a/rotord/04.xml b/rotord/04.xml deleted file mode 100644 index b7b38e5..0000000 --- a/rotord/04.xml +++ /dev/null @@ -1,23 +0,0 @@ - -Sample template 命otor 2013 - beats - - performance video - - performance video - - performance video - - performance video - - video cycler - switching signal - image to switch - image to switch - image to switch - image to switch - - video output - image to output - - diff --git a/rotord/05.xml b/rotord/05.xml deleted file mode 100644 index 4566be3..0000000 --- a/rotord/05.xml +++ /dev/null @@ -1,46 +0,0 @@ - -Sample template 命otor 2013 - beats - - segmentation - - fraction of audio track - - comparison - comparison signal - - arithmetic - arithmetic signal - value control - - comparison - comparison signal - - divide - signal to divide - - performance video - - performance video - - video cycler - switching signal - image to switch - image to switch - - echo trails - image input - mode control - - divide - signal to divide - - video cycler - switching signal - image to switch - image to switch - - video output - image to output - - diff --git a/rotord/06.xml b/rotord/06.xml deleted file mode 100644 index 1794914..0000000 --- a/rotord/06.xml +++ /dev/null @@ -1,29 +0,0 @@ - -Testing parameter controls 命otor 2013 - beats - - on off - signal 1 to make on off - - performance video - - fraction of audio track - - arithmetic - arithmetic signal - - arithmetic - arithmetic signal - - arithmetic - arithmetic signal - value control - - luma levels - image input - white_out control - - video output - image to output - - diff --git a/rotord/07.xml b/rotord/07.xml deleted file mode 100644 index 5744bb5..0000000 --- a/rotord/07.xml +++ /dev/null @@ -1,11 +0,0 @@ - -Testing parameter controls 命otor 2013 - performance video - - echo trails - image input - - video output - image to output - - diff --git a/rotord/08.xml b/rotord/08.xml deleted file mode 100644 index 2643b6b..0000000 --- a/rotord/08.xml +++ /dev/null @@ -1,21 +0,0 @@ - -Testing parameter controls 穢Rotor 2013 - beats - - segmentation - - - colour segmentation - signal to visualise - - signal arithmetic - signal to operate on - - colour segmentation - value control - image to operate on - - video output - image to output - - diff --git a/rotord/09.xml b/rotord/09.xml deleted file mode 100644 index 91bbaf9..0000000 --- a/rotord/09.xml +++ /dev/null @@ -1,20 +0,0 @@ - -Testing parameter controls 穢Rotor 2013 - beats - - beats - - - signal arithmetic - signal to operate on - - testcard - - colour segmentation - value control - image to operate on - - video output - image to output - - diff --git a/rotord/10.xml b/rotord/10.xml deleted file mode 100644 index dad3037..0000000 --- a/rotord/10.xml +++ /dev/null @@ -1,11 +0,0 @@ - -Testing parameter controls 穢Rotor 2013 - beats - - colour segmentation - signal to visualise - - video output - image to output - - diff --git a/rotord/graph.cpp b/rotord/graph.cpp index 655badb..7644dde 100644 --- a/rotord/graph.cpp +++ b/rotord/graph.cpp @@ -27,14 +27,18 @@ bool Graph::signal_render(string &signal_xml,const float framerate) { Signal_output *signal_output=dynamic_cast(find_node("signal_output")); return signal_output->render(duration,framerate,signal_xml); } - else return false; + cerr<<"Rotor: signal output node not found"<(find_node("video_output")); return video_output->render(duration,framerate,output_filename,audio_filename,progress); } - else return false; + + cerr<<"Rotor: video output node not found"<process_frame(frame->data[0],frame->nb_samples); } - mutex.lock(); + //mutex.lock(); progress=((double)sample_processed)/samples; - mutex.unlock(); + //mutex.unlock(); } } diff --git a/rotord/rotor.cpp b/rotord/rotor.cpp index 5e4c6bb..83a3b8f 100755 --- a/rotord/rotor.cpp +++ b/rotord/rotor.cpp @@ -55,13 +55,18 @@ bool Signal_output::render(const float duration, const float framerate,string &x cerr << "Rotor: Signal_output rendering " << duration << " seconds at " << framerate << " frames per second" << endl; float step=1.0f/framerate; float v=0.0f; + float min=10000000.0f; + float max=-10000000.0f; for (float f=0.0f;f"+ofToString(u)+"\n"); v=u; + if (v>max) max=v; + if (v\n"); return true; } @@ -164,7 +169,7 @@ int Audio_analysis::process_frame(uint8_t *data,int samples_in_frame) { } void Audio_analysis::cleanup() { analyser.cleanup(); - print_features(); + //print_features(); } void Audio_analysis::print_features(){ for (auto i: analyser.features) { @@ -242,7 +247,7 @@ bool Video_loader::load(const string &filename){ } */ Poco::Path path; - string uri="file://"+path.current()+filename; + string uri="file://"+filename; isLoaded=player.open(uri); if (isLoaded){ cerr<<"Rotor::Video_loader: "<RGBdata[i]=LUT[RGBdata[i]]; } - delete LUT; + delete[] LUT; return other; } Image * operator+(const float &amount) { @@ -263,7 +263,7 @@ namespace Rotor { for (int i=0;iRGBdata[i]=LUT[RGBdata[i]]; } - delete LUT; + delete[] LUT; return other; } Image * operator-(const float &amount) { @@ -275,7 +275,7 @@ namespace Rotor { for (int i=0;iRGBdata[i]=LUT[RGBdata[i]]; } - delete LUT; + delete[] LUT; return other; } Image * operator/(const float &amount) { @@ -287,7 +287,7 @@ namespace Rotor { for (int i=0;iRGBdata[i]=LUT[RGBdata[i]]; } - delete LUT; + delete[] LUT; return other; } uint8_t *RGBdata; @@ -1177,7 +1177,7 @@ namespace Rotor { std::string output_dir; Audio_thumbnailer *audio_thumb; - vampHost::QMAnalyser audio_analyser; + //vampHost::QMAnalyser audio_analyser; Graph graph; Node_factory factory; float output_framerate; diff --git a/rotord/rotord.xml b/rotord/rotord.xml deleted file mode 100644 index 0a9422f..0000000 --- a/rotord/rotord.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 9000 - \ No newline at end of file diff --git a/rotord/settings.xml b/rotord/settings.xml index b27ddef..500c8d9 100644 --- a/rotord/settings.xml +++ b/rotord/settings.xml @@ -1,3 +1,3 @@ - + diff --git a/rotord/style01.xml b/rotord/style01.xml deleted file mode 100644 index d2d2f46..0000000 --- a/rotord/style01.xml +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/rotord/style02.xml b/rotord/style02.xml deleted file mode 100644 index d2d2f46..0000000 --- a/rotord/style02.xml +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/rotord/styles.xml b/rotord/styles.xml deleted file mode 100644 index 78087a7..0000000 --- a/rotord/styles.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - -- cgit v1.2.3