From 109adf8368c4fca7af4e1bfc1ff9e8648ed1c73f Mon Sep 17 00:00:00 2001 From: Philipp Schafft Date: Tue, 15 Mar 2022 22:12:18 +0000 Subject: [PATCH] Cleanup: Codestyle --- src/format_flac.c | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/src/format_flac.c b/src/format_flac.c index d804463d..a4401dd3 100644 --- a/src/format_flac.c +++ b/src/format_flac.c @@ -34,9 +34,9 @@ static void flac_codec_free (ogg_state_t *ogg_info, ogg_codec_t *codec) { ICECAST_LOG_DEBUG("freeing FLAC codec"); - stats_event (ogg_info->mount, "FLAC_version", NULL); - ogg_stream_clear (&codec->os); - free (codec); + stats_event(ogg_info->mount, "FLAC_version", NULL); + ogg_stream_clear(&codec->os); + free(codec); } @@ -45,36 +45,40 @@ static refbuf_t *process_flac_page (ogg_state_t *ogg_info, ogg_codec_t *codec, o { refbuf_t * refbuf; - if (codec->headers) - { + if (codec->headers) { ogg_packet packet; - if (ogg_stream_pagein (&codec->os, page) < 0) - { + + if (ogg_stream_pagein(&codec->os, page) < 0) { ogg_info->error = 1; return NULL; } - while (ogg_stream_packetout (&codec->os, &packet)) - { + + while (ogg_stream_packetout(&codec->os, &packet)) { int type = packet.packet[0]; - if (type == 0xFF) - { + + if (type == 0xFF) { codec->headers = 0; break; } + if (type >= 1 && type <= 0x7E) continue; if (type >= 0x81 && type <= 0xFE) continue; + ogg_info->error = 1; + return NULL; } - if (codec->headers) - { - format_ogg_attach_header (ogg_info, page); + + if (codec->headers) { + format_ogg_attach_header(ogg_info, page); return NULL; } } - refbuf = make_refbuf_with_page (page); + + refbuf = make_refbuf_with_page(page); + return refbuf; } @@ -84,13 +88,13 @@ static refbuf_t *process_flac_page (ogg_state_t *ogg_info, ogg_codec_t *codec, o ogg_codec_t *initial_flac_page (format_plugin_t *plugin, ogg_page *page) { ogg_state_t *ogg_info = plugin->_state; - ogg_codec_t *codec = calloc (1, sizeof (ogg_codec_t)); + ogg_codec_t *codec = calloc(1, sizeof(ogg_codec_t)); ogg_packet packet; - ogg_stream_init (&codec->os, ogg_page_serialno (page)); - ogg_stream_pagein (&codec->os, page); + ogg_stream_init(&codec->os, ogg_page_serialno(page)); + ogg_stream_pagein(&codec->os, page); - ogg_stream_packetout (&codec->os, &packet); + ogg_stream_packetout(&codec->os, &packet); ICECAST_LOG_DEBUG("checking for FLAC codec"); do @@ -108,7 +112,7 @@ ogg_codec_t *initial_flac_page (format_plugin_t *plugin, ogg_page *page) ICECAST_LOG_INFO("seen initial FLAC header"); parse += 4; - stats_event_args (ogg_info->mount, "FLAC_version", "%d.%d", parse[0], parse[1]); + stats_event_args(ogg_info->mount, "FLAC_version", "%d.%d", parse[0], parse[1]); codec->process_page = process_flac_page; codec->codec_free = flac_codec_free; codec->headers = 1;