Ogg & Opus: Also support LOOPEND, a "standard" used outside of the RP…

…G Maker world
EasyRPG · Aug 31, 2021 · faea9ae · faea9ae
1 parent fa17880
commit faea9ae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/decoder_oggvorbis.cpp b/src/decoder_oggvorbis.cpp
@@ -105,6 +105,14 @@ bool OggVorbisDecoder::Open(Filesystem_Stream::InputStream stream) {
 					if (len >= 0) {
 						loop.end = std::min<int64_t>(loop.start + len, total);
 					}
+				} else {
+					str = vorbis_comment_query(vc, "LOOPEND", 0);
+					if (str) {
+						int end = atoi(str);
+						if (end >= 0) {
+							loop.end = Utils::Clamp<int64_t>(end, loop.start, total);
+						}
+					}
 				}
 
 				if (loop.start == total) {

diff --git a/src/decoder_opus.cpp b/src/decoder_opus.cpp
@@ -90,6 +90,14 @@ bool OpusDecoder::Open(Filesystem_Stream::InputStream stream) {
 					if (len >= 0) {
 						loop.end = std::min<int64_t>(loop.start + len, total);
 					}
+				} else {
+					str = opus_tags_query(ot, "LOOPEND", 0);
+					if (str) {
+						int end = atoi(str);
+						if (end >= 0) {
+							loop.end = Utils::Clamp<int64_t>(end, loop.start, total);
+						}
+					}
 				}
 
 				if (loop.start == total) {