We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch file for music_ogg.c to expand looping support

music_ogg_improve_looping.patch (text/plain), 2.69 KB, created by Michael Day on 2019-10-30 03:19:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Day

Created: 2019-10-30 03:19:54 UTC

Size: 2.69 KB

patch

obsolete

>diff --git a/music_ogg.c b/music_ogg.c
>index 5d34e7a..a3544c3 100644
>--- a/music_ogg.c
>+++ b/music_ogg.c
>@@ -223,6 +223,43 @@ static int OGG_UpdateSection(OGG_music *music)
>     return 0;
> }
> 
>+/* Parse time string of the form HH:MM:SS.mmm and return equivalent sample
>+ * position */
>+static ogg_int64_t parse_time(char *time, long samplerate_hz)
>+{
>+    char *num_start, *p;
>+    ogg_int64_t result = 0;
>+    char c;
>+
>+    // Time is directly expressed as a sample position
>+    if (SDL_strchr(time, ':') == NULL)
>+    {
>+        return SDL_strtoull(time, NULL, 0);
>+    }
>+
>+    result = 0;
>+    num_start = time;
>+
>+    for (p = time; *p != '\0'; ++p)
>+    {
>+        if (*p == '.' || *p == ':')
>+        {
>+            c = *p; *p = '\0';
>+            result = result * 60 + SDL_atoi(num_start);
>+            num_start = p + 1;
>+            *p = c;
>+        }
>+
>+        if (*p == '.')
>+        {
>+            return result * samplerate_hz
>+            + (ogg_int64_t) (SDL_atof(p) * samplerate_hz);
>+        }
>+    }
>+
>+    return (result * 60 + SDL_atoi(num_start)) * samplerate_hz;
>+}
>+
> /* Load an OGG stream from an SDL_RWops object */
> static void *OGG_CreateFromRW(SDL_RWops *src, int freesrc)
> {
>@@ -231,6 +268,7 @@ static void *OGG_CreateFromRW(SDL_RWops *src, int freesrc)
>     vorbis_comment *vc;
>     int isLoopLength = 0, i;
>     ogg_int64_t fullLength;
>+    long rate;
> 
>     music = (OGG_music *)SDL_calloc(1, sizeof *music);
>     if (!music) {
>@@ -262,6 +300,7 @@ static void *OGG_CreateFromRW(SDL_RWops *src, int freesrc)
>     }
> 
>     vc = vorbis.ov_comment(&music->vf, -1);
>+    rate = music->vi.rate;
>     for (i = 0; i < vc->comments; i++) {
>         char *param = SDL_strdup(vc->user_comments[i]);
>         char *argument = param;
>@@ -272,14 +311,21 @@ static void *OGG_CreateFromRW(SDL_RWops *src, int freesrc)
>             *(value++) = '\0';
>         }
> 
>+        /* Want to match LOOP-START, LOOP_START, etc. Remove - or _ from
>+         * string if it is present at position 4. */
>+
>+        if ((argument[4] == '_') || (argument[4] == '-')) {
>+            SDL_memmove(argument + 4, argument + 5, SDL_strlen(argument) - 4);
>+        }
>+
>         if (SDL_strcasecmp(argument, "LOOPSTART") == 0)
>-            music->loop_start = SDL_strtoull(value, NULL, 0);
>+            music->loop_start = parse_time(value, rate);
>         else if (SDL_strcasecmp(argument, "LOOPLENGTH") == 0) {
>             music->loop_len = SDL_strtoull(value, NULL, 0);
>             isLoopLength = 1;
>         } else if (SDL_strcasecmp(argument, "LOOPEND") == 0) {
>             isLoopLength = 0;
>-            music->loop_end = SDL_strtoull(value, NULL, 0);
>+            music->loop_end = parse_time(value, rate);
>         }
>         SDL_free(param);
>     }

Actions: View | Diff

Attachments on bug 4849: 4025

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.