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] V8: better code in opus and merge music_modplug

duration-v8.patch (text/plain), 14.57 KB, created by matthias gatto on 2019-12-14 18:18:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: matthias gatto

Created: 2019-12-14 18:18:01 UTC

Size: 14.57 KB

patch

obsolete

># HG changeset patch
># User Matthias Gatto <uso.cosmo.ray@gmail.com>
># Date 1576174439 -3600
>#      Thu Dec 12 19:13:59 2019 +0100
># Node ID 315cb5bef4f0cac11a2181b81a5944b9fb66073e
># Parent  38ae3fb1962a9b7f087f7eeaf4e4493d1f8e7970
>Introduce Mix_MusicDuration.
>
>Support Wav,orbis,ogg,mp3,flac,timidity
>
>diff -r 38ae3fb1962a -r 315cb5bef4f0 include/SDL_mixer.h
>--- a/include/SDL_mixer.h	Wed Dec 11 22:20:02 2019 +0300
>+++ b/include/SDL_mixer.h	Thu Dec 12 19:13:59 2019 +0100
>@@ -618,6 +618,12 @@
> /* Stop music and set external music playback command */
> extern DECLSPEC int SDLCALL Mix_SetMusicCMD(const char *command);
> 
>+/* Return music duration in MS.
>+   if NULL is passed, return current playing music duration.
>+   return -1 on error.
>+ */
>+extern DECLSPEC int SDLCALL Mix_MusicDuration(Mix_Music *music);
>+
> /* Synchro value is set by MikMod from modules while playing */
> extern DECLSPEC int SDLCALL Mix_SetSynchroValue(int value);
> extern DECLSPEC int SDLCALL Mix_GetSynchroValue(void);
>diff -r 38ae3fb1962a -r 315cb5bef4f0 playmus.c
>--- a/playmus.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/playmus.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -251,7 +251,7 @@
>         SDL_Log("Detected music type: %s", typ);
> 
>         /* Play and then exit */
>-        SDL_Log("Playing %s\n", argv[i]);
>+        SDL_Log("Playing %s, duration %d\n", argv[i], Mix_MusicDuration(music));
>         Mix_FadeInMusic(music,looping,2000);
>         while (!next_track && (Mix_PlayingMusic() || Mix_PausedMusic())) {
>             if(interactive)
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/codecs/music_cmd.c
>--- a/src/codecs/music_cmd.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/codecs/music_cmd.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -284,7 +284,8 @@
>     MusicCMD_Stop,
>     MusicCMD_Delete,
>     NULL,   /* Close */
>-    NULL    /* Unload */
>+    NULL,   /* Unload */
>+    NULL    /* Duration */
> };
> 
> #endif /* MUSIC_CMD */
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/codecs/music_flac.c
>--- a/src/codecs/music_flac.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/codecs/music_flac.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -156,6 +156,7 @@
>     SDL_AudioStream *stream;
>     int loop;
>     FLAC__uint64 pcm_pos;
>+    FLAC__uint64 full_length;
>     SDL_bool loop_flag;
>     FLAC__uint64 loop_start;
>     FLAC__uint64 loop_end;
>@@ -561,6 +562,7 @@
>         music->loop = 1;
>     }
> 
>+    music->full_length = full_length;
>     music->freesrc = freesrc;
>     return music;
> }
>@@ -662,6 +664,13 @@
>     return 0;
> }
> 
>+static int FLAC_Duration(void *context)
>+{
>+    FLAC_Music *music = (FLAC_Music *)context;
>+
>+    return music->full_length / music->sample_rate * 1000;
>+}
>+
> /* Close the given FLAC_Music object */
> static void FLAC_Delete(void *context)
> {
>@@ -703,7 +712,8 @@
>     NULL,   /* Stop */
>     FLAC_Delete,
>     NULL,   /* Close */
>-    FLAC_Unload
>+    FLAC_Unload,
>+    FLAC_Duration
> };
> 
> #endif /* MUSIC_FLAC */
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/codecs/music_fluidsynth.c
>--- a/src/codecs/music_fluidsynth.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/codecs/music_fluidsynth.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -305,7 +305,8 @@
>     FLUIDSYNTH_Stop,
>     FLUIDSYNTH_Delete,
>     NULL,   /* Close */
>-    FLUIDSYNTH_Unload
>+    FLUIDSYNTH_Unload,
>+    NULL    /* Duration */
> };
> 
> #endif /* MUSIC_MID_FLUIDSYNTH */
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/codecs/music_mad.c
>--- a/src/codecs/music_mad.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/codecs/music_mad.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -460,7 +460,8 @@
>     NULL,   /* Stop */
>     MAD_Delete,
>     NULL,   /* Close */
>-    NULL    /* Unload */
>+    NULL,   /* Unload */
>+    NULL    /* Duration */
> };
> 
> #endif /* MUSIC_MP3_MAD */
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/codecs/music_mikmod.c
>--- a/src/codecs/music_mikmod.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/codecs/music_mikmod.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -487,7 +487,8 @@
>     MIKMOD_Stop,
>     MIKMOD_Delete,
>     MIKMOD_Close,
>-    MIKMOD_Unload
>+    MIKMOD_Unload,
>+    NULL    /* Duration */
> };
> 
> #endif /* MUSIC_MOD_MIKMOD */
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/codecs/music_modplug.c
>--- a/src/codecs/music_modplug.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/codecs/music_modplug.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -42,6 +42,7 @@
>     void (*ModPlug_GetSettings)(ModPlug_Settings* settings);
>     void (*ModPlug_SetSettings)(const ModPlug_Settings* settings);
>     void (*ModPlug_SetMasterVolume)(ModPlugFile* file,unsigned int cvol);
>+    int  (*ModPlug_GetLength)(ModPlugFile* file);
> } modplug_loader;
> 
> static modplug_loader modplug = {
>@@ -84,6 +85,7 @@
>         FUNCTION_LOADER(ModPlug_GetSettings, void (*)(ModPlug_Settings* settings))
>         FUNCTION_LOADER(ModPlug_SetSettings, void (*)(const ModPlug_Settings* settings))
>         FUNCTION_LOADER(ModPlug_SetMasterVolume, void (*)(ModPlugFile* file,unsigned int cvol))
>+        FUNCTION_LOADER(ModPlug_GetLength, int (*)(ModPlugFile* file))
>     }
>     ++modplug.loaded;
> 
>@@ -264,6 +266,12 @@
>     return 0;
> }
> 
>+static int MODPLUG_Duration(void *context)
>+{
>+    MODPLUG_Music *music = (MODPLUG_Music *)context;
>+    return modplug.ModPlug_GetLength(music->file);
>+}
>+
> /* Close the given modplug stream */
> static void MODPLUG_Delete(void *context)
> {
>@@ -302,7 +310,8 @@
>     NULL,   /* Stop */
>     MODPLUG_Delete,
>     NULL,   /* Close */
>-    MODPLUG_Unload
>+    MODPLUG_Unload,
>+    MODPLUG_Duration
> };
> 
> #endif /* MUSIC_MOD_MODPLUG */
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/codecs/music_mpg123.c
>--- a/src/codecs/music_mpg123.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/codecs/music_mpg123.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -52,6 +52,10 @@
>     int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done );
>     int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) );
>     off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence );
>+    int (*mpg123_framelength)(mpg123_handle *mh);
>+    int (*mpg123_position)(mpg123_handle *mh, off_t frame_offset, off_t buffered_bytes,  off_t *current_frame, off_t *frames_left, double *current_seconds, double *seconds_left);
>+    int (*mpg123_scan)(mpg123_handle *mh);
>+    int (*mpg123_info)(mpg123_handle *mh, struct mpg123_frameinfo *mi);
>     const char* (*mpg123_strerror)(mpg123_handle *mh);
> } mpg123_loader;
> 
>@@ -99,8 +103,18 @@
>         FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ))
>         FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ))
>         FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence ))
>+        FUNCTION_LOADER(mpg123_position, int (*)(mpg123_handle *mh, off_t frame_offset, off_t buffered_bytes,  off_t *current_frame, off_t *frames_left, double *current_seconds, double *seconds_left ))
>+        FUNCTION_LOADER(mpg123_scan, int (*)(mpg123_handle *mh))
>+        FUNCTION_LOADER(mpg123_info, int (*)(mpg123_handle *mh, struct mpg123_frameinfo *mi))
>         FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh))
>     }
>+#ifdef MPG123_DYNAMIC
>+    mpg123.mpg123_framelength = (int (*)(mpg123_handle *)) SDL_LoadFunction(mpg123.handle, "mpg123_framelength");
>+#elif (MPG123_API_VERSION < 42)
>+    mpg123.mpg123_framelength = NULL;
>+#else
>+    mpg123.mpg123_framelength = mpg123_framelength;
>+#endif
>     ++mpg123.loaded;
> 
>     return 0;
>@@ -283,6 +297,11 @@
>         return NULL;
>     }
> 
>+    /* this is here so that mpg123_position() behaves... */
>+    if (!mpg123.mpg123_framelength) {
>+        mpg123.mpg123_scan(music->handle);
>+    }
>+
>     music->freesrc = freesrc;
>     return music;
> }
>@@ -385,6 +404,47 @@
>     return 0;
> }
> 
>+static int old_mpg123_duration(MPG123_Music *music)
>+{
>+    off_t buffered_bytes = 0;
>+    off_t current_frame;
>+    off_t frames_left;
>+    double current_seconds;
>+    double seconds_left;
>+
>+    mpg123.mpg123_position(music->handle, 0, buffered_bytes, &current_frame,
>+                           &frames_left, &current_seconds, &seconds_left);
>+    return seconds_left * 1000;
>+}
>+
>+static int new_mpg123_duration(MPG123_Music *music)
>+{
>+    struct mpg123_frameinfo fi;
>+    int tot_frm = mpg123.mpg123_framelength(music->handle);
>+    int r;
>+
>+    if (tot_frm < 0) {
>+        return Mix_SetError("mpg123_framelength: %s",
>+                            mpg_err(music->handle, (int)-tot_frm));
>+    }
>+    if ((r = mpg123.mpg123_info(music->handle, &fi)) < 0) {
>+        return Mix_SetError("mpg123_info: %s",
>+                            mpg_err(music->handle, (int)-r));
>+
>+    }
>+    return tot_frm * (fi.framesize  * 8) / fi.bitrate;
>+}
>+
>+static int MPG123_Duration(void *context)
>+{
>+    MPG123_Music *music = (MPG123_Music *)context;
>+
>+    if (mpg123.mpg123_framelength)
>+        return new_mpg123_duration(music);
>+
>+    return old_mpg123_duration(music);
>+}
>+
> static void MPG123_Delete(void *context)
> {
>     MPG123_Music *music = (MPG123_Music *)context;
>@@ -432,7 +492,8 @@
>     NULL,   /* Stop */
>     MPG123_Delete,
>     MPG123_Close,
>-    MPG123_Unload
>+    MPG123_Unload,
>+    MPG123_Duration
> };
> 
> #endif /* MUSIC_MP3_MPG123 */
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/codecs/music_nativemidi.c
>--- a/src/codecs/music_nativemidi.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/codecs/music_nativemidi.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -105,7 +105,8 @@
>     NATIVEMIDI_Stop,
>     NATIVEMIDI_Delete,
>     NULL,   /* Close */
>-    NULL    /* Unload */
>+    NULL,   /* Unload */
>+    NULL    /* Duration */
> };
> 
> #endif /* MUSIC_MID_NATIVE */
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/codecs/music_ogg.c
>--- a/src/codecs/music_ogg.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/codecs/music_ogg.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -57,6 +57,8 @@
> #endif
>     int (*ov_pcm_seek)(OggVorbis_File *vf, ogg_int64_t pos);
>     ogg_int64_t (*ov_pcm_tell)(OggVorbis_File *vf);
>+    long (*ov_bitrate)(OggVorbis_File *vf, int i);
>+    ogg_int64_t (*ov_raw_total)(OggVorbis_File *vf,int i);
> } vorbis_loader;
> 
> static vorbis_loader vorbis = {
>@@ -103,6 +105,9 @@
> #endif
>         FUNCTION_LOADER(ov_pcm_seek, int (*)(OggVorbis_File *,ogg_int64_t))
>         FUNCTION_LOADER(ov_pcm_tell, ogg_int64_t (*)(OggVorbis_File *))
>+        FUNCTION_LOADER(ov_bitrate, long (*)(OggVorbis_File *, int))
>+        FUNCTION_LOADER(ov_raw_total, ogg_int64_t (*)(OggVorbis_File *, int))
>+
>     }
>     ++vorbis.loaded;
> 
>@@ -459,6 +464,21 @@
>     return 0;
> }
> 
>+static int OGG_Duration(void *context)
>+{
>+    OGG_music *music = (OGG_music *)context;
>+    long bitrate = vorbis.ov_bitrate(&music->vf, -1);
>+    ogg_int64_t tot_byte = vorbis.ov_raw_total(&music->vf, -1);
>+
>+    if (bitrate < 0) {
>+        return set_ov_error("ov_biterate", bitrate);
>+    }
>+    if (tot_byte < 0) {
>+        return set_ov_error("ov_raw_total", tot_byte);
>+    }
>+    return tot_byte * 8 / bitrate * 1000;
>+}
>+
> /* Close the given OGG stream */
> static void OGG_Delete(void *context)
> {
>@@ -498,7 +518,8 @@
>     NULL,   /* Stop */
>     OGG_Delete,
>     NULL,   /* Close */
>-    OGG_Unload
>+    OGG_Unload,
>+    OGG_Duration
> };
> 
> #endif /* MUSIC_OGG */
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/codecs/music_opus.c
>--- a/src/codecs/music_opus.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/codecs/music_opus.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -120,6 +120,7 @@
>     ogg_int64_t loop_start;
>     ogg_int64_t loop_end;
>     ogg_int64_t loop_len;
>+    ogg_int64_t full_length;
> } OPUS_music;
> 
> 
>@@ -339,6 +340,7 @@
>         music->loop = 1;
>     }
> 
>+    music->full_length = full_length;
>     music->freesrc = freesrc;
>     return music;
> }
>@@ -449,6 +451,13 @@
>     return 0;
> }
> 
>+static int OPUS_Duration(void *context)
>+{
>+    OPUS_music *music = (OPUS_music *)context;
>+
>+    return music->full_length / 48;
>+}
>+
> /* Close the given Opus stream */
> static void OPUS_Delete(void *context)
> {
>@@ -488,7 +497,8 @@
>     NULL,   /* Stop */
>     OPUS_Delete,
>     NULL,   /* Close */
>-    OPUS_Unload
>+    OPUS_Unload,
>+    OPUS_Duration
> };
> 
> #endif /* MUSIC_OPUS */
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/codecs/music_timidity.c
>--- a/src/codecs/music_timidity.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/codecs/music_timidity.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -175,6 +175,12 @@
>     return 0;
> }
> 
>+static int TIMIDITY_Duration(void *context)
>+{
>+    TIMIDITY_Music *music = (TIMIDITY_Music *)context;
>+    return Timidity_GetSongLength(music->song);
>+}
>+
> static void TIMIDITY_Delete(void *context)
> {
>     TIMIDITY_Music *music = (TIMIDITY_Music *)context;
>@@ -213,7 +219,8 @@
>     NULL,   /* Stop */
>     TIMIDITY_Delete,
>     TIMIDITY_Close,
>-    NULL    /* Unload */
>+    NULL,   /* Unload */
>+    TIMIDITY_Duration
> };
> 
> #endif /* MUSIC_MID_TIMIDITY */
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/codecs/music_wav.c
>--- a/src/codecs/music_wav.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/codecs/music_wav.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -579,6 +579,14 @@
>     return 0;
> }
> 
>+static int WAW_Duration(void *context)
>+{
>+    WAV_Music *music = (WAV_Music *)context;
>+    Sint64 sample_size = music->spec.freq * music->samplesize;
>+
>+    return (music->stop - music->start) / sample_size * 1000;
>+}
>+
> /* Close the given WAV stream */
> static void WAV_Delete(void *context)
> {
>@@ -1093,7 +1101,8 @@
>     NULL,   /* Stop */
>     WAV_Delete,
>     NULL,   /* Close */
>-    NULL    /* Unload */
>+    NULL,    /* Unload */
>+    WAW_Duration
> };
> 
> #endif /* MUSIC_WAV */
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/music.c
>--- a/src/music.c	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/music.c	Thu Dec 12 19:13:59 2019 +0100
>@@ -792,6 +792,35 @@
>     return(retval);
> }
> 
>+static int music_duration_int(Mix_Music *music)
>+{
>+    if (music->interface->duration) {
>+        return music->interface->duration(music->context);
>+    } else {
>+        Mix_SetError("Duration not implemented for music type");
>+        return -1;
>+    }
>+}
>+
>+int Mix_MusicDuration(Mix_Music *music)
>+{
>+    int retval;
>+
>+    Mix_LockAudio();
>+
>+    if (music) {
>+        retval = music_duration_int(music);
>+    } else if (music_playing) {
>+        retval = music_duration_int(music_playing);
>+    } else {
>+        Mix_SetError("music is NULL and no playing music");
>+        retval = -1;
>+    }
>+    Mix_UnlockAudio();
>+
>+    return(retval);
>+}
>+
> /* Set the music's initial volume */
> static void music_internal_initialize_volume(void)
> {
>diff -r 38ae3fb1962a -r 315cb5bef4f0 src/music.h
>--- a/src/music.h	Wed Dec 11 22:20:02 2019 +0300
>+++ b/src/music.h	Thu Dec 12 19:13:59 2019 +0100
>@@ -100,6 +100,8 @@
>     /* Unload the library */
>     void (*Unload)(void);
> 
>+    /* Get Music duration in ms */
>+    int (*duration)(void *music);
> } Mix_MusicInterface;
> 
>

Actions: View | Diff

Attachments on bug 4715: 3875 | 3903 | 3904 | 3905 | 3907 | 4072 | 4097 | 4098 | 4099 | 4101 | 4102 | 4103 | 4104 | 4106 | 4107 | 4108 | 4109

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.