mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2024-12-27 06:07:14 +01:00
ResourceImporterWAV: Add support for 64-bit IEEE float
This commit is contained in:
parent
b0894431a2
commit
92d4c75d57
@ -165,7 +165,7 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s
|
||||
if (compression_code != 1 && compression_code != 3) {
|
||||
file->close();
|
||||
memdelete(file);
|
||||
ERR_FAIL_V_MSG(ERR_INVALID_DATA, "Format not supported for WAVE file (not PCM). Save WAVE files as uncompressed PCM instead.");
|
||||
ERR_FAIL_V_MSG(ERR_INVALID_DATA, "Format not supported for WAVE file (not PCM). Save WAVE files as uncompressed PCM or IEEE float instead.");
|
||||
}
|
||||
|
||||
format_channels = file->get_16();
|
||||
@ -187,6 +187,12 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s
|
||||
ERR_FAIL_V_MSG(ERR_INVALID_DATA, "Invalid amount of bits in the sample (should be one of 8, 16, 24 or 32).");
|
||||
}
|
||||
|
||||
if (compression_code == 3 && format_bits % 32) {
|
||||
file->close();
|
||||
memdelete(file);
|
||||
ERR_FAIL_V_MSG(ERR_INVALID_DATA, "Invalid amount of bits in the IEEE float sample (should be 32 or 64).");
|
||||
}
|
||||
|
||||
/* Don't need anything else, continue */
|
||||
format_found = true;
|
||||
}
|
||||
@ -217,18 +223,13 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s
|
||||
|
||||
data.resize(frames * format_channels);
|
||||
|
||||
if (compression_code == 1) {
|
||||
if (format_bits == 8) {
|
||||
for (int i = 0; i < frames * format_channels; i++) {
|
||||
// 8 bit samples are UNSIGNED
|
||||
|
||||
data.write[i] = int8_t(file->get_8() - 128) / 128.f;
|
||||
}
|
||||
} else if (format_bits == 32 && compression_code == 3) {
|
||||
for (int i = 0; i < frames * format_channels; i++) {
|
||||
//32 bit IEEE Float
|
||||
|
||||
data.write[i] = file->get_float();
|
||||
}
|
||||
} else if (format_bits == 16) {
|
||||
for (int i = 0; i < frames * format_channels; i++) {
|
||||
//16 bit SIGNED
|
||||
@ -249,6 +250,21 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s
|
||||
data.write[i] = (int32_t(s) >> 16) / 32768.f;
|
||||
}
|
||||
}
|
||||
} else if (compression_code == 3) {
|
||||
if (format_bits == 32) {
|
||||
for (int i = 0; i < frames * format_channels; i++) {
|
||||
//32 bit IEEE Float
|
||||
|
||||
data.write[i] = file->get_float();
|
||||
}
|
||||
} else if (format_bits == 64) {
|
||||
for (int i = 0; i < frames * format_channels; i++) {
|
||||
//64 bit IEEE Float
|
||||
|
||||
data.write[i] = file->get_double();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (file->eof_reached()) {
|
||||
file->close();
|
||||
|
Loading…
Reference in New Issue
Block a user