X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=f679af29de6e54efe0d1fd6dbef94eab61314a30;hp=0a352c886164e858001fec0397da3aba7cab7cfb;hb=a6e79f02b6eab623425686f8f3cab5bc942e77d4;hpb=a7a37b282c4e936b2fb34c2bd7423f9f800dfd44

diff --git a/aac_afh.c b/aac_afh.c
index 0a352c88..f679af29 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -1,19 +1,7 @@
 /*
  * 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,
@@ -22,9 +10,12 @@
 
 /** \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, size_t buflen, off_t *skip)
@@ -37,21 +28,21 @@ static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
 
 		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,
+static ssize_t aac_compute_chunk_table(struct afh_info *afi,
 		unsigned char *map, size_t numbytes)
 {
 	int ret, i;
@@ -62,7 +53,7 @@ static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
 	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)
@@ -76,7 +67,7 @@ static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
 	return skip;
 }
 
-static int aac_set_chunk_tv(struct audio_format_info *afi,
+static int aac_set_chunk_tv(struct afh_info *afi,
 		mp4AudioSpecificConfig *mp4ASC, long unsigned *seconds)
 {
 	float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023;
@@ -102,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 *afi)
 {
 	int i;
 	size_t skip;
@@ -110,7 +101,7 @@ static int aac_get_file_info(char *map, size_t numbytes,
 	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, &decoder_len);
@@ -122,7 +113,7 @@ static int aac_get_file_info(char *map, size_t numbytes,
 		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;
@@ -156,6 +147,8 @@ static int aac_get_file_info(char *map, size_t numbytes,
 	tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
 	ret = 1;
 out:
+	if (handle)
+		NeAACDecClose(handle);
 	return ret;
 }