fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-24 04:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

snd_mpg123.c: use mp3_skiptags(). tidy-up a little.

Browse source 
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1661 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2019-12-12 14:10:14 +00:00
parent a0bc61954d
commit caa4f0333a
1 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
quakespasm/Quake/snd_mpg123.c
View file

@ -1,8 +1,5 @@
/* /* MP3 decoding support using libmpg123
* MP3 decoding support using libmpg123, loosely based on an SDL_mixer * Copyright (C) 2011-2019 O.Sezer <sezero@users.sourceforge.net>
* See: http://bubu.lv/changeset/4/public/libs/SDL/generated/SDL_mixer
*
* Copyright (C) 2011-2012 O.Sezer <sezero@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -33,28 +30,23 @@
#if !defined(MPG123_API_VERSION) || (MPG123_API_VERSION < 24) #if !defined(MPG123_API_VERSION) || (MPG123_API_VERSION < 24)
#error minimum required libmpg123 version is 1.12.0 (api version 24) #error minimum required libmpg123 version is 1.12.0 (api version 24)
#endif /* MPG123_API_VERSION */ #endif
/* Private data */ /* Private data */
typedef struct _mp3_priv_t typedef struct _mp3_priv_t
{ {
int handle_newed, handle_opened;
mpg123_handle* handle; mpg123_handle* handle;
int handle_open;
} mp3_priv_t; } mp3_priv_t;
/* CALLBACK FUNCTIONS: */ /* CALLBACKS: libmpg123 expects POSIX read/lseek() behavior! */
/* CAREFUL: libmpg123 expects POSIX read() and lseek() behavior,
* however our FS_fread() and FS_fseek() return fread() and fseek()
* compatible values. */
static ssize_t mp3_read (void *f, void *buf, size_t size) static ssize_t mp3_read (void *f, void *buf, size_t size)
{ {
ssize_t ret = (ssize_t) FS_fread(buf, 1, size, (fshandle_t *)f); ssize_t ret = (ssize_t) FS_fread(buf, 1, size, (fshandle_t *)f);
if (ret == 0 && errno != 0) if (ret == 0 && errno != 0)
ret = -1; return -1;
return ret; return ret;
} }
static off_t mp3_seek (void *f, off_t offset, int whence) static off_t mp3_seek (void *f, off_t offset, int whence)
{ {
if (f == NULL) return (-1); if (f == NULL) return (-1);
@ -73,9 +65,7 @@ static qboolean S_MP3_CodecInitialize (void)
return false; return false;
} }
mp3_codec.initialized = true; mp3_codec.initialized = true;
return true;
} }
return true; return true;
} }
@ -94,6 +84,12 @@ static qboolean S_MP3_CodecOpenStream (snd_stream_t *stream)
int encoding = 0, channels = 0; int encoding = 0, channels = 0;
mp3_priv_t *priv = NULL; mp3_priv_t *priv = NULL;
if (mp3_skiptags(stream) < 0)
{
Con_Printf("Corrupt mp3 file (bad tags.)\n");
return false;
}
stream->priv = Z_Malloc(sizeof(mp3_priv_t)); stream->priv = Z_Malloc(sizeof(mp3_priv_t));
priv = (mp3_priv_t *) stream->priv; priv = (mp3_priv_t *) stream->priv;
priv->handle = mpg123_new(NULL, NULL); priv->handle = mpg123_new(NULL, NULL);
@ -102,7 +98,6 @@ static qboolean S_MP3_CodecOpenStream (snd_stream_t *stream)
Con_Printf("Unable to allocate mpg123 handle\n"); Con_Printf("Unable to allocate mpg123 handle\n");
goto _fail; goto _fail;
} }
priv->handle_newed = 1;
if (mpg123_replace_reader_handle(priv->handle, mp3_read, mp3_seek, NULL) != MPG123_OK || if (mpg123_replace_reader_handle(priv->handle, mp3_read, mp3_seek, NULL) != MPG123_OK ||
mpg123_open_handle(priv->handle, &stream->fh) != MPG123_OK) mpg123_open_handle(priv->handle, &stream->fh) != MPG123_OK)
@ -110,7 +105,7 @@ static qboolean S_MP3_CodecOpenStream (snd_stream_t *stream)
Con_Printf("Unable to open mpg123 handle\n"); Con_Printf("Unable to open mpg123 handle\n");
goto _fail; goto _fail;
} }
priv->handle_opened = 1; priv->handle_open = 1;
if (mpg123_getformat(priv->handle, &rate, &channels, &encoding) != MPG123_OK) if (mpg123_getformat(priv->handle, &rate, &channels, &encoding) != MPG123_OK)
{ {
@ -118,8 +113,7 @@ static qboolean S_MP3_CodecOpenStream (snd_stream_t *stream)
goto _fail; goto _fail;
} }
switch (channels) switch (channels) {
{
case MPG123_MONO: case MPG123_MONO:
stream->info.channels = 1; stream->info.channels = 1;
break; break;
@ -133,8 +127,7 @@ static qboolean S_MP3_CodecOpenStream (snd_stream_t *stream)
stream->info.rate = rate; stream->info.rate = rate;
switch (encoding) switch (encoding) {
{
case MPG123_ENC_UNSIGNED_8: case MPG123_ENC_UNSIGNED_8:
stream->info.bits = 8; stream->info.bits = 8;
stream->info.width = 1; stream->info.width = 1;
@ -169,10 +162,12 @@ static qboolean S_MP3_CodecOpenStream (snd_stream_t *stream)
_fail: _fail:
if (priv) if (priv)
{ {
if (priv->handle_opened) if (priv->handle)
{
if (priv->handle_open)
mpg123_close(priv->handle); mpg123_close(priv->handle);
if (priv->handle_newed)
mpg123_delete(priv->handle); mpg123_delete(priv->handle);
}
Z_Free(stream->priv); Z_Free(stream->priv);
} }
return false; return false;
@ -183,8 +178,7 @@ static int S_MP3_CodecReadStream (snd_stream_t *stream, int bytes, void *buffer)
mp3_priv_t *priv = (mp3_priv_t *) stream->priv; mp3_priv_t *priv = (mp3_priv_t *) stream->priv;
size_t bytes_read = 0; size_t bytes_read = 0;
int res = mpg123_read (priv->handle, (unsigned char *)buffer, (size_t)bytes, &bytes_read); int res = mpg123_read (priv->handle, (unsigned char *)buffer, (size_t)bytes, &bytes_read);
switch (res) switch (res) {
{
case MPG123_DONE: case MPG123_DONE:
Con_DPrintf("mp3 EOF\n"); Con_DPrintf("mp3 EOF\n");
case MPG123_OK: case MPG123_OK: