diff options
| author | Comment <tim@gray.(none)> | 2013-09-20 15:30:57 +0100 |
|---|---|---|
| committer | Comment <tim@gray.(none)> | 2013-09-20 15:30:57 +0100 |
| commit | 47a4f30fc852f4d49df6df7b4974c7c4751107f3 (patch) | |
| tree | b7c64f304707d5e187d9ac696f5e38dc0b672179 /rotord/src/graph.cpp | |
| parent | a740d4167e6dbd95dbd82e5d217761af8ef12b6f (diff) | |
making video top and tail
Diffstat (limited to 'rotord/src/graph.cpp')
| -rw-r--r-- | rotord/src/graph.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/rotord/src/graph.cpp b/rotord/src/graph.cpp index 0cc36de..2930953 100644 --- a/rotord/src/graph.cpp +++ b/rotord/src/graph.cpp @@ -60,7 +60,7 @@ bool Graph::preview(xmlIO &XML,string &node,string &_format,int frame,int w,int } if (dynamic_cast<Image_node*>(nodes[node])){ Frame_spec fs=Frame_spec(t,framerate,0.0f,w,h); - Image *img=dynamic_cast<Image_node*>(nodes[node])->get_output(fs); + Image *img=dynamic_cast<Image_node*>(nodes[node])->get_image_output(fs); vector<uchar> buf; string format=(_format==""?".png":_format); if (cv::imencode(format,img->rgb,buf)){ //, const vector<int>& params=vector<int>()) @@ -93,6 +93,11 @@ bool Graph::video_render(const string &output_filename,const float framerate) { //} if (find_node("video_output")) { Video_output *video_output=dynamic_cast<Video_output*>(find_node("video_output")); + + if (audio_filename!=""){ //BETTER WAY TO KNOW IF WE ARE USING AUDIO? + video_output->create_envelope(audio_thumb->audiodata); + } + for (auto f: find_nodes("video_feedback")){ (dynamic_cast<Video_feedback*>(f))->set_feedback(&(video_output->image)); } @@ -199,9 +204,9 @@ bool Graph::video_render(const string &output_filename,const float framerate) { Image* i; if (usingaudio) { - i=video_output->get_output(Frame_spec(vf,framerate,duration,outW,outH,a)); + i=video_output->get_image_output(Frame_spec(vf,framerate,duration,outW,outH,a)); } - else i=video_output->get_output(Frame_spec(vf,framerate,duration,outW,outH)); + else i=video_output->get_image_output(Frame_spec(vf,framerate,duration,outW,outH)); if (i) { exporter.encodeFrame(i->RGBdata); } |