Fixed Wave file writer writing wrong header values #1281
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LaurentGomila
approved these changes
Sep 25, 2017
| @@ -191,8 +188,9 @@ void SoundFileWriterWav::close() | |||
| m_file.flush(); | |||
|
|
|||
| // Update the main chunk size and data sub-chunk size | |||
| Uint32 dataChunkSize = static_cast<Uint32>(m_sampleCount * m_channelCount * 2); | |||
| Uint32 mainChunkSize = dataChunkSize + 36; | |||
| Uint32 fileSize = m_file.tellp(); | |||
There was a problem hiding this comment.
No compiler warning about type conversion here?
There was a problem hiding this comment.
Our VS CI builds have warnings for it.
src\SFML\Audio\SoundFileWriterWav.cpp(191) : warning C4244: 'initializing' : conversion from 'std::streamoff' to 'sf::Uint32', possible loss of data
|
Look good, but I think you can remove m_channelCount as well. |
|
You're right, didn't notice! |
MarioLiebisch
force-pushed
the
bugfix/wav-writer-size
branch
from
480a021
to
da0282a
Compare
Previously when updating the header fields, SFML assumed the number of samples written would be the number of samples per channel, which wasn't the case. Therefore for stereo files the written file length was actually twice the correct value. This fix uses the file size written as a basis, no longer counting the samples written alltogether. This fixes issue #1280.
eXpl0it3r
force-pushed
the
bugfix/wav-writer-size
branch
from
da0282a
to
b3d6e48
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1280.
Previously when updating the header fields, SFML assumed the number of samples written would be the number of samples per channel, which wasn't the case. Therefore for stereo files the written file length was actually twice the correct value. This fix uses the file size written as a basis, no longer counting the samples written altogether.