/*
* Copyright (C) 2006-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.
*/
/*
* based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
/** \file aac_afh.c para_server's aac audio format handler */
-#include "server.h"
+#include "para.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, off_t buflen, off_t *skip)
+static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
{
int i;
if (p[0] != 's' || p[1] != 't' || p[2] != 's' || p[3] != 'z')
continue;
- PARA_INFO_LOG("found stsz@%d\n", i);
+ PARA_DEBUG_LOG("found stsz@%d\n", i);
i += 8;
sample_size = aac_read_int32(buf + i);
- PARA_INFO_LOG("sample size: %d\n", sample_size);
+ PARA_DEBUG_LOG("sample size: %d\n", sample_size);
i += 4;
sample_count = aac_read_int32(buf + i);
i += 4;
- PARA_INFO_LOG("sample count: %d\n", sample_count);
+ PARA_DEBUG_LOG("sample count: %d\n", sample_count);
*skip = i;
return sample_count;
}
return -E_STSZ;
}
-static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
- unsigned char *map, off_t numbytes)
+static ssize_t aac_compute_chunk_table(struct afh_info *afi,
+ unsigned char *map, size_t numbytes)
{
int ret, i;
size_t sum = 0;
if (ret < 0)
return ret;
afi->chunks_total = ret;
- PARA_INFO_LOG("sz table has %lu entries\n", afi->chunks_total);
+ 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++) {
if (skip + 4 > numbytes)
return skip;
}
-static long unsigned aac_set_chunk_tv(struct audio_format_info *afi,
- mp4AudioSpecificConfig *mp4ASC)
+static int aac_set_chunk_tv(struct afh_info *afi,
+ mp4AudioSpecificConfig *mp4ASC, long unsigned *seconds)
{
- float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023,
- ms = 1000.0 * afi->chunks_total * tmp / mp4ASC->samplingFrequency;
+ float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023;
struct timeval total;
+ long unsigned ms = 1000.0 * afi->chunks_total * tmp
+ / mp4ASC->samplingFrequency;
+ if (!mp4ASC->samplingFrequency)
+ return -E_MP4ASC;
+ ms = 1000.0 * afi->chunks_total * tmp / mp4ASC->samplingFrequency;
ms2tv(ms, &total);
tv_divide(afi->chunks_total, &total, &afi->chunk_tv);
- PARA_INFO_LOG("%luHz, %fs (%lu x %lums)\n",
+ PARA_INFO_LOG("%luHz, %lus (%lu x %lums)\n",
mp4ASC->samplingFrequency, ms / 1000,
afi->chunks_total, tv2ms(&afi->chunk_tv));
- return ms < 1000? -E_MP4ASC : ms / 1000;
+ if (ms < 1000)
+ return -E_MP4ASC;
+ *seconds = ms / 1000;
+ return 1;
}
/*
* Init m4a file and write some tech data to given pointers.
*/
-static int aac_get_file_info(char *map, off_t numbytes,
- struct audio_format_info *afi)
+static int aac_get_file_info(char *map, size_t numbytes,
+ struct afh_info *afi)
{
int i;
size_t skip;
unsigned long rate = 0, decoder_len;
unsigned char channels = 0;
mp4AudioSpecificConfig mp4ASC;
- NeAACDecHandle handle;
+ NeAACDecHandle handle = NULL;
unsigned char *umap = (unsigned char *) map;
- ret = aac_find_esds(umap, numbytes, &skip);
+ ret = aac_find_esds(umap, numbytes, &skip, &decoder_len);
if (ret < 0)
goto out;
- decoder_len = ret;
handle = aac_open();
- ret = -E_AACDEC_INIT;
+ ret = -E_AAC_AFH_INIT;
if (NeAACDecInit(handle, umap + skip, decoder_len, &rate, &channels))
goto out;
if (!channels)
goto out;
- PARA_INFO_LOG("rate: %lu, channels: %d\n", rate, channels);
+ PARA_DEBUG_LOG("rate: %lu, channels: %d\n", rate, channels);
ret = -E_MP4ASC;
if (NeAACDecAudioSpecificConfig(umap + skip, numbytes - skip, &mp4ASC))
goto out;
if (ret < 0)
goto out;
skip = ret;
- afi->seconds_total = aac_set_chunk_tv(afi, &mp4ASC);
+ ret = aac_set_chunk_tv(afi, &mp4ASC, &afi->seconds_total);
+ if (ret < 0)
+ goto out;
ret = aac_find_entry_point(umap + skip, numbytes - skip, &skip);
if (ret < 0)
goto out;
tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
ret = 1;
out:
+ if (handle)
+ NeAACDecClose(handle);
return ret;
}
projects / paraslash.git / blobdiff