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

Removed some invalid code to handle interlaced frames. Improved the CheckFPS() algorithm to check for 1/2 the detected frame rate first, and then fallback to the "average frame rate".

Browse Source
This commit is contained in:
Jonathan Thomas
2011-12-17 16:16:59 -06:00
parent f00c4206be
commit b4c7a6ce81
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/FFmpegReader.cpp
+19 -18
View File
@@ -717,19 +717,6 @@ void FFmpegReader::convert_image(int current_frame, AVPicture *copyFrame, int wi
// Update working cache
working_cache.Add(f.number, f);
// Add interlaced image (if any)
if (info.interlaced_frame)
{
// Update working cache
Frame f1 = CreateFrame(current_frame + 1);
// Add Image data to frame
f1.AddImage(width, height, "RGB", Magick::CharPixel, buffer);
// Update working cache
working_cache.Add(f1.number, f1);
}
// Free the RGB image
av_free(buffer);
av_free(pFrameRGB);
@@ -966,8 +953,8 @@ void FFmpegReader::CheckFPS()
// cout << "FORTH SECOND: " << forth_second_counter << endl;
// cout << "FIFTH SECOND: " << fifth_second_counter << endl;
int sum_fps = first_second_counter + second_second_counter + third_second_counter + forth_second_counter + fifth_second_counter;
int avg_fps = round(sum_fps / 5.0f);
int sum_fps = second_second_counter + third_second_counter + forth_second_counter + fifth_second_counter;
int avg_fps = round(sum_fps / 4.0f);
// Sometimes the FPS is incorrectly detected by FFmpeg. If the 1st and 2nd seconds counters
// agree with each other, we are going to adjust the FPS of this reader instance. Otherwise, print
@@ -980,9 +967,23 @@ void FFmpegReader::CheckFPS()
// Is difference bigger than 1 frame?
if (diff <= -1 || diff >= 1)
{
// Update FPS for this reader instance
info.fps = Fraction(avg_fps, 1);
cout << "UPDATED FPS FROM " << fps << " to " << info.fps.ToDouble() << endl;
// Compare to half the frame rate (the most common type of issue)
double half_fps = Fraction(info.fps.num / 2, info.fps.den).ToDouble();
diff = half_fps - double(avg_fps);
// Is difference bigger than 1 frame?
if (diff <= -1 || diff >= 1)
{
// Update FPS for this reader instance
info.fps = Fraction(avg_fps, 1);
cout << "UPDATED FPS FROM " << fps << " to " << info.fps.ToDouble() << " (Average FPS)" << endl;
}
else
{
// Update FPS for this reader instance (to 1/2 the original framerate)
info.fps = Fraction(info.fps.num / 2, info.fps.den);
cout << "UPDATED FPS FROM " << fps << " to " << info.fps.ToDouble() << " (1/2 FPS)" << endl;
}
}
// Seek to frame 1
src/Main.cpp
+3 -3
View File
@@ -16,9 +16,9 @@ int main()
// openshot::FFmpegReader r("/home/jonathan/Aptana Studio Workspace/OpenShotLibrary/src/examples/test.mp4");
// openshot::FFmpegReader r("/home/jonathan/Aptana Studio Workspace/OpenShotLibrary/src/examples/test1.mp4");
// openshot::FFmpegReader r("/home/jonathan/Videos/OpenShot_Now_In_3d.mp4");
openshot::FFmpegReader r("/home/jonathan/Videos/Version 1.1a.mp4");
// openshot::FFmpegReader r("/home/jonathan/Videos/sintel-1024-stereo.mp4");
openshot::FFmpegReader r("/home/jonathan/Videos/00119.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");
@@ -29,7 +29,7 @@ int main()
// Display debug info
r.DisplayInfo();
for (int frame = 1; frame < 3000; frame++)
for (int frame = 300; frame < 3000; frame++)
{
Frame f = r.GetFrame(frame);
f.Play();