From 440ba17594d17736a56cac0d89be97fb63577989 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Mon, 16 Sep 2013 14:31:04 +0100 Subject: ffmpegsource audio loading --- rotord/src/graph.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'rotord/src/graph.h') diff --git a/rotord/src/graph.h b/rotord/src/graph.h index 6a2fc2d..9207559 100644 --- a/rotord/src/graph.h +++ b/rotord/src/graph.h @@ -42,6 +42,7 @@ namespace Rotor { vector find_nodes(const string &type); //could be a way of finding a set based on capabilities? Node* find_node(const string &type); bool signal_render(string &signal_xml,const float framerate); + bool _video_render(const string &output_filename,const float framerate); bool video_render(const string &output_filename,const float framerate); bool load(string data,string media_path); bool loadFile(string &filename,string media_path); @@ -70,7 +71,7 @@ namespace Rotor { public: bool make(const string &inputfilename,int w,int h,const string &outputfilename) { if (player.open(inputfilename)){ - if (player.fetchFrame(w,h,player.getNumberOfFrames()/4)) { + if (player.fetch_frame(w,h,player.get_number_frames()/4)) { Image i; i.setup_fromRGB(w,h,player.frame->Data[0],player.frame->Linesize[0]-(w*3)); cv::Mat cp; @@ -83,7 +84,7 @@ namespace Rotor { return false; } private: - libav::ffms2_decoder player; + libav::video_decoder player; }; } #endif -- cgit v1.2.3