seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #104951 from jitspoe/master.avi_16bit_audio

Browse Source 
Default mjpeg avi movie writer to 16 bit audio and add an editor option so it can still write 32 bit.
This commit is contained in:
Thaddeus Crews
2025-10-24 11:23:17 -05:00
parent 822fd083c4 9a4ec179e4
commit 1c9eec6f90
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/jpg/movie_writer_mjpeg.cpp
View File

@ -134,7 +134,7 @@ Error MovieWriterMJPEG::write_begin(const Size2i &p_movie_size, uint32_t p_fps,
// Audio //
const uint32_t bit_depth = 32;
const uint32_t bit_depth = audio_bit_depth;
uint32_t channels = 2;
switch (speaker_mode) {
case AudioServer::SPEAKER_MODE_STEREO:
@ -208,7 +208,18 @@ Error MovieWriterMJPEG::write_frame(const Ref<Image> &p_image, const int32_t *p_
f->store_buffer((const uint8_t *)"01wb", 4); // Stream 1, Audio.
f->store_32(audio_block_size);
f->store_buffer((const uint8_t *)p_audio_data, audio_block_size);
if (audio_bit_depth == 16) {
// Convert from 32bit to 16bit.
Vector<int16_t> audio_buffer_16;
int num_samples = audio_block_size / 2;
audio_buffer_16.resize(num_samples);
for (int i = 0; i < num_samples; ++i) {
audio_buffer_16.write[i] = (int16_t)(p_audio_data[i] >> 16);
}
f->store_buffer((const uint8_t *)audio_buffer_16.ptr(), audio_block_size);
} else {
f->store_buffer((const uint8_t *)p_audio_data, audio_block_size);
}
frame_count++;
@ -261,4 +272,5 @@ MovieWriterMJPEG::MovieWriterMJPEG() {
mix_rate = GLOBAL_GET("editor/movie_writer/mix_rate");
speaker_mode = AudioServer::SpeakerMode(int(GLOBAL_GET("editor/movie_writer/speaker_mode")));
quality = GLOBAL_GET("editor/movie_writer/video_quality");
audio_bit_depth = GLOBAL_GET("editor/movie_writer/audio_bit_depth");
}

1
modules/jpg/movie_writer_mjpeg.h
View File

@ -37,6 +37,7 @@ class MovieWriterMJPEG : public MovieWriter {
uint32_t mix_rate = 48000;
AudioServer::SpeakerMode speaker_mode = AudioServer::SPEAKER_MODE_STEREO;
uint32_t audio_bit_depth = 16;
String base_path;
uint32_t frame_count = 0;
uint32_t fps = 0;