ogg_afh.c: Kill unused vi_bitrate_nominal

[paraslash.git] / mp3_afh.c

diff --git a/mp3_afh.c b/mp3_afh.c
index 6850cbd83b8f8bee770aafb43a4ee984af5d7956..83678389a8c21f211f2f55dea9157eb89412e1ca 100644 (file)
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -46,7 +46,6 @@
 
 #define FRAME_HEADER_SIZE 4
 #define MIN_FRAME_SIZE 21
-#define DEFAULT_INBUF_SIZE 8192
 
 struct mp3header {
        unsigned long sync;
@@ -107,8 +106,6 @@ static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mon
 
 static FILE *infile;
 static struct mp3info mp3;
-static char *inbuf;
-static size_t inbuf_size;
 static struct audio_format_handler *af;
 static ssize_t *chunk_table, num_chunks;
 
@@ -252,7 +249,7 @@ static int get_header(FILE *file, struct mp3header *header)
  */
 static int mp3_seek_next_header(void)
 {
-       int k, l = 0, c, first_len;
+       int k, l = 0, c, first_len, ret;
        struct mp3header h, h2;
        long valid_start = 0;
 
@@ -266,17 +263,22 @@ static int mp3_seek_next_header(void)
                first_len = get_header(infile, &h);
                if (first_len <= 0)
                        continue;
-               if (fseek(infile, first_len - FRAME_HEADER_SIZE, SEEK_CUR) < 0)
-                       return -E_FSEEK;
+               ret = para_fseek(infile, first_len - FRAME_HEADER_SIZE, SEEK_CUR);
+               if (ret < 0)
+                       return ret;
                for (k = 1; k < MIN_CONSEC_GOOD_FRAMES; k++) {
                        if ((l = get_header(infile, &h2)) <= 0)
                                break;
                        if (!compare_headers(&h, &h2))
                                break;
-                       fseek(infile, l - FRAME_HEADER_SIZE, SEEK_CUR);
+                       ret = para_fseek(infile, l - FRAME_HEADER_SIZE, SEEK_CUR);
+                       if (ret < 0)
+                               return ret;
                }
                if (k == MIN_CONSEC_GOOD_FRAMES) {
-                       fseek(infile, valid_start, SEEK_SET);
+                       ret = para_fseek(infile, valid_start, SEEK_SET);
+                       if (ret < 0)
+                               return ret;
                        memcpy(&(mp3.header), &h2, sizeof(struct mp3header));
                        return first_len;
                }
@@ -286,6 +288,7 @@ static int mp3_seek_next_header(void)
 static int mp3_get_id3(void)
 {
        char fbuf[4];
+       int ret;
 
        mp3.id3_isvalid = 0;
        mp3.id3.title[0] = '\0';
@@ -293,8 +296,9 @@ static int mp3_get_id3(void)
        mp3.id3.album[0] = '\0';
        mp3.id3.comment[0] = '\0';
        mp3.id3.year[0] = '\0';
-       if (fseek(infile, -128, SEEK_END))
-               return -E_FSEEK;
+       ret = para_fseek(infile, -128, SEEK_END);
+       if (ret < 0 )
+               return ret;
        if (para_fread(fbuf, 1, 3, infile) < 0)
                return -E_FREAD;
        fbuf[3] = '\0';
@@ -302,8 +306,9 @@ static int mp3_get_id3(void)
                PARA_INFO_LOG("%s", "no id3 tag\n");
                return 0;
        }
-       if (fseek(infile, -125, SEEK_END) < 0)
-               return -E_FSEEK;
+       ret = para_fseek(infile, -125, SEEK_END);
+       if (ret < 0)
+               return ret;
        if (para_fread(mp3.id3.title, 1, 30, infile) != 30)
                return -E_FREAD;
        mp3.id3.title[30] = '\0';
@@ -330,7 +335,7 @@ static int mp3_get_id3(void)
 
 static int find_valid_start(void)
 {
-       int frame_len;
+       int ret, frame_len;
 
        if (!infile)
                return -E_MP3_NO_FILE;
@@ -341,9 +346,11 @@ static int find_valid_start(void)
                frame_len = mp3_seek_next_header();
                if (frame_len <= 0)
                        return frame_len;
-       } else
-               if (fseek(infile, -FRAME_HEADER_SIZE, SEEK_CUR) < 0)
-                       return -E_FSEEK;
+       } else {
+               ret = para_fseek(infile, -FRAME_HEADER_SIZE, SEEK_CUR);
+               if (ret < 0)
+                       return ret;
+       }
        if (frame_len <= 1)
                return -E_FRAME_LENGTH;
        return frame_len;
@@ -357,8 +364,6 @@ static int mp3_read_info(void)
        unsigned chunk_table_size = 1000; /* gets increased on demand */
 
        num_chunks = 0;
-       inbuf = para_malloc(DEFAULT_INBUF_SIZE);
-       inbuf_size = DEFAULT_INBUF_SIZE;
        chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
        ret = mp3_get_id3();
        if (ret < 0)
@@ -370,8 +375,8 @@ static int mp3_read_info(void)
                int freq, br, fl;
                struct timeval tmp, cct; /* current chunk time */
                if (len > 0) {
-                       ret = -E_FSEEK;
-                       if (fseek(infile, len, SEEK_CUR) < 0)
+                       ret = para_fseek(infile, len, SEEK_CUR);
+                       if (ret < 0)
                                goto err_out;
                }
                len = find_valid_start();
@@ -417,8 +422,8 @@ static int mp3_read_info(void)
        ret = -E_MP3_INFO;
        if (!num_chunks || !freq_avg || !br_avg)
                goto err_out;
-       ret = -E_FSEEK;
-       if (fseek(infile, 0, SEEK_END) < 0)
+       ret= para_fseek(infile, 0, SEEK_END);
+       if (ret < 0)
                goto err_out;
        chunk_table[num_chunks] = ftell(infile);
        mp3.br_average = br_avg;
@@ -433,7 +438,6 @@ static int mp3_read_info(void)
 err_out:
        PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
        free(chunk_table);
-       free(inbuf);
        return ret;
 }
 
@@ -441,7 +445,7 @@ err_out:
  * Read mp3 information from audio file
  */
 static int mp3_get_file_info(FILE *audio_file, char *info_str,
-       long unsigned *frames, int *seconds)
+       long unsigned *frames, int *seconds, size_t **vss_chunk_table)
 {
        int ret;
 
@@ -456,42 +460,12 @@ static int mp3_get_file_info(FILE *audio_file, char *info_str,
        write_info_str(info_str);
        *frames = num_chunks;
        *seconds = mp3.seconds;
+       *vss_chunk_table = chunk_table;
        if (*seconds < 2 || !*frames)
                return -E_MP3_INFO;
        return 1;
 }
 
-static char *mp3_read_chunk(long unsigned current_chunk, ssize_t *len)
-{
-       int ret;
-       size_t pos;
-
-       *len = 0;
-       if (current_chunk >= num_chunks)
-               return NULL;
-       *len = chunk_table[current_chunk + 1] - chunk_table[current_chunk];
-       if (!*len) /* nothing to send for this run */
-               return inbuf;
-       pos = chunk_table[current_chunk];
-       if (inbuf_size < *len) {
-               PARA_INFO_LOG("increasing inbuf for chunk #%lu/%zu to %zd bytes\n",
-                       current_chunk, num_chunks, *len);
-               inbuf = para_realloc(inbuf, *len);
-               inbuf_size = *len;
-       }
-//     PARA_DEBUG_LOG("reading chunk #%lu@%zd (%zd bytes)\n", current_chunk,
-//             pos, *len);
-       ret = fseek(infile, pos, SEEK_SET);
-       if (ret < 0)
-               return NULL;
-       ret = para_fread(inbuf, *len, 1, infile);
-       if (ret != *len)
-               return NULL;
-//     PARA_DEBUG_LOG("ret: %d, inbuf[0]: %lx - %lx\n", ret, (long unsigned) inbuf[0],
-//             (long unsigned) inbuf[4]);
-       return (char *)inbuf;
-}
-
 static void mp3_close_audio_file(void)
 {
        if (!infile)
@@ -499,7 +473,6 @@ static void mp3_close_audio_file(void)
        fclose(infile);
        infile = NULL;
        free(chunk_table);
-       free(inbuf);
 }
 
 static const char* mp3_suffixes[] = {"mp3", NULL};
@@ -513,7 +486,6 @@ void mp3_init(struct audio_format_handler *p)
 {
        af = p;
        af->get_file_info = mp3_get_file_info;
-       af->read_chunk = mp3_read_chunk;
        af->close_audio_file = mp3_close_audio_file;
        af->get_header_info = NULL;
        /* eof_tv gets overwritten in mp3_get_file_info() */