Refactored FFmpegReader code a bit, fixed many, many memory leaks, and many valgrind errors. Now the memory seems very stable, and the seeking and stream walking seems very solid.

This commit is contained in:
Jonathan Thomas
2012-07-08 23:26:44 -05:00
parent 8067cb657a
commit dfae7825ca
5 changed files with 63 additions and 49 deletions

View File

@@ -16,11 +16,11 @@ int main()
// openshot::FFmpegReader r("/home/jonathan/apps/libopenshot/src/examples/test.mp4");
// openshot::FFmpegReader r("/home/jonathan/apps/libopenshot/src/examples/test1.mp4");
// openshot::FFmpegReader r("/home/jonathan/apps/libopenshot/src/examples/piano.wav");
// openshot::FFmpegReader r("/home/jonathan/Videos/sintel-1024-stereo.mp4");
openshot::FFmpegReader r("/home/jonathan/Videos/sintel-1024-stereo.mp4");
// openshot::FFmpegReader r("/home/jonathan/Videos/00001.mts");
// openshot::FFmpegReader r("/home/jonathan/Videos/sintel_trailer-720p.mp4");
// openshot::FFmpegReader r("/home/jonathan/Aptana Studio Workspace/OpenShotLibrary/src/examples/piano.wav");
openshot::FFmpegReader r("/home/jonathan/Music/Army of Lovers/Crucified/Army of Lovers - Crucified [Single Version].mp3");
// openshot::FFmpegReader r("/home/jonathan/Music/Army of Lovers/Crucified/Army of Lovers - Crucified [Single Version].mp3");
// openshot::FFmpegReader r("/home/jonathan/Documents/OpenShot Art/test.jpeg");
// openshot::FFmpegReader r("/home/jonathan/Videos/60fps.mp4");
// openshot::FFmpegReader r("/home/jonathan/Aptana Studio Workspace/OpenShotLibrary/src/examples/asdf.wdf");
@@ -31,19 +31,16 @@ int main()
for (int repeat = 0; repeat <= 10; repeat++)
{
cout << "----------- REPEAT READER " << repeat << " ---------------" << endl;
for (int frame = 1; frame <= 400; frame++)
for (int frame = 300; frame <= 400; frame++)
{
Frame f = r.GetFrame(frame);
//f.Play();
//f.Display();
//f.DisplayWaveform(false);
f.Play();
f.Display();
f.DisplayWaveform(false);
}
cout << "SLEEPING..." << endl;
sleep(3);
// Seek to frame 1
r.GetFrame(1);
}
//Player g;