afs.c: Avoid noisy log message.

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index 94383c4564156cb7f608c9eaa9a7b6b5e8846614..71ee7e309c48f86fd3a1c1cb1f09840a1ff66d1b 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2004-2007 Andre Noll <maan@systemlinux.org>
  *
- *     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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 /** \file ogg_afh.c para_server's ogg vorbis audio format handler */
 
@@ -22,6 +10,8 @@
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
 
+#include "para.h"
+#include "afh.h"
 #include "server.h"
 #include "error.h"
 #include "string.h"
@@ -143,8 +133,11 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
        memcpy(buf, map, len);
        ogg_sync_wrote(sync_in, (long)len);
        ret = -E_SYNC_PAGEOUT;
-       if (ogg_sync_pageout(sync_in, &page) <= 0)
+       if (ogg_sync_pageout(sync_in, &page) <= 0) {
+               free(stream_in);
+               free(stream_out);
                goto err1;
+       }
        serial = ogg_page_serialno(&page);
        ogg_stream_init(stream_in, serial);
        ogg_stream_init(stream_out, serial);
@@ -161,7 +154,7 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
        ret = -E_VORBIS;
        if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0)
                goto err2;
-       PARA_INFO_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);
+       PARA_DEBUG_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);
        ogg_stream_packetin(stream_out, &packet);
 
        ret = ogg_sync_pageout(sync_in, &page);
@@ -185,7 +178,7 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
        afi->header_len = 0;
        while (ogg_stream_flush(stream_out, &page))
                afi->header_len += page.body_len + page.header_len;
-       PARA_INFO_LOG("header_len = %d\n", afi->header_len);
+       PARA_DEBUG_LOG("header_len = %d\n", afi->header_len);
        afi->header_offset = 0;
        ret = 1;
 err2:
@@ -236,7 +229,7 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
        }
        num_chunks = i - 1;
 //fi->chunk_table[i] = pos;
-       PARA_INFO_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
+       PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
                num_chunks, chunk_time, max_chunk_len, min);
        return num_chunks;
 }
@@ -270,7 +263,7 @@ static int ogg_get_file_info(char *map, size_t numbytes,
                goto err;
        afi->seconds_total = ov_time_total(&of, -1);
        afi->frequency = vi->rate;
-       afi->bitrate = ov_bitrate(&of, 0);
+       afi->bitrate = ov_bitrate(&of, 0) / 1000;
        afi->channels = vi->channels;
        afi->chunks_total = ogg_compute_chunk_table(&of, afi, afi->seconds_total);
        sprintf(afi->info_string, "audio_file_info1:%lu x %lu, %ukHz, "
@@ -278,7 +271,7 @@ static int ogg_get_file_info(char *map, size_t numbytes,
                "audio_file_info2: \n"
                "audio_file_info3: \n",
                afi->chunks_total, (long unsigned) (chunk_time * 1000 * 1000),
-               afi->frequency / 1000, vi->channels, afi->bitrate / 1000
+               afi->frequency / 1000, vi->channels, afi->bitrate
                );
        afi->chunk_tv.tv_sec = 0;
        afi->chunk_tv.tv_usec = 250 * 1000;