diff options
Diffstat (limited to 'lib/libshout-idjc/src/codec_speex.c')
-rw-r--r-- | lib/libshout-idjc/src/codec_speex.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/lib/libshout-idjc/src/codec_speex.c b/lib/libshout-idjc/src/codec_speex.c index 65e9a20830..1af5eb2ced 100644 --- a/lib/libshout-idjc/src/codec_speex.c +++ b/lib/libshout-idjc/src/codec_speex.c @@ -19,7 +19,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +# include <config.h> #endif #include <speex/speex.h> @@ -30,61 +30,61 @@ /* -- local data structures -- */ typedef struct { - SpeexHeader *sh; + SpeexHeader *sh; } speex_data_t; /* -- local prototypes -- */ -static int read_speex_page(ogg_codec_t *codec, ogg_page *page); +static int read_speex_page(ogg_codec_t *codec, ogg_page *page); static void free_speex_data(void *codec_data); /* -- speex functions -- */ int _shout_open_speex(ogg_codec_t *codec, ogg_page *page) { - speex_data_t *speex_data = calloc(1, sizeof(speex_data_t)); - ogg_packet packet; + speex_data_t *speex_data = calloc(1, sizeof(speex_data_t)); + ogg_packet packet; - (void)page; + (void) page; if (!speex_data) - return SHOUTERR_MALLOC; + return SHOUTERR_MALLOC; - ogg_stream_packetout(&codec->os, &packet); + ogg_stream_packetout(&codec->os, &packet); - if (!(speex_data->sh = speex_packet_to_header((char*)packet.packet,packet.bytes))) { - free_speex_data(speex_data); - - return SHOUTERR_UNSUPPORTED; - } + if ( !(speex_data->sh = speex_packet_to_header((char*)packet.packet, packet.bytes)) ) { + free_speex_data(speex_data); + return SHOUTERR_UNSUPPORTED; + } - codec->codec_data = speex_data; - codec->read_page = read_speex_page; - codec->free_data = free_speex_data; + codec->codec_data = speex_data; + codec->read_page = read_speex_page; + codec->free_data = free_speex_data; - return SHOUTERR_SUCCESS; + return SHOUTERR_SUCCESS; } static int read_speex_page(ogg_codec_t *codec, ogg_page *page) { - ogg_packet packet; - speex_data_t *speex_data = codec->codec_data; - uint64_t samples = 0; - - (void)page; + ogg_packet packet; + speex_data_t *speex_data = codec->codec_data; + uint64_t samples = 0; - while (ogg_stream_packetout (&codec->os, &packet) > 0) - samples += speex_data->sh->frames_per_packet * speex_data->sh->frame_size; + (void) page; - codec->senttime += ((samples * 1000000) / speex_data->sh->rate); + while (ogg_stream_packetout(&codec->os, &packet) > 0) { + samples += speex_data->sh->frames_per_packet * speex_data->sh->frame_size; + } - return SHOUTERR_SUCCESS; + codec->senttime += ((samples * 1000000) / speex_data->sh->rate); + + return SHOUTERR_SUCCESS; } static void free_speex_data(void *codec_data) { - speex_data_t *speex_data = (speex_data_t *)codec_data; + speex_data_t *speex_data = (speex_data_t*)codec_data; if (speex_data->sh) - free(speex_data->sh); + free(speex_data->sh); - free(speex_data); + free(speex_data); } |