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

Refactored the audio waveform generation into the Timeline class. Added the ability to set the volume, and the ability to mix layers of audio samples together. Also, made the waveform's have a transparent background, so they can be layered on top of other layers.

Browse Source
This commit is contained in:
Jonathan Thomas
2012-11-29 16:32:48 -06:00
parent afd9b1d6d3
commit d3ef1fac13
10 changed files with 85 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/FFmpegWriter.cpp
View File

@@ -146,7 +146,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, string codec, Fraction fps, i
}
// Set audio export options
void FFmpegWriter::SetAudioOptions(bool has_audio, string codec, int sample_rate, int channels, int bit_rate, bool visualize)
void FFmpegWriter::SetAudioOptions(bool has_audio, string codec, int sample_rate, int channels, int bit_rate)
{
// Set audio options
if (codec.length() > 0)
@@ -172,7 +172,6 @@ void FFmpegWriter::SetAudioOptions(bool has_audio, string codec, int sample_rate
// Enable / Disable audio
info.has_audio = has_audio;
info.visualize = visualize;
}
// Set custom options (some codecs accept additional params)
@@ -1155,13 +1154,8 @@ void FFmpegWriter::process_video_packet(tr1::shared_ptr<Frame> frame)
AVFrame *frame_source = NULL;
const Magick::PixelPacket *pixel_packets = NULL;
// If visualizing waveform (replace image with waveform image)
if (!info.visualize)
// Get a list of pixels from source image
pixel_packets = frame->GetPixels();
else
// Get a list of pixels from waveform image
pixel_packets = frame->GetWaveformPixels(source_image_width, source_image_height);
// Get a list of pixels from source image
pixel_packets = frame->GetPixels();
// Init AVFrame for source image & final (converted image)
frame_source = allocate_avframe(PIX_FMT_RGB24, source_image_width, source_image_height, &bytes_source);