Kill more duplicate status items.

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index d0d437e90a31bade448b3a31165bf82dfe15d2ea..e495bf1484c7b832ffba01a36f8e3718092f2153 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -11,10 +11,11 @@
 /** \file aac_afh.c para_server's aac audio format handler */
 
 #include "para.h"
-#include "afh.h"
-#include "server.h"
 #include "error.h"
 #include "string.h"
+#include "afh.h"
+#include "afs.h"
+#include "server.h"
 #include "aac.h"
 
 static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
@@ -41,7 +42,7 @@ static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
        return -E_STSZ;
 }
 
-static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
+static ssize_t aac_compute_chunk_table(struct afh_info *afhi,
                unsigned char *map, size_t numbytes)
 {
        int ret, i;
@@ -51,37 +52,37 @@ static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
        ret = aac_find_stsz(map, numbytes, &skip);
        if (ret < 0)
                return ret;
-       afi->chunks_total = ret;
-       PARA_DEBUG_LOG("sz table has %lu entries\n", afi->chunks_total);
-       afi->chunk_table = para_malloc((afi->chunks_total + 1) * sizeof(size_t));
-       for (i = 1; i <= afi->chunks_total; i++) {
+       afhi->chunks_total = ret;
+       PARA_DEBUG_LOG("sz table has %lu entries\n", afhi->chunks_total);
+       afhi->chunk_table = para_malloc((afhi->chunks_total + 1) * sizeof(size_t));
+       for (i = 1; i <= afhi->chunks_total; i++) {
                if (skip + 4 > numbytes)
                        break;
                sum += aac_read_int32(map + skip);
-               afi->chunk_table[i] = sum;
+               afhi->chunk_table[i] = sum;
                skip += 4;
-//             if (i < 10 || i + 10 > afi->chunks_total)
-//                     PARA_DEBUG_LOG("offset #%d: %zu\n", i, afi->chunk_table[i]);
+//             if (i < 10 || i + 10 > afhi->chunks_total)
+//                     PARA_DEBUG_LOG("offset #%d: %zu\n", i, afhi->chunk_table[i]);
        }
        return skip;
 }
 
-static int aac_set_chunk_tv(struct audio_format_info *afi,
+static int aac_set_chunk_tv(struct afh_info *afhi,
                mp4AudioSpecificConfig *mp4ASC, long unsigned *seconds)
 {
        float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023;
        struct timeval total;
-       long unsigned ms = 1000.0 * afi->chunks_total * tmp
+       long unsigned ms = 1000.0 * afhi->chunks_total * tmp
                / mp4ASC->samplingFrequency;
 
        if (!mp4ASC->samplingFrequency)
                return -E_MP4ASC;
-       ms = 1000.0 * afi->chunks_total * tmp / mp4ASC->samplingFrequency;
+       ms = 1000.0 * afhi->chunks_total * tmp / mp4ASC->samplingFrequency;
        ms2tv(ms, &total);
-       tv_divide(afi->chunks_total, &total, &afi->chunk_tv);
+       tv_divide(afhi->chunks_total, &total, &afhi->chunk_tv);
        PARA_INFO_LOG("%luHz, %lus (%lu x %lums)\n",
                mp4ASC->samplingFrequency, ms / 1000,
-               afi->chunks_total, tv2ms(&afi->chunk_tv));
+               afhi->chunks_total, tv2ms(&afhi->chunk_tv));
        if (ms < 1000)
                return -E_MP4ASC;
        *seconds = ms / 1000;
@@ -92,7 +93,7 @@ static int aac_set_chunk_tv(struct audio_format_info *afi,
  * Init m4a file and write some tech data to given pointers.
  */
 static int aac_get_file_info(char *map, size_t numbytes,
-               struct audio_format_info *afi)
+               struct afh_info *afhi)
 {
        int i;
        size_t skip;
@@ -118,32 +119,32 @@ static int aac_get_file_info(char *map, size_t numbytes,
                goto out;
        if (!mp4ASC.samplingFrequency)
                goto out;
-       ret = aac_compute_chunk_table(afi, umap, numbytes);
+       ret = aac_compute_chunk_table(afhi, umap, numbytes);
        if (ret < 0)
                goto out;
        skip = ret;
-       ret = aac_set_chunk_tv(afi, &mp4ASC, &afi->seconds_total);
+       ret = aac_set_chunk_tv(afhi, &mp4ASC, &afhi->seconds_total);
        if (ret < 0)
                goto out;
        ret = aac_find_entry_point(umap + skip, numbytes - skip, &skip);
        if (ret < 0)
                goto out;
-       afi->chunk_table[0] = ret;
-       for (i = 1; i<= afi->chunks_total; i++)
-               afi->chunk_table[i] += ret;
-       afi->channels = channels;
-       afi->frequency = rate;
-       ret = (afi->chunk_table[afi->chunks_total] - afi->chunk_table[0]) * 8; /* bits */
-       ret += (channels * afi->seconds_total * 500); /* avoid rounding error */
-       afi->bitrate = ret / (channels * afi->seconds_total * 1000);
-       sprintf(afi->info_string, "audio_file_info1:%lu x %lums, "
+       afhi->chunk_table[0] = ret;
+       for (i = 1; i<= afhi->chunks_total; i++)
+               afhi->chunk_table[i] += ret;
+       afhi->channels = channels;
+       afhi->frequency = rate;
+       ret = (afhi->chunk_table[afhi->chunks_total] - afhi->chunk_table[0]) * 8; /* bits */
+       ret += (channels * afhi->seconds_total * 500); /* avoid rounding error */
+       afhi->bitrate = ret / (channels * afhi->seconds_total * 1000);
+       sprintf(afhi->info_string, "audio_file_info1:%lu x %lums, "
                "%uHz, %d channel%s, %ukb/s\n"
                "audio_file_info2:\n"
                "audio_file_info3:\n",
-               afi->chunks_total, tv2ms(&afi->chunk_tv),
-               afi->frequency, channels, channels == 1? "" : "s", afi->bitrate
+               afhi->chunks_total, tv2ms(&afhi->chunk_tv),
+               afhi->frequency, channels, channels == 1? "" : "s", afhi->bitrate
        );
-       tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
+       tv_scale(20, &afhi->chunk_tv, &afhi->eof_tv);
        ret = 1;
 out:
        if (handle)