summaryrefslogtreecommitdiff
path: root/rotord/src/graph.h
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2013-09-16 14:31:04 +0100
committerTim Redfern <tim@eclectronics.org>2013-09-16 14:31:04 +0100
commit440ba17594d17736a56cac0d89be97fb63577989 (patch)
treeb3853fbba0a13a481c5c5247114a6a1170d5efb3 /rotord/src/graph.h
parent1b37a3d71dabc451f48f05fce7ce2d300212c43c (diff)
ffmpegsource audio loading
Diffstat (limited to 'rotord/src/graph.h')
-rw-r--r--rotord/src/graph.h5
1 files changed, 3 insertions, 2 deletions
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<Node*> 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