mp4: Fail early on invalid sample rate or sample count.

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index 0f7f3fa925d24e6e4a39b80aac1aa78ec4cc89a1..cc3bf415c82f05ce7f529610a01dc25586597fc8 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -123,7 +123,6 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
                struct afh_info *afhi)
 {
        int ret;
-       int32_t rv;
        struct aac_afh_context *c;
        uint64_t milliseconds;
        const char *buf;
@@ -133,20 +132,13 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
        if (ret < 0)
                return ret;
 
-       ret = -E_MP4_BAD_SAMPLERATE;
-       rv = mp4_get_sample_rate(c->mp4);
-       if (rv <= 0)
-               goto close;
-       afhi->frequency = rv;
-
+       afhi->frequency = mp4_get_sample_rate(c->mp4);
+       assert(afhi->frequency > 0);
        afhi->channels = mp4_get_channel_count(c->mp4);
        assert(afhi->channels > 0);
+       afhi->chunks_total = mp4_num_samples(c->mp4);
+       assert(afhi->chunks_total > 0);
 
-       ret = -E_MP4_BAD_SAMPLE_COUNT;
-       rv = mp4_num_samples(c->mp4);
-       if (rv <= 0)
-               goto close;
-       afhi->chunks_total = rv;
        afhi->max_chunk_size = 0;
        for (n = 0; n < afhi->chunks_total; n++) {
                if (aac_afh_get_chunk(n, c, &buf, &len) < 0)
@@ -161,7 +153,6 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
        afhi->bitrate = 8 * numbytes / afhi->seconds_total / 1000;
        aac_afh_get_taginfo(c->mp4, &afhi->tags);
        ret = 1;
-close:
        aac_afh_close(c);
        return ret;
 }