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

Fix float to int16_t conversion

Browse Source 
Float values after mix or gain applied can exceed the (1.0; -1.0)
range. This caused distortion in audio instead of limiting values
at max.
This commit is contained in:
SuslikV
2020-03-16 14:41:49 +02:00
parent 816118b6f6
commit c28a8bf4ed
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/FFmpegWriter.cpp
View File

@@ -1525,11 +1525,23 @@ void FFmpegWriter::write_audio_packets(bool is_final) {
// Calculate total samples
total_frame_samples = samples_in_frame * channels_in_frame;
// Translate audio sample values back to 16 bit integers
for (int s = 0; s < total_frame_samples; s++, frame_position++)
// Translate sample value and copy into buffer
all_queued_samples[frame_position] = int(frame_samples_float[s] * (1 << 15));
// Translate audio sample values back to 16 bit integers with saturation
float valF;
int16_t conv;
const int16_t max16 = 32767;
const int16_t min16 = -32768;
for (int s = 0; s < total_frame_samples; s++, frame_position++) {
valF = frame_samples_float[s] * (1 << 15);
if (valF > max16)
conv = max16;
else if (valF < min16)
conv = min16;
else
conv = int(valF + 32768.5) - 32768; // +0.5 is for rounding
// Copy into buffer
all_queued_samples[frame_position] = conv;
}
// Deallocate float array
delete[] frame_samples_float;