TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

movies: allow seeking compressed Ogg Vorbis file to beginning

Browse Source
This commit is contained in:
rdb 2019-04-29 11:39:30 +02:00
parent a726592244
commit 2c55663472
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
panda/src/movies/vorbisAudioCursor.cxx
View File

@ -91,19 +91,46 @@ seek(double t) {
t = std::max(t, 0.0); t = std::max(t, 0.0);
// Use ov_time_seek_lap if cross-lapping is enabled. // Use ov_time_seek_lap if cross-lapping is enabled.
int result;
if (vorbis_seek_lap) { if (vorbis_seek_lap) {
if (ov_time_seek_lap(&_ov, t) != 0) { result = ov_time_seek_lap(&_ov, t);
movies_cat.error()
<< "Seek failed. Ogg Vorbis stream may not be seekable.\n";
return;
}
} else { } else {
if (ov_time_seek(&_ov, t) != 0) { result = ov_time_seek(&_ov, t);
movies_cat.error() }
<< "Seek failed. Ogg Vorbis stream may not be seekable.\n";
// Special case for seeking to the beginning; if normal seek fails, we may
// be able to explicitly seek to the beginning of the file and call ov_open
// again. This allows looping compressed .ogg files.
if (result == OV_ENOSEEK && t == 0.0) {
std::istream *stream = (std::istream *)_ov.datasource;
if (stream->rdbuf()->pubseekpos(0, std::ios::in) == 0) {
// Back up the callbacks, then destroy the stream, making sure to first
// unset the datasource so that it won't close the file.
ov_callbacks callbacks = _ov.callbacks;
_ov.datasource = nullptr;
ov_clear(&_ov);
if (ov_open_callbacks((void *)stream, &_ov, nullptr, 0, callbacks) != 0) {
movies_cat.error()
<< "Failed to reopen Ogg Vorbis file to seek to beginning.\n";
return;
}
// Reset these fields for good measure, just in case the file changed.
vorbis_info *vi = ov_info(&_ov, -1);
_audio_channels = vi->channels;
_audio_rate = vi->rate;
_last_seek = 0.0;
_samples_read = 0;
return; return;
} }
} }
if (result != 0) {
movies_cat.error()
<< "Seek failed. Ogg Vorbis stream may not be seekable.\n";
}
_last_seek = ov_time_tell(&_ov); _last_seek = ov_time_tell(&_ov);
_samples_read = 0; _samples_read = 0;