X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aac_common.c;fp=aac_common.c;h=0000000000000000000000000000000000000000;hb=c22fa00c45822fe62a8a921e54f19c012680fc2b;hp=812c742cf668e7ad67e6f5b502fbe6c93829f0a3;hpb=16b889fa03e8e9e97ed89370ad40fea4ee9b3e3a;p=paraslash.git

diff --git a/aac_common.c b/aac_common.c
deleted file mode 100644
index 812c742c..00000000
--- a/aac_common.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
-/*
- * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
- * Ahead Software AG
- */
-
-/** \file aac_common.c Common functions of aac_afh and aadcec. */
-
-#include "para.h"
-#include "aac.h"
-#include "error.h"
-#include "portable_io.h"
-
-/**
- * Get a new libfaad decoder handle.
- *
- * \return The handle returned by NeAACDecOpen().
- */
-NeAACDecHandle aac_open(void)
-{
-	NeAACDecHandle h = NeAACDecOpen();
-	NeAACDecConfigurationPtr c = NeAACDecGetCurrentConfiguration(h);
-
-	c->defObjectType = LC;
-	c->outputFormat = FAAD_FMT_16BIT;
-	c->downMatrix = 0;
-	NeAACDecSetConfiguration(h, c);
-	return h;
-}
-
-static unsigned long aac_read_decoder_length(char *buf, int *description_len)
-{
-	uint8_t b;
-	uint8_t numBytes = 0;
-	unsigned long length = 0;
-
-	do {
-		b = buf[numBytes];
-		numBytes++;
-		length = (length << 7) | (b & 0x7F);
-	} while
-		((b & 0x80) && numBytes < 4);
-	*description_len = numBytes;
-	return length;
-}
-
-/**
- * search for the position and the length of the decoder configuration
- *
- * \param buf buffer to seach
- * \param buflen length of \a buf
- * \param skip Upon succesful return, this contains the offset in \a buf where
- * the decoder config starts.
- * \param decoder_length result pointer that is filled in with the length of
- * the decoder configuration on success.
- *
- * \return positive on success, negative on errors
- */
-int aac_find_esds(char *buf, size_t buflen, size_t *skip,
-		unsigned long *decoder_length)
-{
-	size_t i;
-
-	for (i = 0; i + 4 < buflen; i++) {
-		char *p = buf + i;
-		int description_len;
-
-		if (p[0] != 'e' || p[1] != 's' || p[2] != 'd' || p[3] != 's')
-			continue;
-		i += 8;
-		p = buf + i;
-		PARA_INFO_LOG("found esds@%zu, next: %x\n", i, (unsigned)*p);
-		if (*p == 3)
-			i += 8;
-		else
-			i += 6;
-		p = buf + i;
-		PARA_INFO_LOG("next: %x\n", (unsigned)*p);
-		if (*p != 4)
-			continue;
-		i += 18;
-		p = buf + i;
-		PARA_INFO_LOG("next: %x\n", (unsigned)*p);
-		if (*p != 5)
-			continue;
-		i++;
-		p = buf + i;
-		*decoder_length = aac_read_decoder_length(p, &description_len);
-		PARA_INFO_LOG("decoder length: %lu\n", *decoder_length);
-		i += description_len;
-		*skip = i;
-		return 1;
-	}
-	return -E_ESDS;
-}
-
-/**
- * search for the first entry in the stco table
- *
- * \param buf buffer to seach
- * \param buflen length of \a buf
- * \param skip Upon succesful return, this contains the number
- * of bytes to skip from the input buffer.
- *
- * \return the position of the first entry in the table on success,
- * -E_STCO on errors.
- */
-ssize_t aac_find_entry_point(char *buf, size_t buflen, size_t *skip)
-{
-	ssize_t ret;
-	size_t i;
-
-	for (i = 0; i + 20 < buflen; i++) {
-		char *p = buf + i;
-
-		if (p[0] != 's' || p[1] != 't' || p[2] != 'c' || p[3] != 'o')
-			continue;
-		PARA_INFO_LOG("found stco@%zu\n", i);
-		i += 12;
-		ret = read_u32_be(buf + i); /* first offset */
-		i += 4;
-		PARA_INFO_LOG("entry point: %zd\n", ret);
-		*skip = i;
-		return ret;
-	}
-	PARA_WARNING_LOG("stco not found, buflen: %zu\n", buflen);
-	return -E_STCO;
-}