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

Fixed a big audio bug, where varying timestamp values on low precision audio timebases (i.e. 1/1000) would leave small gaps in the audio wave. Also, fixed a few issues related to sample_rate getting lost between the reader and clip and timeline objects.

Browse Source
This commit is contained in:
Jonathan Thomas
2012-11-20 16:22:50 -06:00
parent 7e51c204f9
commit 495ca9dc9e
9 changed files with 35 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Timeline.cpp
View File

@@ -14,6 +14,15 @@ Timeline::Timeline(int width, int height, Framerate fps, int sample_rate, int ch
// Init cache
int64 bytes = height * width * 4 + (44100 * 2 * 4);
final_cache = Cache(20 * bytes); // 20 frames, 4 colors of chars, 2 audio channels of 4 byte floats
// Init FileInfo struct (clear all values)
InitFileInfo();
info.width = width;
info.height = height;
info.fps = fps.GetFraction();
info.sample_rate = sample_rate;
info.channels = channels;
info.video_timebase = fps.GetFraction().Reciprocal();
}
// Add an openshot::Clip to the timeline
@@ -49,7 +58,6 @@ void Timeline::add_layer(tr1::shared_ptr<Frame> new_frame, Clip* source_clip, in
source_frame = tr1::shared_ptr<Frame>(source_clip->GetFrame(clip_frame_number));
tr1::shared_ptr<Magick::Image> source_image = source_frame->GetImage();
// Get some basic image properties
int source_width = source_image->columns();
int source_height = source_image->rows();
@@ -273,6 +281,7 @@ tr1::shared_ptr<Frame> Timeline::GetFrame(int requested_frame) throw(ReaderClose
{
// Create blank frame (which will become the requested frame)
tr1::shared_ptr<Frame> new_frame(tr1::shared_ptr<Frame>(new Frame(frame_number, width, height, "#000000", GetSamplesPerFrame(frame_number), channels)));
new_frame->SetSampleRate(info.sample_rate);
// Calculate time of frame
float requested_time = calculate_time(frame_number, fps);