Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement seek for missing codes in wavestream #336

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ lexander Yashin https://github.com/yashin-alexander
Nils Duval https://github.com/nlsdvl
JackRedstonia [email protected]
David Bullock https://github.com/dwbullock
Christian Rendina https://github.com/lakor64
42 changes: 34 additions & 8 deletions src/audiosource/wav/soloud_wavstream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -344,20 +344,46 @@ namespace SoLoud
if (mCodec.mOgg)
{
int pos = (int)floor(mBaseSamplerate * aSeconds);
stb_vorbis_seek(mCodec.mOgg, pos);
// Since the position that we just sought to might not be *exactly*
// the position we asked for, we're re-calculating the position just
// for the sake of correctness.
mOffset = stb_vorbis_get_sample_offset(mCodec.mOgg);
double newPosition = float(mOffset / mBaseSamplerate);
mStreamPosition = newPosition;
return 0;
double newPosition;

switch (mParent->mFiletype)
{
case WAVSTREAM_OGG:
stb_vorbis_seek(mCodec.mOgg, pos);
// Since the position that we just sought to might not be *exactly*
// the position we asked for, we're re-calculating the position just
// for the sake of correctness.
mOffset = stb_vorbis_get_sample_offset(mCodec.mOgg);
newPosition = float(mOffset / mBaseSamplerate);
mStreamPosition = newPosition;
return 0;
case WAVSTREAM_FLAC:
drflac_seek_to_pcm_frame(mCodec.mFlac, pos);
mOffset = pos;
mStreamPosition = float(pos / mBaseSamplerate);
return 0;
case WAVSTREAM_MP3:
drmp3_seek_to_pcm_frame(mCodec.mMp3, pos);
mOffset = pos;
mStreamPosition = float(pos / mBaseSamplerate);
return 0;
case WAVSTREAM_WAV:
drwav_seek_to_pcm_frame(mCodec.mWav, pos);
mOffset = pos;
mStreamPosition = float(pos / mBaseSamplerate);
return 0;
default:
break;
}
}
else {
return AudioSourceInstance::seek(aSeconds, mScratch, mScratchSize);
}

return NOT_IMPLEMENTED;
}


result WavStreamInstance::rewind()
{
switch (mParent->mFiletype)
Expand Down