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

Added a new "smooth" slow motion, using the time map fraction to dissolve the next frame into the current one.

Browse Source
This commit is contained in:
Jonathan Thomas
2012-10-29 01:47:39 -05:00
parent 6e9f2a6a9b
commit 7fe9008cad
4 changed files with 190 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Frame.cpp
View File

@@ -490,6 +490,33 @@ void Frame::AddImage(tr1::shared_ptr<Magick::Image> new_image, bool only_odd_lin
height = image->rows();
}
// Composite a new image on top of the existing image
void Frame::AddImage(tr1::shared_ptr<Magick::Image> new_image, float alpha)
{
// Replace image (if needed)
if (image->columns() == 1)
image = new_image;
else
{
// Calculate opacity of new image
int new_opacity = 65535.0f * (1.0 - alpha);
if (new_opacity < 0)
new_opacity = 0; // completely invisible
else if (new_opacity > 65535)
new_opacity = 65535;
// Set opacity
new_image->opacity(new_opacity);
// Composite image on top of current image
image->composite(*new_image.get(), 0, 0, Magick::DissolveCompositeOp);
}
// Update height and width
width = image->columns();
height = image->rows();
}
// Add audio samples to a specific channel
void Frame::AddAudio(int destChannel, int destStartSample, const float* source, int numSamples, float gainToApplyToSource = 1.0f)
{