openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Protected the Open() and Close() methods better, so the FFmpegReader will not crash. Also, made the Open() method public, so the Timeline and Clip classes can control the reader better.

Browse Source
This commit is contained in:
Jonathan Thomas
2012-10-08 15:02:52 -05:00
parent 6d790d2670
commit 8518071890
3 changed files with 161 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/Main.cpp
View File

@@ -14,50 +14,52 @@ void FrameReady(int number)
int main()
{
// Create timeline
Framerate fps(30000,1000);
Timeline t(640, 480, fps);
// // Create timeline
// Framerate fps(30000,1000);
// Timeline t(640, 480, fps);
//
// // Add some clips
// Clip c1;
// c1.Position(10.0);
//
// Clip c2;
// c2.Position(0.0);
//
// Clip c3;
// c3.Position(2.5);
//
// Clip c4;
// c4.Position(40.4);
//
// Clip c5;
// c5.Position(0.1);
//
// t.AddClip(&c4);
// t.AddClip(&c2);
// t.AddClip(&c3);
// t.AddClip(&c1);
// t.AddClip(&c5);
//
// t.GetFrame(1);
//
// c1.Position(50.0);
// c2.Position(42.0);
// c3.Position(33.0);
// c4.Position(63.0);
// c5.Position(13.0);
//
// t.SortClips();
// t.GetFrame(1);
//
// // Create a clip
// Clip c("/home/jonathan/Videos/sintel_trailer-720p.mp4");
// cout << "Position: " << c.Position() << endl;
// cout << "Start: " << c.Start() << endl;
// cout << "End: " << c.End() << endl;
//
// return 0;
// Add some clips
Clip c1;
c1.Position(10.0);
Clip c2;
c2.Position(0.0);
Clip c3;
c3.Position(2.5);
Clip c4;
c4.Position(40.4);
Clip c5;
c5.Position(0.1);
t.AddClip(&c4);
t.AddClip(&c2);
t.AddClip(&c3);
t.AddClip(&c1);
t.AddClip(&c5);
t.GetFrame(1);
c1.Position(50.0);
c2.Position(42.0);
c3.Position(33.0);
c4.Position(63.0);
c5.Position(13.0);
t.SortClips();
t.GetFrame(1);
// Create a clip
Clip c("/home/jonathan/Videos/sintel_trailer-720p.mp4");
cout << "Position: " << c.Position() << endl;
cout << "Start: " << c.Start() << endl;
cout << "End: " << c.End() << endl;
return 0;
//openshot::ImageReader i("/home/jonathan/Apps/videcho_site/media/logos/watermark3.png");
//openshot::Frame* overlay = i.GetFrame(1);