Merge pull request #85556 from bs-mwoerner/wav-import-fix

akien-mga · akien-mga · commit 6cfb3f61f25f · 2023-12-04T23:19:34.000+01:00
Fix importing WAV files with odd chunk sizes
diff --git a/editor/import/resource_importer_wav.cpp b/editor/import/resource_importer_wav.cpp
@@ -292,7 +292,9 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s
 				loop_end = file->get_32();
 			}
 		}
-		file->seek(file_pos + chunksize);
+		// Move to the start of the next chunk. Note that RIFF requires a padding byte for odd
+		// chunk sizes.
+		file->seek(file_pos + chunksize + (chunksize & 1));
 	}
 
 	// STEP 2, APPLY CONVERSIONS

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,9 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s`
`292`	`292`	`loop_end = file->get_32();`
`293`	`293`	`}`
`294`	`294`	`}`
`295`		`- file->seek(file_pos + chunksize);`
	`295`	`+ // Move to the start of the next chunk. Note that RIFF requires a padding byte for odd`
	`296`	`+ // chunk sizes.`
	`297`	`+ file->seek(file_pos + chunksize + (chunksize & 1));`
`296`	`298`	`}`
`297`	`299`
`298`	`300`	`// STEP 2, APPLY CONVERSIONS`