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

Made a few fixes to the frame mapper

Browse Source
This commit is contained in:
Jonathan Thomas
2012-10-30 18:53:26 -05:00
parent 7fe9008cad
commit bc11635731
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/DummyReader.cpp
View File

@@ -41,6 +41,9 @@ void DummyReader::Open() throw(InvalidFile)
info.video_timebase.num = fps.GetFraction().den;
info.video_timebase.den = fps.GetFraction().num;
info.video_length = round(info.duration * info.fps.ToDouble());
info.acodec = "raw";
info.channels = channels;
info.sample_rate = sample_rate;
// Calculate the DAR (display aspect ratio)
Fraction size(info.width * info.pixel_ratio.num, info.height * info.pixel_ratio.den);

8
src/FrameMapper.cpp
View File

@@ -74,9 +74,13 @@ void FrameMapper::Init()
fields.clear();
frames.clear();
// Loop through all fields in the original video file
// Calculate # of fields to map
int frame = 1;
int number_of_fields = info.video_length * 2;
int number_of_fields = reader->info.video_length * 2;
// if (reader->info.video_length * 2 > number_of_fields)
// number_of_fields = reader->info.video_length * 2;
// Loop through all fields in the original video file
for (int field = 1; field <= number_of_fields; field++)
{

11
src/Main.cpp
View File

@@ -16,6 +16,17 @@ void FrameReady(int number)
int main()
{
// Create a reader
DummyReader r1(Framerate(24,1), 720, 480, 22000, 2, 5.0);
// Map frames
FrameMapper mapping(&r1, Framerate(60, 1), PULLDOWN_CLASSIC);
mapping.PrintMapping();
return 0;
// Create timeline
Timeline t(640, 360, Framerate(24,1));