Request 6390 (new)

Overview

Request 6390 (new)

Something went wrong on the last checkin - branch and "refresh" seems to have worked at least :-) -- subbing without any changes apart from actually getting the pmbs to fetch the correct tarball

Created by zaitor about 7 hours ago
In state new
Package maintainers: detrei and mantre

Submit faac

Submit package home:zaitor:branches:Staging / faac to package Staging / faac

_service:obs_scm:faac-1.31.obscpio/Makefile.am Deleted

_service:obs_scm:faac-1.31.obscpio/bootstrap Deleted

_service:obs_scm:faac-1.31.obscpio/common Deleted

_service:obs_scm:faac-1.31.obscpio/common/Cfaac Deleted

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/AudioCoding.bmp Deleted

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/CRegistry.cpp Deleted

@@ -1,361 +0,0 @@
-/*
-CRegistry class
-Copyright (C) 2002-2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-#include "CRegistry.h"
-
-//************************************************************************************************
-
-CRegistry::CRegistry()
-{
-	regKey=NULL;
-	path=NULL;
-}
-//------------------------------------------------------------------------------------------------
-
-CRegistry::~CRegistry()
-{
-	Close();
-}
-//************************************************************************************************
-/*
-void CRegistry::ShowLastError(char *Caption)
-{
-LPVOID MsgBuf;
-	if(FormatMessage( 
-		FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-		FORMAT_MESSAGE_FROM_SYSTEM | 
-		FORMAT_MESSAGE_IGNORE_INSERTS,
-		NULL,
-		GetLastError(),
-		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-		(LPTSTR) &MsgBuf,
-		0,
-		NULL 
-	))
-		MessageBox(NULL, (LPCTSTR)MsgBuf, Caption, MB_OK|MB_ICONSTOP);
-	if(MsgBuf)
-		LocalFree(MsgBuf);
-}*/
-//************************************************************************************************
-
-#define setPath(SubKey) \
-{ \
-	if(path) \
-		free(path); \
-	path=strdup(SubKey); \
-}
-
-BOOL CRegistry::Open(HKEY hKey, char *SubKey)
-{
-	if(regKey)
-		RegCloseKey(regKey);
-	if(RegOpenKeyEx(hKey, SubKey, 0, KEY_ALL_ACCESS, &regKey)==ERROR_SUCCESS)
-	{
-		setPath(SubKey);
-		return TRUE;
-	}
-	else // can't open the key -> error
-	{
-		regKey=0;
-		setPath("");
-		return FALSE;
-	}
-}
-//************************************************************************************************
-
-BOOL CRegistry::OpenCreate(HKEY hKey, char *SubKey)
-{
-	if(regKey)
-		RegCloseKey(regKey);
-	if(RegOpenKeyEx(hKey, SubKey, 0, KEY_ALL_ACCESS, &regKey)==ERROR_SUCCESS)
-	{
-		setPath(SubKey);
-		return TRUE;
-	}
-	else // open failed -> create the key
-	{
-	DWORD disp;
-		RegCreateKeyEx(hKey, SubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &regKey, &disp);
-		if(disp==REG_CREATED_NEW_KEY) 
-		{
-			setPath(SubKey);
-			return TRUE;
-		}
-		else // can't create the key -> error
-		{
-			regKey=0;
-			setPath("");
-			return FALSE;
-		}
-	}
-}
-//************************************************************************************************
-
-void CRegistry::Close()
-{
-	if(regKey)
-		RegCloseKey(regKey);
-	regKey=NULL;
-	if(path) 
-		free(path); 
-	path=NULL;
-}
-//************************************************************************************************
-//************************************************************************************************
-//************************************************************************************************
-
-void CRegistry::DeleteVal(char *SubKey)
-{
-	RegDeleteValue(regKey,SubKey);
-}
-//************************************************************************************************
-
-void CRegistry::DeleteKey(char *SubKey)
-{
-	RegDeleteKey(regKey,SubKey);
-}
-
-//************************************************************************************************
-//************************************************************************************************
-//************************************************************************************************
-
-void CRegistry::SetBool(char *keyStr, bool val)
-{
-bool tempVal;
-DWORD len=sizeof(bool);
-	if(RegQueryValueEx(regKey, keyStr, NULL, NULL, (BYTE *)&tempVal, &len )!=ERROR_SUCCESS ||
-		tempVal!=val)
-		RegSetValueEx(regKey, keyStr, 0, REG_BINARY, (BYTE *)&val, sizeof(bool));
-}
-//************************************************************************************************
-
-void CRegistry::SetByte(char *keyStr, BYTE val)
-{
-DWORD	t=val;
-DWORD	tempVal;
-DWORD	len;
-	if(RegQueryValueEx(regKey, keyStr, NULL, NULL, (BYTE *)&tempVal, &len )!=ERROR_SUCCESS ||
-		tempVal!=val)
-		RegSetValueEx(regKey, keyStr, 0, REG_DWORD, (BYTE *)&t, sizeof(DWORD));
-}
-//************************************************************************************************
-
-void CRegistry::SetWord(char *keyStr, WORD val)
-{
-DWORD	t=val;
-DWORD	tempVal;
-DWORD	len;
-	if(RegQueryValueEx(regKey, keyStr, NULL, NULL, (BYTE *)&tempVal, &len )!=ERROR_SUCCESS ||
-		tempVal!=val)
-		RegSetValueEx(regKey, keyStr, 0, REG_DWORD, (BYTE *)&t, sizeof(DWORD));
-}
-//************************************************************************************************
-
-void CRegistry::SetDword(char *keyStr, DWORD val)
-{
-DWORD tempVal;
-DWORD len;
-	if(RegQueryValueEx(regKey, keyStr, NULL, NULL, (BYTE *)&tempVal, &len )!=ERROR_SUCCESS ||
-		tempVal!=val)
-		RegSetValueEx(regKey, keyStr, 0, REG_DWORD, (BYTE *)&val, sizeof(DWORD));
-}
-//************************************************************************************************
-
-void CRegistry::SetFloat(char *keyStr, float val)
-{
-float tempVal;
-DWORD len;
-	if(RegQueryValueEx(regKey, keyStr, NULL, NULL, (BYTE *)&tempVal, &len )!=ERROR_SUCCESS ||
-		tempVal!=val)
-		RegSetValueEx(regKey, keyStr, 0, REG_BINARY, (BYTE *)&val, sizeof(float));
-}
-//************************************************************************************************
-
-void CRegistry::SetStr(char *keyStr, char *valStr)
-{
-DWORD len;
-DWORD slen=strlen(valStr)+1;
-
-	if(!valStr || !*valStr)
-		return;
-
-	if(RegQueryValueEx(regKey, keyStr, NULL, NULL, NULL, &len )!=ERROR_SUCCESS ||
-		len!=slen)
-		RegSetValueEx(regKey, keyStr, 0, REG_SZ, (BYTE *)valStr, slen);
-	else
-	{
-	char *tempVal=new charslen;
-		if(RegQueryValueEx(regKey, keyStr, NULL, NULL, (BYTE *)tempVal, &len )!=ERROR_SUCCESS ||
-			strcmpi(tempVal,valStr))
-			RegSetValueEx(regKey, keyStr, 0, REG_SZ, (BYTE *)valStr, slen);
-		delete  tempVal;
-	}
-}
-//************************************************************************************************
-
-void CRegistry::SetValN(char *keyStr, BYTE *addr,  DWORD size)
-{
-DWORD len;
-	if(!addr || !size)
-		return;
-
-	if(RegQueryValueEx(regKey, keyStr, NULL, NULL, NULL, &len )!=ERROR_SUCCESS ||
-		len!=size)
-		RegSetValueEx(regKey, keyStr, 0, REG_BINARY, addr, size);
-	else
-	{
-	BYTE *tempVal=new BYTEsize;
-		if(RegQueryValueEx(regKey, keyStr, NULL, NULL, (BYTE *)tempVal, &len )!=ERROR_SUCCESS ||
-			memcmp(tempVal,addr,len))
-			RegSetValueEx(regKey, keyStr, 0, REG_BINARY, addr, size);
-		delete  tempVal;
-	}
-}
-
-
-
-//************************************************************************************************
-//************************************************************************************************
-//************************************************************************************************
-
-
-
-bool CRegistry::GetSetBool(char *keyStr, bool val)
-{
-bool tempVal;
-DWORD len=sizeof(bool);
-
-	if(RegQueryValueEx(regKey, keyStr, NULL, NULL, (BYTE *)&tempVal, &len )!=ERROR_SUCCESS)
-	{
-		RegSetValueEx(regKey, keyStr, 0, REG_BINARY, (BYTE *)&val, sizeof(bool));
-		return val;
-	}
-	return tempVal;
-}
-//************************************************************************************************
-
-BYTE CRegistry::GetSetByte(char *keyStr, BYTE val)
-{
-DWORD tempVal;
-DWORD len=sizeof(DWORD);
-
-	if(RegQueryValueEx(regKey, keyStr, NULL, NULL, (BYTE *)&tempVal, &len )!=ERROR_SUCCESS)
-	{
-		tempVal=val;
-		RegSetValueEx(regKey, keyStr, 0, REG_DWORD, (BYTE *)&tempVal, sizeof(DWORD));
-		return val;
-	}
-	return (BYTE)tempVal;
-}
-//************************************************************************************************
-
-WORD CRegistry::GetSetWord(char *keyStr, WORD val)
-{
-DWORD tempVal;
-DWORD len=sizeof(DWORD);
-
-	if(RegQueryValueEx(regKey, keyStr, NULL, NULL, (BYTE *)&tempVal, &len )!=ERROR_SUCCESS)
-	{
-		tempVal=val;
-		RegSetValueEx(regKey, keyStr, 0, REG_DWORD, (BYTE *)&tempVal, sizeof(DWORD));
-		return val;
-	}
-	return (WORD)tempVal;
-}
-//************************************************************************************************
-
-DWORD CRegistry::GetSetDword(char *keyStr, DWORD val)
-{
-DWORD tempVal;
-DWORD len=sizeof(DWORD);
-
-	if(RegQueryValueEx(regKey, keyStr, NULL, NULL, (BYTE *)&tempVal, &len )!=ERROR_SUCCESS)
-	{
-		RegSetValueEx(regKey, keyStr, 0, REG_DWORD, (BYTE *)&val, sizeof(DWORD));
-		return val;
-	}
-	return (DWORD)tempVal;
-}
-//************************************************************************************************
-
-float CRegistry::GetSetFloat(char *keyStr, float val)
-{
-float tempVal;
-DWORD len=sizeof(float);
-
-	if(RegQueryValueEx(regKey, keyStr, NULL, NULL, (BYTE *)&tempVal, &len )!=ERROR_SUCCESS)
-	{
-		RegSetValueEx(regKey, keyStr, 0, REG_BINARY, (BYTE *)&val, sizeof(float));
-		return val;
-	}
-	return tempVal;
-}
-//************************************************************************************************
-
-char *CRegistry::GetSetStr(char *keyStr, char *String)
-{
-long	retVal;
-DWORD	Len;
-char	*dest=NULL;
-	
-	if((retVal=RegQueryValueEx(regKey , keyStr , NULL , NULL, NULL, &Len))==ERROR_SUCCESS)
-		if(dest=(char *)malloc(Len+1))
-			retVal=RegQueryValueEx(regKey , keyStr , NULL , NULL, (BYTE *)dest , &Len);
-	if(retVal!=ERROR_SUCCESS)
-	{
-		if(dest)
-			free(dest);
-		if(!String)
-			return NULL;
-
-		Len=strlen(String)+1;
-		if(!(dest=strdup(String)))
-			return NULL;
-		RegSetValueEx(regKey , keyStr , NULL , REG_SZ , (BYTE *)dest , Len);
-	}
-	return dest;
-}
-// -----------------------------------------------------------------------------------------------
-
-int CRegistry::GetSetValN(char *keyStr, BYTE *defData, DWORD defSize, BYTE **dest)
-{
-long	retVal;
-DWORD	size;
-
-	*dest=NULL;
-	if((retVal=RegQueryValueEx(regKey , keyStr , NULL , NULL, NULL, &size))==ERROR_SUCCESS)
-		if(*dest=(BYTE *)malloc(size+1))
-			retVal=RegQueryValueEx(regKey , keyStr , NULL , NULL, (BYTE *)*dest , &size);
-	if(retVal!=ERROR_SUCCESS)
-	{
-		if(*dest)
-			free(*dest);
-		if(!defData)
-			return 0;
-
-		size=defSize;
-		if(!(*dest=(BYTE *)malloc(size)))
-			return 0;
-		memcpy(*dest,defData,size);
-		RegSetValueEx(regKey , keyStr , NULL , REG_BINARY , (BYTE *)*dest , size);
-	}
-	return size;
-}

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/CRegistry.h Deleted

@@ -1,64 +0,0 @@
-/*
-CRegistry class
-Copyright (C) 2002-2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-//---------------------------------------------------------------------------
-#ifndef CRegistryH
-#define CRegistryH
-//---------------------------------------------------------------------------
-
-#include <windows.h>
-#include <stdlib.h>
-#include <string.h>
-//#include <memory.h>
-
-class CRegistry 
-{
-public:
-			CRegistry();
-			~CRegistry();
-
-	BOOL	Open(HKEY hKey, char *SubKey);
-	BOOL	OpenCreate(HKEY hKey, char *SubKey);
-	void	Close();
-	void	DeleteVal(char *SubKey);
-	void	DeleteKey(char *SubKey);
-
-	void	SetBool(char *keyStr , bool val);
-	void	SetByte(char *keyStr , BYTE val);
-	void	SetWord(char *keyStr , WORD val);
-	void	SetDword(char *keyStr , DWORD val);
-	void	SetFloat(char *keyStr , float val);
-	void	SetStr(char *keyStr , char *valStr);
-	void	SetValN(char *keyStr , BYTE *addr,  DWORD size);
-
-	bool	GetSetBool(char *keyStr, bool var);
-	BYTE	GetSetByte(char *keyStr, BYTE var);
-	WORD	GetSetWord(char *keyStr, WORD var);
-	DWORD	GetSetDword(char *keyStr, DWORD var);
-	float	GetSetFloat(char *keyStr, float var);
-	char	*GetSetStr(char *keyStr, char *String);
-	int		GetSetValN(char *keyStr, BYTE *defData, DWORD defSize, BYTE **dest);
-
-	HKEY	regKey;
-	char	*path;
-};
-
-#endif

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/CTag.cpp Deleted

@@ -1,347 +0,0 @@
-/*
-CTag - Class to read/write id3v2/mp4 tags
-Copyright (C) 2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-#include <stdlib.h>
-#include <mp4.h>
-#define HAVE_INT32_T
-#include <faac.h>
-#include "CTag.h"
-
-
-
-// *********************************************************************************************
-//										CMP4Tag
-// *********************************************************************************************
-
-CMP4Tag::CMP4Tag()
-{
-//	memset(this,0,sizeof(*this));
-	copyright=NULL;
-	artist=title=album=year=genre=writer=comment=NULL;
-	trackno=ntracks=discno=ndiscs=0;
-	compilation=0;
-	artFilename=NULL;
-	art.pictureType=0; // = other
-	memset(&art,0,sizeof(art));
-}
-// *********************************************************************************************
-
-void CMP4Tag::FreeTag()
-{
-	FREE_ARRAY(artist);
-	FREE_ARRAY(title);
-	FREE_ARRAY(album);
-	FREE_ARRAY(year);
-	FREE_ARRAY(genre);
-	FREE_ARRAY(writer);
-	FREE_ARRAY(comment);
-	FREE_ARRAY(artFilename);
-	FREE_ARRAY(art.data);
-	FREE_ARRAY(art.description);
-	FREE_ARRAY(art.mimeType);
-	FREE_ARRAY(art.format);
-}
-// ***********************************************************************************************
-
-int CMP4Tag::check_image_header(const char *buf)
-{
-	if(!strncmp(buf, "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A", 8))
-		return 1; /* PNG */
-	if(!strncmp(buf, "\xFF\xD8\xFF\xE0", 4) &&
-		!strncmp(buf + 6, "JFIF\0",	5))
-		return 2; /* JPEG */
-	if(!strncmp(buf, "GIF87a", 6)	|| !strncmp(buf, "GIF89a", 6))
-		return 3; /* GIF */
-
-	return 0;
-}
-// -----------------------------------------------------------------------------------------------
-
-int CMP4Tag::ReadCoverArtFile(char *pCoverArtFile, char **artData)
-{
-FILE *artFile;
-
-	if(!pCoverArtFile || !*pCoverArtFile)
-		return 0;
-
-	if(!(artFile=fopen(pCoverArtFile, "rb")))
-	{
-	char buf25+MAX_PATH+1;
-		sprintf(buf,"ReadCoverArtFile: can't open \"%s\"",pCoverArtFile);
-		MessageBox(NULL,buf,NULL,MB_OK);
-		return 0;
-	}
-
-int r;
-char *art;
-int	artSize=0;
-
-	fseek(artFile, 0, SEEK_END);
-	artSize=ftell(artFile);
-	fseek(artFile, 0, SEEK_SET);
-
-	if(!(art=(char *)malloc(artSize)))
-	{
-		fclose(artFile);
-		MessageBox(NULL,"ReadCoverArtFile: Memory allocation error!", NULL, MB_OK);
-		return 0;
-	}
-
-	r=fread(art, 1, artSize, artFile);
-	if(r!=artSize)
-	{
-		free(art);
-		fclose(artFile);
-		MessageBox(NULL,"ReadCoverArtFile: Error reading cover art file!", NULL, MB_OK);
-		return 0;
-	}
-	else
-		if(artSize<12 || !check_image_header(art))
-		{
-			// the above expression checks the image signature
-			free(art);
-			fclose(artFile);
-			MessageBox(NULL,"ReadCoverArtFile: Unsupported cover image file format!", NULL, MB_OK);
-			return 0;
-		}
-
-	FREE_ARRAY(*artData);
-	*artData=art;
-	fclose(artFile);
-	return artSize;
-}
-// *********************************************************************************************
-
-int CMP4Tag::WriteMP4Tag(MP4FileHandle MP4File)
-{
-char	buf512, *faac_id_string, *faac_copyright_string;
-
-	if(MP4File==NULL)
-	{
-		MessageBox(NULL,"WriteMp4Tag: can't open file!",NULL,MB_OK);
-		return 1;
-	}
-
-	sprintf(buf, "FAAC v%s", (faacEncGetVersion(&faac_id_string, &faac_copyright_string)==FAAC_CFG_VERSION) ? faac_id_string : " wrong libfaac version");
-	MP4SetMetadataTool(MP4File, buf);
-
-	if(artist) MP4SetMetadataArtist(MP4File, artist);
-	if(writer) MP4SetMetadataWriter(MP4File, writer);
-	if(title) MP4SetMetadataName(MP4File, title);
-	if(album) MP4SetMetadataAlbum(MP4File, album);
-	if(trackno>0) MP4SetMetadataTrack(MP4File, trackno, ntracks);
-	if(discno>0) MP4SetMetadataDisk(MP4File, discno, ndiscs);
-	if(compilation) MP4SetMetadataCompilation(MP4File, compilation);
-	if(year) MP4SetMetadataYear(MP4File, year);
-	if(genre) MP4SetMetadataGenre(MP4File, genre);
-	if(comment) MP4SetMetadataComment(MP4File, comment);
-	if(art.size=ReadCoverArtFile(artFilename,&art.data))
-	{
-		MP4SetMetadataCoverArt(MP4File, (unsigned __int8 *)art.data, art.size);
-		FREE_ARRAY(art.data);
-	}
-	return 0;
-}
-// *********************************************************************************************
-
-int CMP4Tag::ReadMp4Tag(char *Filename)						 
-{
-MP4FileHandle MP4File;
-
-	if(!(MP4File=MP4Read(Filename, 0)))
-	{
-	char buf25+MAX_PATH+1;
-		sprintf(buf,"ReadMp4Tag: can't open \"%s\"",Filename);
-		MessageBox(NULL,buf,NULL,MB_OK);
-		return 1;
-	}
-
-	FREE_ARRAY(copyright);
-	MP4GetMetadataTool(MP4File, &copyright);
-
-	FREE_ARRAY(artist);
-	MP4GetMetadataArtist(MP4File, &artist);
-	FREE_ARRAY(writer);
-	MP4GetMetadataWriter(MP4File, &writer);
-	FREE_ARRAY(title);
-	MP4GetMetadataName(MP4File, &title);
-	FREE_ARRAY(album);
-	MP4GetMetadataAlbum(MP4File, &album);
-	MP4GetMetadataTrack(MP4File, (unsigned __int16 *)&trackno, (unsigned __int16 *)&ntracks);
-	MP4GetMetadataDisk(MP4File, (unsigned __int16 *)&discno, (unsigned __int16 *)&ndiscs);
-	MP4GetMetadataCompilation(MP4File, (unsigned __int8 *)&compilation);
-	FREE_ARRAY(year);
-	MP4GetMetadataYear(MP4File, &year);
-	FREE_ARRAY(genre);
-	MP4GetMetadataGenre(MP4File, &genre);
-	FREE_ARRAY(comment);
-	MP4GetMetadataComment(MP4File, &comment);
-	FREE_ARRAY(art.data);
-	MP4GetMetadataCoverArt(MP4File, (unsigned __int8 **)&art.data, (uint32_t *)&art.size);
-
-	MP4Close(MP4File);
-/*
-	FILE *f=fopen("D:\\prova.jpg","wb");
-		fwrite(artFile,1,artSize,f);
-		fclose(f);*/
-	return 0;
-}
-// *********************************************************************************************
-
-#define DEL_FIELD(id3Tag,ID3FID) \
-{ \
-ID3_Frame *Frame=id3Tag.Find(ID3FID); \
-	if(Frame!=NULL) \
-		id3Tag.RemoveFrame(Frame); \
-}
-// -----------------------------------------------------------------------------------------------
-
-#define ADD_FIELD(id3Tag,ID3FID,ID3FN,data) \
-{ \
-ID3_Frame *NewFrame=new ID3_Frame(ID3FID); \
-	NewFrame->Field(ID3FN)=data; \
-	DEL_FIELD(id3Tag,ID3FID); \
-	id3Tag.AttachFrame(NewFrame); \
-}
-// -----------------------------------------------------------------------------------------------
-
-int CMP4Tag::WriteAacTag(char *Filename)
-{
-char	buf512, *faac_id_string, *faac_copyright_string;
-ID3_Tag id3Tag;
-FILE *file;
-
-	if((file=fopen(Filename,"r"))==NULL)
-	{
-	char buf25+MAX_PATH+1;
-		sprintf(buf,"WriteAacTag: can't open \"%s\"",Filename);
-		MessageBox(NULL,buf,NULL,MB_OK);
-		return 1;
-	}
-	else
-		fclose(file);
-	id3Tag.Link(Filename);
-
-	sprintf(buf, "FAAC v%s", (faacEncGetVersion(&faac_id_string, &faac_copyright_string)==FAAC_CFG_VERSION) ? faac_id_string : " wrong libfaac version");
-	ADD_FIELD(id3Tag,ID3FID_ENCODEDBY,ID3FN_TEXT,buf);
-
-	ADD_FIELD(id3Tag,ID3FID_LEADARTIST,ID3FN_TEXT,artist);
-	ADD_FIELD(id3Tag,ID3FID_COMPOSER,ID3FN_TEXT,writer);
-	ADD_FIELD(id3Tag,ID3FID_TITLE,ID3FN_TEXT,title);
-	ADD_FIELD(id3Tag,ID3FID_ALBUM,ID3FN_TEXT,album);
-	sprintf(buf,"%d",trackno);
-	ADD_FIELD(id3Tag,ID3FID_TRACKNUM,ID3FN_TEXT,buf);
-	ADD_FIELD(id3Tag,ID3FID_YEAR,ID3FN_TEXT,year);
-	ADD_FIELD(id3Tag,ID3FID_CONTENTTYPE,ID3FN_TEXT,genre);
-	ADD_FIELD(id3Tag,ID3FID_COMMENT,ID3FN_TEXT,comment);
-	art.size=ReadCoverArtFile(artFilename,&art.data);
-	if(art.size)
-	{
-	ID3_Frame *NewFrame=new ID3_Frame(ID3FID_PICTURE);
-	char name_MAX_FNAME, ext_MAX_EXT;
-		_splitpath(artFilename,NULL,NULL,name,ext);
-
-		NewFrame->Field(ID3FN_DESCRIPTION)=name;
-	char buf15;
-		sprintf(buf,"image/%s",check_image_header(art.data)==2 ? "jpeg" : strlwr(ext+1));
-		NewFrame->Field(ID3FN_MIMETYPE)=buf;
-//		NewFrame->Field(ID3FN_IMAGEFORMAT)=;
-		NewFrame->Field(ID3FN_PICTURETYPE)=(DWORD)art.pictureType;
-		NewFrame->Field(ID3FN_DATA).Set((BYTE *)art.data,art.size);
-		id3Tag.AttachFrame(NewFrame);
-	}
-
-	// setup all our rendering parameters
-    id3Tag.SetUnsync(false);
-    id3Tag.SetExtendedHeader(true);
-    id3Tag.SetCompression(true);
-    id3Tag.SetPadding(true);
- 
-	// write any changes to the file
-    id3Tag.Update();
-
-	FREE_ARRAY(art.data);
-	return 0;
-}
-// *********************************************************************************************
-
-#define GET_FIELD_STR(id3Tag,ID3FID,ID3FN,data) \
-{ \
-	Frame=id3Tag.Find(ID3FID); \
-	if(Frame!=NULL) \
-	{ \
-	DWORD size=Frame->Field(ID3FN).Size(); \
-		FREE_ARRAY(data); \
-		if(data=(char *)malloc(size+1)) \
-			Frame->Field(ID3FN).Get(data,size+1); \
-	} \
-	else \
-		FREE_ARRAY(data); \
-}
-// -----------------------------------------------------------------------------------------------
-
-int CMP4Tag::ReadAacTag(char *Filename)
-{
-char	*buf=NULL;
-ID3_Tag id3Tag;
-ID3_Frame *Frame;
-
-	if(!id3Tag.Link(Filename))
-	{
-	char buf25+MAX_PATH+1;
-		sprintf(buf,"ReadAacTag: can't open \"%s\"",Filename);
-		MessageBox(NULL,buf,NULL,MB_OK);
-		return 1;
-	}
-
-	GET_FIELD_STR(id3Tag,ID3FID_ENCODEDBY,ID3FN_TEXT,copyright);
-
-	GET_FIELD_STR(id3Tag,ID3FID_LEADARTIST,ID3FN_TEXT,artist);
-	GET_FIELD_STR(id3Tag,ID3FID_COMPOSER,ID3FN_TEXT,writer);
-	GET_FIELD_STR(id3Tag,ID3FID_TITLE,ID3FN_TEXT,title);
-	GET_FIELD_STR(id3Tag,ID3FID_ALBUM,ID3FN_TEXT,album);
-
-	GET_FIELD_STR(id3Tag,ID3FID_TRACKNUM,ID3FN_TEXT,buf);
-	if(buf)
-		trackno=atoi(buf);
-	FREE_ARRAY(buf);
-	GET_FIELD_STR(id3Tag,ID3FID_YEAR,ID3FN_TEXT,year);
-	GET_FIELD_STR(id3Tag,ID3FID_CONTENTTYPE,ID3FN_TEXT,genre);
-	GET_FIELD_STR(id3Tag,ID3FID_COMMENT,ID3FN_TEXT,comment);
-
-	if(Frame=id3Tag.Find(ID3FID_PICTURE))
-	{
-		art.size=Frame->Field(ID3FN_DATA).Size();
-		FREE_ARRAY(art.data);
-		if(art.data=(char *)malloc(art.size))
-			memcpy(art.data,Frame->Field(ID3FN_DATA).GetBinary(),art.size);
-
-		GET_FIELD_STR(id3Tag,ID3FID_PICTURE,ID3FN_MIMETYPE,art.mimeType);
-		GET_FIELD_STR(id3Tag,ID3FID_PICTURE,ID3FN_DESCRIPTION,art.description);
-		GET_FIELD_STR(id3Tag,ID3FID_PICTURE,ID3FN_IMAGEFORMAT,art.format);
-		art.pictureType=Frame->Field(ID3FN_PICTURETYPE).Get();
-/*
-	FILE *f=fopen("D:\\prova.jpg","wb");
-		fwrite(artFile,1,artSize,f);
-		fclose(f);*/
-	}
-	return 0;
-}
\ No newline at end of file

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/CTag.h Deleted

@@ -1,86 +0,0 @@
-/*
-CTag - Class to read/write id3v2/mp4 tags
-Copyright (C) 2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-#ifndef _CTag_H
-#define _CTag_H
-
-// *********************************************************************************************
-
-#include <mp4.h>
-#include <id3/tag.h>	// id3 tag
-#include "CRegistry.h"
-#include "Defines.h"
-
-// *********************************************************************************************
-
-#define REG_TAGON "Tag On"
-#define REG_TAGIMPORT "Tag import"
-#define REG_ARTIST "Tag Artist"
-#define REG_TITLE "Tag Title"
-#define REG_ALBUM "Tag Album"
-#define REG_YEAR "Tag Year"
-#define REG_GENRE "Tag Genre"
-#define REG_WRITER "Tag Writer"
-#define REG_COMMENT "Tag Comment"
-#define REG_TRACK "Tag Track"
-#define REG_NTRACKS "Tag Tracks"
-#define REG_DISK "Tag Disk"
-#define REG_NDISKS "Tag Disks"
-#define REG_COMPILATION "Tag Compilation"
-#define REG_ARTFILE "Tag Art file"
-
-// *********************************************************************************************
-
-typedef struct
-{
-	char	*data;
-	DWORD	size;
-	DWORD	pictureType; // front, back, icon, ...
-	char	*mimeType, // jpg, png, gif
-			*format, // ???
-			*description; // text description
-} id3Picture;
-
-class CMP4Tag
-{
-private:
-	int check_image_header(const char *buf);
-	int ReadCoverArtFile(char *pCoverArtFile, char **artBuf);
-
-public:
-	CMP4Tag();
-	virtual ~CMP4Tag() { FreeTag(); }
-
-	virtual void FreeTag();
-	virtual int WriteMP4Tag(MP4FileHandle MP4File);
-	virtual int WriteAacTag(char *Filename);
-	virtual int ReadMp4Tag(char *Filename);
-	virtual int ReadAacTag(char *Filename);
-
-	char	*copyright; // used in Cfaad
-	char	*artist, *title, *album, *year, *genre, *writer, *comment;
-	WORD	trackno,ntracks, discno,ndiscs;
-	BYTE	compilation;
-	char	*artFilename;
-	id3Picture art; // used in ReadAacTag(). Remark: field not stored into registry
-};
-
-#endif
\ No newline at end of file

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/Cfaac.cpp Deleted

@@ -1,719 +0,0 @@
-/*
-CFAAC - set of classes to import/export .aac/.mp4 files
-Copyright (C) 2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-#include "Cfaac.h"
-
-
-
-// *********************************************************************************************
-//										CMyEncCfg
-// *********************************************************************************************
-
-void CMyEncCfg::getCfg(CMyEncCfg *cfg)
-{ 
-CRegistry reg;
-
-	if(reg.OpenCreate(HKEY_CURRENT_USER, REGISTRY_PROGRAM_NAME "\\FAAC"))
-	{
-		cfg->AutoCfg=reg.GetSetBool(REG_AUTO,DEF_AUTO);
-		cfg->SaveMP4=reg.GetSetByte(REG_WRITEMP4,DEF_WRITEMP4);
-		cfg->EncCfg.mpegVersion=reg.GetSetDword(REG_MPEGVER,DEF_MPEGVER); 
-		cfg->EncCfg.aacObjectType=reg.GetSetDword(REG_PROFILE,DEF_PROFILE); 
-		cfg->EncCfg.allowMidside=reg.GetSetDword(REG_MIDSIDE,DEF_MIDSIDE); 
-		cfg->EncCfg.useTns=reg.GetSetDword(REG_TNS,DEF_TNS); 
-		cfg->EncCfg.useLfe=reg.GetSetDword(REG_LFE,DEF_LFE);
-		cfg->UseQuality=reg.GetSetBool(REG_USEQUALTY,DEF_USEQUALTY);
-		cfg->EncCfg.quantqual=reg.GetSetDword(REG_QUALITY,DEF_QUALITY); 
-		cfg->EncCfg.bitRate=reg.GetSetDword(REG_BITRATE,DEF_BITRATE); 
-		cfg->EncCfg.bandWidth=reg.GetSetDword(REG_BANDWIDTH,DEF_BANDWIDTH); 
-		cfg->EncCfg.outputFormat=reg.GetSetDword(REG_HEADER,DEF_HEADER); 
-
-		FREE_ARRAY(cfg->OutDir);
-		cfg->OutDir=reg.GetSetStr(REG_OutFolder,"");
-
-		cfg->TagOn=reg.GetSetByte(REG_TAGON,0);
-#ifdef USE_IMPORT_TAG
-		cfg->TagImport=reg.GetSetByte(REG_TAGIMPORT,0);
-	#ifdef USE_PATHEXT
-		FREE_ARRAY(cfg->TagSrcPath);
-		FREE_ARRAY(cfg->TagSrcExt);
-		cfg->TagSrcPath=reg.GetSetStr(REG_InFolder,"");
-		cfg->TagSrcExt=reg.GetSetStr(REG_SrcExt,"");
-	#endif
-#endif
-		cfg->Tag.artist=reg.GetSetStr(REG_ARTIST,"");
-		cfg->Tag.title=reg.GetSetStr(REG_TITLE,"");
-		cfg->Tag.album=reg.GetSetStr(REG_ALBUM,"");
-		cfg->Tag.year=reg.GetSetStr(REG_YEAR,"");
-		cfg->Tag.genre=reg.GetSetStr(REG_GENRE,"");
-		cfg->Tag.writer=reg.GetSetStr(REG_WRITER,"");
-		cfg->Tag.comment=reg.GetSetStr(REG_COMMENT,"");
-		cfg->Tag.trackno=reg.GetSetWord(REG_TRACK,0);
-		cfg->Tag.ntracks=reg.GetSetWord(REG_NTRACKS,0);
-		cfg->Tag.discno=reg.GetSetWord(REG_DISK,0);
-		cfg->Tag.ndiscs=reg.GetSetWord(REG_NDISKS,0);
-		cfg->Tag.compilation=reg.GetSetByte(REG_COMPILATION,0);
-		cfg->Tag.artFilename=reg.GetSetStr(REG_ARTFILE,"");
-	}
-	else
-		MessageBox(0,"Can't open registry!",0,MB_OK|MB_ICONSTOP);
-}
-// -----------------------------------------------------------------------------------------------
-
-void CMyEncCfg::setCfg(CMyEncCfg *cfg)
-{ 
-CRegistry reg;
-
-	if(reg.OpenCreate(HKEY_CURRENT_USER, REGISTRY_PROGRAM_NAME "\\FAAC"))
-	{
-		reg.SetBool(REG_AUTO,cfg->AutoCfg);
-		reg.SetByte(REG_WRITEMP4,cfg->SaveMP4);
-		reg.SetDword(REG_MPEGVER,cfg->EncCfg.mpegVersion);
-		reg.SetDword(REG_PROFILE,cfg->EncCfg.aacObjectType);
-		reg.SetDword(REG_MIDSIDE,cfg->EncCfg.allowMidside);
-		reg.SetDword(REG_TNS,cfg->EncCfg.useTns);
-		reg.SetDword(REG_LFE,cfg->EncCfg.useLfe);
-		reg.SetBool(REG_USEQUALTY,cfg->UseQuality);
-		reg.SetDword(REG_QUALITY,cfg->EncCfg.quantqual);
-		reg.SetDword(REG_BITRATE,cfg->EncCfg.bitRate);
-		reg.SetDword(REG_BANDWIDTH,cfg->EncCfg.bandWidth);
-		reg.SetDword(REG_HEADER,cfg->EncCfg.outputFormat);
-
-		reg.SetStr(REG_OutFolder,cfg->OutDir);
-
-		reg.SetByte(REG_TAGON,cfg->TagOn);
-#ifdef USE_IMPORT_TAG
-		reg.SetByte(REG_TAGIMPORT,cfg->TagImport);
-	#ifdef USE_PATHEXT
-		reg.SetStr(REG_InFolder,cfg->TagSrcPath);
-		reg.SetStr(REG_SrcExt,cfg->TagSrcExt);
-	#endif
-#endif
-		reg.SetStr(REG_ARTIST,cfg->Tag.artist);
-		reg.SetStr(REG_TITLE,cfg->Tag.title);
-		reg.SetStr(REG_ALBUM,cfg->Tag.album);
-		reg.SetStr(REG_YEAR,cfg->Tag.year);
-		reg.SetStr(REG_GENRE,cfg->Tag.genre);
-		reg.SetStr(REG_WRITER,cfg->Tag.writer);
-		reg.SetStr(REG_COMMENT,cfg->Tag.comment);
-		reg.SetWord(REG_TRACK,cfg->Tag.trackno);
-		reg.SetWord(REG_NTRACKS,cfg->Tag.ntracks);
-		reg.SetWord(REG_DISK,cfg->Tag.discno);
-		reg.SetWord(REG_NDISKS,cfg->Tag.ndiscs);
-		reg.SetByte(REG_COMPILATION,cfg->Tag.compilation);
-		reg.SetStr(REG_ARTFILE,cfg->Tag.artFilename);
-	}
-	else
-		MessageBox(0,"Can't open registry!",0,MB_OK|MB_ICONSTOP);
-}
-
-// *********************************************************************************************
-//											Cfaac
-// *********************************************************************************************
-
-
-
-Cfaac::Cfaac(HANDLE hOut)
-{
-	if(hOut)
-	{
-		hOutput=hOut;
-		return;
-	}
-
-    if(!(hOutput=GlobalAlloc(GMEM_MOVEABLE|GMEM_SHARE|GMEM_ZEROINIT,sizeof(MYOUTPUT))))
-	{
-		MessageBox(0, "Memory allocation error: hOutput", APP_NAME " plugin", MB_OK|MB_ICONSTOP); \
-		return;
-	}
-//	dontAskGetFilename=false;
-}
-// -----------------------------------------------------------------------------------------------
-
-Cfaac::~Cfaac()
-{
-	if(!hOutput)
-		return;
-
-MYOUTPUT *mo;
-
-	GLOBALLOCK(mo,hOutput,MYOUTPUT,return);
-	
-	if(mo->WrittenSamples)
-	{
-	int	BytesWritten;
-		if(mo->bytes_into_buffer>0)
-			memset(mo->bufIn+mo->bytes_into_buffer, 0, (mo->samplesInput*(mo->BitsPerSample>>3))-mo->bytes_into_buffer);
-		do
-		{
-			if((BytesWritten=processData(hOutput,mo->bufIn,mo->bytes_into_buffer))<0)
-				MessageBox(0, "~Cfaac: processData", APP_NAME " plugin", MB_OK|MB_ICONSTOP);
-			mo->bytes_into_buffer=0;
-		}while(BytesWritten>0);
-	}
-
-	if(mo->aacFile)
-	{
-		fclose(mo->aacFile);
-		mo->aacFile=0;
-
-	CMyEncCfg cfg(false);
-		if(cfg.TagOn && mo->OutFilename)
-		{
-		int error=0;
-#ifdef USE_IMPORT_TAG
-			if(cfg.TagImport && mo->InFilename)
-			{
-			int l=strlen(mo->InFilename);
-				if(	!strcmpi(mo->InFilename+l-4,".mp4") ||
-					!strcmpi(mo->InFilename+l-4,".m4a") ||
-					!strcmpi(mo->InFilename+l-4,".m4b"))
-					error=cfg.Tag.ReadMp4Tag(mo->InFilename);
-				else
-					error=cfg.Tag.ReadAacTag(mo->InFilename);
-			}
-#endif
-			if(!error)
-				cfg.Tag.WriteAacTag(mo->OutFilename);
-		}
-	}
-	else
-	{
-		MP4Close(mo->MP4File);
-		mo->MP4File=0;
-	}
-	
-	if(mo->hEncoder)
-		faacEncClose(mo->hEncoder);
-	
-	FREE_ARRAY(mo->bitbuf)
-	FREE_ARRAY(mo->buf32bit)
-	FREE_ARRAY(mo->bufIn)
-
-	FREE_ARRAY(mo->OutFilename)
-	FREE_ARRAY(mo->InFilename)
-
-	GlobalUnlock(hOutput);
-	GlobalFree(hOutput);
-}
-
-// *********************************************************************************************
-//									Utilities
-// *********************************************************************************************
-
-char *Cfaac::getSourceFilename(char *path, char *src, char *ext)
-{
-char	*dst, chExt,
-		*pname, *pext;
-
-
-	if(!src)
-		return NULL;
-	if(!path)
-		path="";
-	if(!ext)
-		ext="";
-	pname=pext=src+strlen(src);
-
-	while(pname!=src && *pname!='\\' && *pname!='/')
-		pname--;
-	if(*pname=='\\' || *pname=='/')
-		pname++;
-	while(pext!=src && *pext!='.')
-		pext--;
-	chExt=*pext;
-	if(chExt=='.')
-		*pext='\0';
-
-	if(*path)
-	{
-	int l;
-		if(!(dst=(char *)malloc(strlen(path)+strlen(pname)+strlen(ext)+3))) // '\0','\\','.'
-			return dst;
-		l=strlen(path);
-		if(l>0 && pathl-1=='\\')
-			sprintf(dst,"%s%s.%s",path,pname,ext);
-		else
-			sprintf(dst,"%s\\%s.%s",path,pname,ext);
-	}
-	else
-	{
-		if(!(dst=(char *)malloc(strlen(pname)+strlen(ext)+2)))
-			return dst;
-		sprintf(dst,"%s.%s",pname,ext);
-	}
-	*pext=chExt;
-
-	if(!strcmpi(src,dst))
-	{
-//		if(!dontAskGetFilename)
-		{
-		char bufMAX_PATH+100;
-			sprintf(buf,"%s\nSource file=Destination file...aborting!\n\n\tSuppress this warning?",dst);
-//			if(MessageBox(NULL,buf,NULL,MB_YESNO)==IDYES)
-//				dontAskGetFilename=true;
-		}
-		FREE_ARRAY(dst);
-		return NULL;
-	}
-
-	return dst;
-}
-// *********************************************************************************************
-
-#define SWAP32(x) (((x & 0xff) << 24) | ((x & 0xff00) << 8) \
-	| ((x & 0xff0000) >> 8) | ((x & 0xff000000) >> 24))
-#define SWAP16(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8))
-
-void Cfaac::To32bit(int32_t *buf, BYTE *bufi, int size, BYTE samplebytes, BYTE bigendian)
-{
-int i;
-
-	switch(samplebytes)
-	{
-	case 1:
-		// this is endian clean
-		for (i = 0; i < size; i++)
-			bufi = (bufii - 128) * 65536;
-		break;
-		
-	case 2:
-#ifdef WORDS_BIGENDIAN
-		if (!bigendian)
-#else
-			if (bigendian)
-#endif
-			{
-				// swap bytes
-				for (i = 0; i < size; i++)
-				{
-					int16_t s = ((int16_t *)bufi)i;
-					
-					s = SWAP16(s);
-					
-					bufi = ((uint32_t)s) << 8;
-				}
-			}
-			else
-			{
-				// no swap
-				for (i = 0; i < size; i++)
-				{
-					int s = ((int16_t *)bufi)i;
-					
-					bufi = s << 8;
-				}
-			}
-			break;
-			
-	case 3:
-		if (!bigendian)
-		{
-			for (i = 0; i < size; i++)
-			{
-				int s = bufi3 * i | (bufi3 * i + 1 << 8) | (bufi3 * i + 2 << 16);
-				
-				// fix sign
-				if (s & 0x800000)
-					s |= 0xff000000;
-				
-				bufi = s;
-			}
-		}
-		else // big endian input
-		{
-			for (i = 0; i < size; i++)
-			{
-				int s = (bufi3 * i << 16) | (bufi3 * i + 1 << 8) | bufi3 * i + 2;
-				
-				// fix sign
-				if (s & 0x800000)
-					s |= 0xff000000;
-				
-				bufi = s;
-			}
-		}
-		break;
-		
-	case 4:		
-#ifdef WORDS_BIGENDIAN
-		if (!bigendian)
-#else
-			if (bigendian)
-#endif
-			{
-				// swap bytes
-				for (i = 0; i < size; i++)
-				{
-					int s = bufii;
-					
-					bufi = SWAP32(s);
-				}
-			}
-			else
-				memcpy(buf,bufi,size*sizeof(uint32_t));
-		/*
-		int exponent, mantissa;
-		float *bufo=(float *)buf;
-			
-			for (i = 0; i < size; i++)
-			{
-				exponent=bufi(i<<2)+3<<1;
-				if(bufii*4+2 & 0x80)
-					exponent|=0x01;
-				exponent-=126;
-				mantissa=(DWORD)bufi(i<<2)+2<<16;
-				mantissa|=(DWORD)bufi(i<<2)+1<<8;
-				mantissa|=bufi(i<<2);
-				bufoi=(float)ldexp(mantissa,exponent);
-			}*/
-			break;
-	}
-}
-
-// *********************************************************************************************
-//									Main functions
-// *********************************************************************************************
-
-void Cfaac::DisplayError(char *ProcName, char *str)
-{
-char buf100="";
-
-	if(str && *str)
-	{
-		if(ProcName && *ProcName)
-			sprintf(buf,"%s: ", ProcName);
-		strcat(buf,str);
-		MessageBox(0, buf, APP_NAME " plugin", MB_OK|MB_ICONSTOP);
-	}
-
-MYOUTPUT *mo;
-	GLOBALLOCK(mo,hOutput,MYOUTPUT,return);
-	mo->bytes_into_buffer=-1;
-	GlobalUnlock(hOutput);
-	GlobalUnlock(hOutput);
-}
-// *********************************************************************************************
-
-HANDLE Cfaac::Init(LPSTR InFileName, LPSTR OutFileName,long lSamprate,WORD wBitsPerSample,WORD wChannels,long FileSize)
-{
-MYOUTPUT	*mo;
-CMyEncCfg	cfg(false);
-DWORD		samplesInput,
-			maxBytesOutput;
-
-//	if(wBitsPerSample!=8 && wBitsPerSample!=16) // 32 bit audio from cooledit is in unsupported format
-//		return 0;
-	if(wChannels>48)	// FAAC supports max 48 tracks!
-		return NULL;
-
-	GLOBALLOCK(mo,hOutput,MYOUTPUT,return NULL);
-
-	// open the encoder library
-	if(!(mo->hEncoder=faacEncOpen(lSamprate, wChannels, &samplesInput, &maxBytesOutput)))
-		return ERROR_Init("Can't open library");
-
-	if(!(mo->bitbuf=(unsigned char *)malloc(maxBytesOutput*sizeof(unsigned char))))
-		return ERROR_Init("Memory allocation error: output buffer");
-
-	if(!(mo->bufIn=(BYTE *)malloc(samplesInput*sizeof(int32_t))))
-		return ERROR_Init("Memory allocation error: input buffer");
-
-	if(!(mo->buf32bit=(int32_t *)malloc(samplesInput*sizeof(int32_t))))
-		return ERROR_Init("Memory allocation error: 32 bit buffer");
-
-	if(cfg.SaveMP4)// || cfg.Tag.On)
-	{
-	int ExtPos=0, // append new ext
-		fnLen=lstrlen(OutFileName);
-//		if(OutFileNamelstrlen(OutFileName)-4=='.')
-		if(	fnLen>=4 &&
-			(!strcmpi(OutFileName+fnLen-4,".aac") ||
-			!strcmpi(OutFileName+fnLen-4,".mp4") ||
-			!strcmpi(OutFileName+fnLen-4,".m4a") ||
-			!strcmpi(OutFileName+fnLen-4,".m4b"))) // no aac/mp4 ext => append new ext
-			if(	(cfg.SaveMP4==1 && strcmpi(OutFileName+fnLen-4,".mp4")) ||
-				(cfg.SaveMP4==2 && strcmpi(OutFileName+fnLen-4,".m4a")) ||
-				(cfg.SaveMP4==3 && strcmpi(OutFileName+fnLen-4,".m4b")))
-				ExtPos=4; // wrong ext => replace it
-			else
-				ExtPos=-1; // correct ext => no action
-		if(ExtPos!=-1)
-		{
-			switch(cfg.SaveMP4)
-			{
-			case 1:	strcpy(OutFileName+fnLen-ExtPos,".mp4"); break;
-			case 2: strcpy(OutFileName+fnLen-ExtPos,".m4a"); break;
-			case 3: strcpy(OutFileName+fnLen-ExtPos,".m4b"); break;
-			}
-		FILE *f=fopen(OutFileName,"rb");
-			if(f)
-			{
-			char bufMAX_PATH+20;
-				sprintf(buf,"Overwrite \"%s\" ?",OutFileName);
-				fclose(f);
-				if(MessageBox(NULL,buf,"File already exists!",MB_YESNO|MB_ICONQUESTION)==IDNO)
-					return ERROR_Init(0);//"User abort");
-			}
-		}
-	}
-	mo->WriteMP4=	!strcmpi(OutFileName+lstrlen(OutFileName)-4,".mp4") ||
-					!strcmpi(OutFileName+lstrlen(OutFileName)-4,".m4a") ||
-					!strcmpi(OutFileName+lstrlen(OutFileName)-4,".m4b");
-
-faacEncConfigurationPtr CurFormat=faacEncGetCurrentConfiguration(mo->hEncoder);
-	CurFormat->inputFormat=FAAC_INPUT_32BIT;
-/*	switch(wBitsPerSample)
-	{
-	case 16:
-		CurFormat->inputFormat=FAAC_INPUT_16BIT;
-		break;
-	case 24:
-		CurFormat->inputFormat=FAAC_INPUT_24BIT;
-		break;
-	case 32:
-		CurFormat->inputFormat=FAAC_INPUT_32BIT;
-		break;
-	default:
-		CurFormat->inputFormat=FAAC_INPUT_NULL;
-		break;
-	}*/
-	if(!cfg.AutoCfg)
-	{
-	faacEncConfigurationPtr myFormat=&cfg.EncCfg;
-
-		if(cfg.UseQuality)
-		{
-			CurFormat->quantqual=myFormat->quantqual;
-			CurFormat->bitRate=0;//myFormat->bitRate;
-		}
-		else
-		{
-			CurFormat->bitRate=(myFormat->bitRate*1000)/wChannels;
-			CurFormat->quantqual=100;
-		}
-
-		switch(CurFormat->bandWidth)
-		{
-		case 0: // Auto
-			break;
-		case 0xffffffff: // Full
-			CurFormat->bandWidth=lSamprate/2;
-			break;
-		default:
-			CurFormat->bandWidth=myFormat->bandWidth;
-			break;
-		}
-		CurFormat->mpegVersion=myFormat->mpegVersion;
-		CurFormat->outputFormat=myFormat->outputFormat;
-		CurFormat->mpegVersion=myFormat->mpegVersion;
-		CurFormat->aacObjectType=myFormat->aacObjectType;
-		CurFormat->allowMidside=myFormat->allowMidside;
-//		CurFormat->useTns=myFormat->useTns;
-		CurFormat->useTns=false;
-	}
-	else
-	{
-		CurFormat->mpegVersion=DEF_MPEGVER;
-		CurFormat->aacObjectType=DEF_PROFILE;
-		CurFormat->allowMidside=DEF_MIDSIDE;
-//		CurFormat->useTns=DEF_TNS;
-		CurFormat->useTns=false;
-		CurFormat->useLfe=DEF_LFE;
-		CurFormat->quantqual=DEF_QUALITY;
-		CurFormat->bitRate=DEF_BITRATE;
-		CurFormat->bandWidth=DEF_BANDWIDTH;
-		CurFormat->outputFormat=DEF_HEADER;
-	}
-	if(mo->WriteMP4)
-		CurFormat->outputFormat=RAW;
-	CurFormat->useLfe=wChannels>=6 ? 1 : 0;
-	if(!faacEncSetConfiguration(mo->hEncoder, CurFormat))
-		return ERROR_Init("Unsupported parameters!");
-
-//	mo->src_size=lSize;
-//	mi->dst_name=strdup(OutFileName);
-	mo->Samprate=lSamprate;
-	mo->BitsPerSample=wBitsPerSample;
-	mo->Channels=wChannels;
-	mo->samplesInput=samplesInput;
-	mo->samplesInputSize=samplesInput*(mo->BitsPerSample>>3);
-
-	mo->maxBytesOutput=maxBytesOutput;
-
-    if(mo->WriteMP4) // Create MP4 file --------------------------------------------------------------------------
-	{
-    BYTE *ASC=0;
-    DWORD ASCLength=0;
-
-        if((mo->MP4File=MP4Create(OutFileName, 0, 0))==MP4_INVALID_FILE_HANDLE)
-			return ERROR_Init("Can't create file");
-        MP4SetTimeScale(mo->MP4File, 90000);
-        mo->MP4track=MP4AddAudioTrack(mo->MP4File, lSamprate, MP4_INVALID_DURATION, MP4_MPEG4_AUDIO_TYPE);
-        MP4SetAudioProfileLevel(mo->MP4File, 0x0F);
-        faacEncGetDecoderSpecificInfo(mo->hEncoder, &ASC, &ASCLength);
-        MP4SetTrackESConfiguration(mo->MP4File, mo->MP4track, (unsigned __int8 *)ASC, ASCLength);
-		mo->frameSize=samplesInput/wChannels;
-		mo->ofs=mo->frameSize;
-
-		if(cfg.TagOn)
-		{
-		int error=0;
-#ifdef USE_IMPORT_TAG
-			if(cfg.TagImport && InFileName)
-			{
-			int l=strlen(InFileName);
-				if(	!strcmpi(InFileName+l-4,".mp4") ||
-					!strcmpi(InFileName+l-4,".m4a") ||
-					!strcmpi(InFileName+l-4,".m4b"))
-					error=cfg.Tag.ReadMp4Tag(InFileName);
-				else
-					error=cfg.Tag.ReadAacTag(InFileName);
-			}
-#endif
-			if(!error)
-				cfg.Tag.WriteMP4Tag(mo->MP4File);
-		}
-	}
-	else // Create AAC file -----------------------------------------------------------------------------
-	{
-		// open the aac output file 
-		if(!(mo->aacFile=fopen(OutFileName, "wb")))
-			return ERROR_Init("Can't create file");
-
-		// use bufferized stream
-		setvbuf(mo->aacFile,NULL,_IOFBF,32767);
-
-		mo->InFilename=strdup(InFileName);
-		mo->OutFilename=strdup(OutFileName);
-	}
-
-	showInfo(mo);
-
-	GlobalUnlock(hOutput);
-    return hOutput;
-}
-// *********************************************************************************************
-
-int Cfaac::processData(HANDLE hOutput, BYTE *bufIn, DWORD len)
-{
-	if(!hOutput)
-		return -1;
-
-int bytesWritten=0;
-int bytesEncoded;
-MYOUTPUT far *mo;
-
-	GLOBALLOCK(mo,hOutput,MYOUTPUT,return 0);
-
-int32_t *buf=mo->buf32bit;
-
-	if((int)len<mo->samplesInputSize)
-	{
-		mo->samplesInput=(len<<3)/mo->BitsPerSample;
-		mo->samplesInputSize=mo->samplesInput*(mo->BitsPerSample>>3);
-	}
-//	if(mo->BitsPerSample==8 || mo->BitsPerSample==32)
-		To32bit(buf,bufIn,mo->samplesInput,mo->BitsPerSample>>3,false);
-
-	// call the actual encoding routine
-	if((bytesEncoded=faacEncEncode(mo->hEncoder, (int32_t *)buf, mo->samplesInput, mo->bitbuf, mo->maxBytesOutput))<0)
-		return ERROR_processData("faacEncEncode()");
-
-	// write bitstream to aac file 
-	if(mo->aacFile)
-	{
-		if(bytesEncoded>0)
-		{
-			if((bytesWritten=fwrite(mo->bitbuf, 1, bytesEncoded, mo->aacFile))!=bytesEncoded)
-				return ERROR_processData("Write failed!");
-			mo->WrittenSamples=1; // needed into destructor
-		}
-	}
-	else
-	// write bitstream to mp4 file
-	{
-	MP4Duration dur,
-				SamplesLeft;
-		if(len>0)
-		{
-			mo->srcSize+=len;
-			dur=mo->frameSize;
-		}
-		else
-		{
-			mo->TotalSamples=(mo->srcSize<<3)/(mo->BitsPerSample*mo->Channels);
-			SamplesLeft=(mo->TotalSamples-mo->WrittenSamples)+mo->frameSize;
-			dur=SamplesLeft>mo->frameSize ? mo->frameSize : SamplesLeft;
-		}
-		if(bytesEncoded>0)
-		{
-			if(!(bytesWritten=MP4WriteSample(mo->MP4File, mo->MP4track, (unsigned __int8 *)mo->bitbuf, (DWORD)bytesEncoded, dur, mo->ofs, true) ? bytesEncoded : -1))
-				return ERROR_processData("MP4WriteSample()");
-			mo->ofs=0;
-			mo->WrittenSamples+=dur;
-		}
-	}
-
-	showProgress(mo);
-
-	GlobalUnlock(hOutput);
-	return bytesWritten;
-}
-// -----------------------------------------------------------------------------------------------
-
-int Cfaac::processDataBufferized(HANDLE hOutput, BYTE *bufIn, long lBytes)
-{
-	if(!hOutput)
-		return -1;
-
-int	bytesWritten=0, tot=0;
-MYOUTPUT far *mo;
-
-	GLOBALLOCK(mo,hOutput,MYOUTPUT,return 0);
-
-	if(mo->bytes_into_buffer>=0)
-		do
-		{
-			if(mo->bytes_into_buffer+lBytes<mo->samplesInputSize)
-			{
-				memmove(mo->bufIn+mo->bytes_into_buffer, bufIn, lBytes);
-				mo->bytes_into_buffer+=lBytes;
-				lBytes=0;
-			}
-			else
-			{
-			int	shift=mo->samplesInputSize-mo->bytes_into_buffer;
-				memmove(mo->bufIn+mo->bytes_into_buffer, bufIn, shift);
-				mo->bytes_into_buffer+=shift;
-				bufIn+=shift;
-				lBytes-=shift;
-
-				tot+=bytesWritten=processData(hOutput,mo->bufIn,mo->bytes_into_buffer);
-				if(bytesWritten<0)
-					return ERROR_processData(0);
-				mo->bytes_into_buffer=0;
-			}
-		}while(lBytes);
-
-	GlobalUnlock(hOutput);
-	return tot;
-}

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/Cfaac.h Deleted

@@ -1,187 +0,0 @@
-/*
-CFAAC - set of classes to import/export .aac/.mp4 files
-Copyright (C) 2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-#ifndef _Cfaac_H
-#define _Cfaac_H
-
-// *********************************************************************************************
-
-#include <mp4.h>		// int32_t, ...
-#include <neaacdec.h>
-//#include <faad.h>		// FAAD2 version
-#ifdef MAIN
-	#undef MAIN
-#endif
-#ifdef SSR
-	#undef SSR
-#endif
-#ifdef LTP
-	#undef LTP
-#endif
-
-#define HAVE_INT32_T
-#include <faac.h>
-#include <mpeg4ip_version.h>	// mpeg4ip version
-#include <CRegistry.h>
-#include <CTag.h>
-#include "Defines.h"	// my defines
-
-// *********************************************************************************************
-
-#ifdef	ADTS
-#undef	ADTS
-#define ADTS 1
-#endif
-
-// *********************************************************************************************
-
-#define REG_AUTO "Auto"
-#define DEF_AUTO true
-#define REG_WRITEMP4 "Write MP4"
-#define DEF_WRITEMP4 0
-#define REG_MPEGVER "MPEG version"
-#define DEF_MPEGVER MPEG4
-#define REG_PROFILE "Profile"
-#define DEF_PROFILE LOW
-#define REG_MIDSIDE "MidSide"
-#define DEF_MIDSIDE true
-#define REG_TNS "TNS"
-#define DEF_TNS true
-#define REG_LFE "LFE"
-#define DEF_LFE false
-#define REG_USEQUALTY "Use quality"
-#define DEF_USEQUALTY true
-#define REG_QUALITY "Quality"
-#define DEF_QUALITY 100
-#define REG_BITRATE "BitRate"
-#define DEF_BITRATE 0 /* quality on */
-#define REG_BANDWIDTH "BandWidth"
-#define DEF_BANDWIDTH 0
-#define REG_HEADER "Header"
-#define DEF_HEADER ADTS
-
-#define REG_OutFolder "Output folder"
-#define REG_InFolder "Source folder"
-#define REG_SrcExt "Source extensions"
-
-// *********************************************************************************************
-
-class CMyEncCfg
-{
-private:
-
-	bool SaveCfgOnDestroy;
-
-public:
-
-	CMyEncCfg(bool SaveOnDestroy=true) { OutDir=TagSrcPath=TagSrcExt=NULL; getCfg(this); SaveCfgOnDestroy=SaveOnDestroy; }
-	virtual ~CMyEncCfg() { if(SaveCfgOnDestroy) setCfg(this); FreeCfg(this); }
-
-	void FreeCfg(CMyEncCfg *cfg) { Tag.FreeTag(); FREE_ARRAY(OutDir); FREE_ARRAY(TagSrcPath); FREE_ARRAY(TagSrcExt); }
-	void getCfg(CMyEncCfg *cfg);
-	void setCfg(CMyEncCfg *cfg);
-
-	bool					AutoCfg,
-							UseQuality;
-	BYTE					SaveMP4;
-	char					*OutDir;
-	faacEncConfiguration	EncCfg;
-	CMP4Tag					Tag;
-	BYTE					TagOn;
-	BYTE					TagImport;
-	char					*TagSrcPath,
-							*TagSrcExt;
-};
-// -----------------------------------------------------------------------------------------------
-
-typedef struct output_tag  // any special vars associated with output file
-{
-// MP4
-MP4FileHandle 	MP4File;
-MP4TrackId		MP4track;
-MP4Duration		TotalSamples,
-				WrittenSamples,
-				encoded_samples;
-DWORD			frameSize,
-				ofs;
-
-// AAC
-FILE			*aacFile;
-char			*InFilename,
-				*OutFilename;
-
-// GLOBAL
-long			Samprate;
-WORD			BitsPerSample;
-WORD			Channels;
-DWORD			srcSize;
-//char			*dst_name;		// name of compressed file
-
-faacEncHandle	hEncoder;
-int32_t			*buf32bit;
-BYTE			*bufIn;
-unsigned char	*bitbuf;
-long			bytes_into_buffer;
-DWORD			maxBytesOutput;
-long			samplesInput,
-				samplesInputSize;
-bool			WriteMP4;
-} MYOUTPUT;
-
-
-
-// *********************************************************************************************
-
-
-
-class Cfaac
-{
-private:
-	virtual void DisplayError(char *ProcName, char *str);
-	virtual HANDLE ERROR_Init(char *str) { DisplayError("Init", str); return NULL; }
-	virtual int ERROR_processData(char *str) { DisplayError("processData", str); return -1; }
-	virtual void showInfo(MYOUTPUT *mi) {}
-	virtual void showProgress(MYOUTPUT *mi) {}
-	void To32bit(int32_t *buf, BYTE *bufi, int size, BYTE samplebytes, BYTE bigendian);
-
-public:
-    Cfaac(HANDLE hOutput=NULL);
-    virtual ~Cfaac();
-
-	virtual char *getSourceFilename(char *path, char *src, char *ext);
-
-	virtual HANDLE Init(LPSTR InFilename,LPSTR OutFilename,long lSamprate,WORD wBitsPerSample,WORD wChannels,long FileSize);
-    virtual int processData(HANDLE hOutput, BYTE *bufIn, DWORD len);
-	virtual int processDataBufferized(HANDLE hOutput, BYTE *bufIn, long lBytes);
-/*
-// AAC
-	bool            BlockSeeking;
-
-// GLOBAL
-	long            newpos_ms;
-	BOOL            IsSeekable;
-	MYINPUT			*mi;
-*/
-	HANDLE			hOutput;
-//	bool			dontAskGetFilename;
-};
-
-#endif

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/Cfaad.cpp Deleted

@@ -1,807 +0,0 @@
-/*
-CFAAC - set of classes to import/export .aac/.mp4 files
-Copyright (C) 2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-#include "Cfaad.h"
-
-
-
-// *********************************************************************************************
-
-
-
-Cfaad::Cfaad(HANDLE hIn)
-{
-	ShowDlg4RawAAC=NULL;
-	pCfg=NULL;
-
-	if(hIn)
-	{
-		hInput=hIn;
-		return;
-	}
-
-MYINPUT *mi;
-
-	if(!(hInput=GlobalAlloc(GMEM_MOVEABLE|GMEM_SHARE|GMEM_ZEROINIT,sizeof(MYINPUT))))
-		MessageBox(0, "Memory allocation error: hInput", APP_NAME " plugin", MB_OK|MB_ICONSTOP); \
-	if(!(mi=(MYINPUT *)GlobalLock(hInput)))
-		MessageBox(0, "GlobalLock(hInput)", APP_NAME " plugin", MB_OK|MB_ICONSTOP); \
-/*
-	mi->mp4File=0;
-	mi->aacFile=0;
-    mi->hDecoder=0;
-    mi->buffer=0;
-	mi->bytes_read=0;*/
-	mi->BitsPerSample=16;
-	mi->FindBitrate=FALSE;
-	newpos_ms=-1;
-	mi->seek_table=NULL;
-	mi->seek_table_length=0;
-	mi->LockSeeking=false;
-	GlobalUnlock(hInput);
-}
-// -----------------------------------------------------------------------------------------------
-
-Cfaad::~Cfaad()
-{
-MYINPUT *mi;
-
-	if(!hInput)
-		return;
-
-	GLOBALLOCK(mi,hInput,MYINPUT,return);
-
-	if(mi->mp4File)
-		MP4Close(mi->mp4File);
-	if(mi->aacFile)
-		fclose(mi->aacFile);
-	if(mi->hDecoder)
-		faacDecClose(mi->hDecoder);
-	FREE_ARRAY(mi->buffer);
-	FREE_ARRAY(mi->seek_table);
-
-	GlobalUnlock(hInput);
-	GlobalFree(hInput);
-}
-
-// *********************************************************************************************
-//									Utilities
-// *********************************************************************************************
-
-int Cfaad::GetAACTrack(MP4FileHandle infile)
-{
-// find AAC track
-int i, rc;
-int numTracks = MP4GetNumberOfTracks(infile, NULL, 0);
-
-	for (i = 0; i < numTracks; i++)
-    {
-    MP4TrackId trackId = MP4FindTrackId(infile, i, NULL, 0);
-    const char* trackType = MP4GetTrackType(infile, trackId);
-
-        if (!strcmp(trackType, MP4_AUDIO_TRACK_TYPE))
-        {
-        unsigned char *buff = NULL;
-        unsigned __int32 buff_size = 0;
-        mp4AudioSpecificConfig mp4ASC;
-
-			MP4GetTrackESConfiguration(infile, trackId, (unsigned __int8 **)&buff, &buff_size);
-
-            if (buff)
-            {
-                rc = AudioSpecificConfig(buff, buff_size, &mp4ASC);
-                free(buff);
-
-                if (rc < 0)
-                    return -1;
-                return trackId;
-            }
-        }
-    }
-
-    // can't decode this
-    return -1;
-}
-// *********************************************************************************************
-
-int Cfaad::IsMP4(LPSTR lpstrFilename)
-{
-DWORD	mp4file = 0;
-FILE	*hMP4File = fopen(lpstrFilename, "rb");
-BYTE	header8;
-    if(!hMP4File)
-		return -1;
-    fread(header, 1, 8, hMP4File);
-    fclose(hMP4File);
-    if(header4=='f' && header5=='t' && header6=='y' && header7=='p')
-		return 1;
-
-	return 0;
-}
-// *********************************************************************************************
-long Cfaad::id3v2_TagSize(unsigned char *buffer)
-{
-	if(StringComp((const char *)buffer, "ID3", 3) == 0)
-	{
-	unsigned long tagsize;
-
-	// high bit is not used
-		tagsize =	(buffer6 << 21) | (buffer7 << 14) |
-					(buffer8 <<  7) | (buffer9 <<  0);
-		tagsize += 10;
-		return tagsize;
-	}
-	return 0;
-}
-/*
-long Cfaad::id3v2_TagSize(aac_buffer *b)
-{
-DWORD    tagsize = 0;
-    if (!memcmp(b->buffer, "ID3", 3))
-    {
-        // high bit is not used
-        tagsize = (b->buffer6 << 21) | (b->buffer7 << 14) |
-            (b->buffer8 <<  7) | (b->buffer9 <<  0);
-
-        tagsize += 10;
-        advance_buffer(b, tagsize);
-        fill_buffer(b);
-    }
-	return tagsize;
-}
-// *********************************************************************************************
-
-int Cfaad::fill_buffer(aac_buffer *b)
-{
-    int bread;
-
-    if (b->bytes_consumed > 0)
-    {
-        if (b->bytes_into_buffer)
-        {
-            memmove((void*)b->buffer, (void*)(b->buffer + b->bytes_consumed),
-                b->bytes_into_buffer*sizeof(unsigned char));
-        }
-
-        if (!b->at_eof)
-        {
-            bread = fread((void*)(b->buffer + b->bytes_into_buffer), 1,
-                b->bytes_consumed, b->infile);
-
-            if (bread != b->bytes_consumed)
-                b->at_eof = 1;
-
-            b->bytes_into_buffer += bread;
-        }
-
-        b->bytes_consumed = 0;
-
-        if (b->bytes_into_buffer > 3)
-        {
-            if (memcmp(b->buffer, "TAG", 3) == 0)
-                b->bytes_into_buffer = 0;
-        }
-        if (b->bytes_into_buffer > 11)
-        {
-            if (memcmp(b->buffer, "LYRICSBEGIN", 11) == 0)
-                b->bytes_into_buffer = 0;
-        }
-        if (b->bytes_into_buffer > 8)
-        {
-            if (memcmp(b->buffer, "APETAGEX", 8) == 0)
-                b->bytes_into_buffer = 0;
-        }
-    }
-
-    return 1;
-}
-// *********************************************************************************************
-
-void Cfaad::advance_buffer(aac_buffer *b, int bytes)
-{
-    b->file_offset += bytes;
-    b->bytes_consumed = bytes;
-    b->bytes_into_buffer -= bytes;
-}
-// *********************************************************************************************
-
-static int adts_sample_rates = {96000,88200,64000,48000,44100,32000,24000,22050,16000,12000,11025,8000,7350,0,0,0};
-
-int Cfaad::adts_parse(aac_buffer *b, int *bitrate, float *length)
-{
-    int frames, frame_length;
-    int t_framelength = 0;
-    int samplerate;
-    float frames_per_sec, bytes_per_frame;
-
-    // Read all frames to ensure correct time and bitrate
-    for (frames = 0; ; frames++)
-    {
-        fill_buffer(b);
-
-        if (b->bytes_into_buffer > 7)
-        {
-            // check syncword 
-            if (!((b->buffer0 == 0xFF)&&((b->buffer1 & 0xF6) == 0xF0)))
-                break;
-
-            if (frames == 0)
-                samplerate = adts_sample_rates(b->buffer2&0x3c)>>2;
-
-            frame_length = ((((unsigned int)b->buffer3 & 0x3)) << 11)
-                | (((unsigned int)b->buffer4) << 3) | (b->buffer5 >> 5);
-
-            t_framelength += frame_length;
-
-            if (frame_length > b->bytes_into_buffer)
-                break;
-
-            advance_buffer(b, frame_length);
-        } else {
-            break;
-        }
-    }
-
-    frames_per_sec = (float)samplerate/1024.0f;
-    if (frames != 0)
-        bytes_per_frame = (float)t_framelength/(float)(frames*1000);
-    else
-        bytes_per_frame = 0;
-    *bitrate = (int)(8. * bytes_per_frame * frames_per_sec + 0.5);
-    if (frames_per_sec != 0)
-        *length = (float)frames/frames_per_sec;
-    else
-        *length = 1;
-
-    return 1;
-}
-// *********************************************************************************************
-
-// get AAC infos for printing 
-void Cfaad::GetAACInfos(aac_buffer *b, DWORD *header_type, float *song_length, int *pbitrate, long filesize)
-{
-int		bitrate=0;
-float	length=0;
-int		bread;
-long	tagsize=id3v2_TagSize(b);
-
-	*header_type = 0;
-	b->file_offset=tagsize;
-
-    if ((b->buffer0 == 0xFF) && ((b->buffer1 & 0xF6) == 0xF0))
-    {
-        adts_parse(b, &bitrate, &length);
-        fseek(b->infile, tagsize, SEEK_SET);
-
-        bread = fread(b->buffer, 1, FAAD_MIN_STREAMSIZE*MAX_CHANNELS, b->infile);
-        if (bread != FAAD_MIN_STREAMSIZE*MAX_CHANNELS)
-            b->at_eof = 1;
-        else
-            b->at_eof = 0;
-        b->bytes_into_buffer = bread;
-        b->bytes_consumed = 0;
-        b->file_offset = tagsize;
-
-        *header_type = 1;
-    } else if (memcmp(b->buffer, "ADIF", 4) == 0) {
-        int skip_size = (b->buffer4 & 0x80) ? 9 : 0;
-        bitrate = ((unsigned int)(b->buffer4 + skip_size & 0x0F)<<19) |
-            ((unsigned int)b->buffer5 + skip_size<<11) |
-            ((unsigned int)b->buffer6 + skip_size<<3) |
-            ((unsigned int)b->buffer7 + skip_size & 0xE0);
-
-        length = (float)filesize;
-        if (length != 0)
-        {
-            length = ((float)length*8.f)/((float)bitrate) + 0.5f;
-        }
-
-        bitrate = (int)((float)bitrate/1000.0f + 0.5f);
-
-        *header_type = 2;
-    }
-
-    *song_length = length;
-	*pbitrate=bitrate;
-}
-
-void Cfaad::GetAACInfos(char *Filename, aac_buffer *b, DWORD *header_type, float *song_length, int *pbitrate)
-{
-	if(!(b->infile=fopen(Filename,"rb")))
-	{
-		MessageBox(NULL,"Error opening file",NULL,MB_OK);
-		return;
-	}
-	fseek(b->infile, 0, SEEK_END);
-long	src_size=ftell(b->infile);
-	fseek(b->infile, 0, SEEK_SET);
-	if(!(b->buffer=(BYTE *)malloc(FAAD_STREAMSIZE)))
-	{
-		MessageBox(NULL,"Memory allocation error: b->buffer",NULL,MB_OK);
-		return;
-	}
-
-int	tread=src_size<FAAD_STREAMSIZE ? src_size : FAAD_STREAMSIZE;
-	b->bytes_into_buffer=fread(b->buffer, 1, tread, b->infile);
-	if(b->bytes_into_buffer!=tread)
-	{
-		MessageBox(NULL,"Read failed!",NULL,MB_OK);
-		return;
-	}
-	b->bytes_consumed=0;
-	b->file_offset=0;
-	b->at_eof=(b->bytes_into_buffer!=tread) ? 1 : 0;
-
-	*header_type = 0;
-	b->file_offset=0;
-
-	GetAACInfos(b,header_type,song_length,pbitrate,src_size);
-
-	free(b->buffer);
-	fclose(b->infile);
-}
-*/
-// *********************************************************************************************
-//									Main functions
-// *********************************************************************************************
-
-void CMyDecCfg::getCfg(CMyDecCfg *cfg) 
-{ 
-CRegistry reg;
-
-if(reg.OpenCreate(HKEY_CURRENT_USER, REGISTRY_PROGRAM_NAME "\\FAAD"))
-	{
-		cfg->DefaultCfg=reg.GetSetBool(REG_DEFAULT,true);
-		cfg->DecCfg.defObjectType=reg.GetSetByte(REG_PROFILE,LC);
-		cfg->DecCfg.defSampleRate=reg.GetSetDword(REG_SAMPLERATE,44100);
-		cfg->DecCfg.outputFormat=reg.GetSetByte(REG_BPS,FAAD_FMT_16BIT);
-		cfg->DecCfg.downMatrix=reg.GetSetByte(REG_DOWNMATRIX,0);
-		cfg->DecCfg.useOldADTSFormat=reg.GetSetByte(REG_OLDADTS,0);
-		cfg->DecCfg.dontUpSampleImplicitSBR=reg.GetSetByte(REG_DONTUPSAMPLESBR,1);
-//		cfg->Channels=reg.GetSetByte("Channels",2);
-	}
-	else
-		MessageBox(0,"Can't open registry!",0,MB_OK|MB_ICONSTOP);
-}
-// -----------------------------------------------------------------------------------------------
-
-void CMyDecCfg::setCfg(CMyDecCfg *cfg)
-{ 
-CRegistry reg;
-
-	if(reg.OpenCreate(HKEY_CURRENT_USER, REGISTRY_PROGRAM_NAME "\\FAAD"))
-	{
-		reg.SetBool(REG_DEFAULT,cfg->DefaultCfg);
-		reg.SetByte(REG_PROFILE,cfg->DecCfg.defObjectType);
-		reg.SetDword(REG_SAMPLERATE,cfg->DecCfg.defSampleRate);
-		reg.SetByte(REG_BPS,cfg->DecCfg.outputFormat);
-		reg.SetByte(REG_DOWNMATRIX,cfg->DecCfg.downMatrix);
-		reg.SetByte(REG_OLDADTS,cfg->DecCfg.useOldADTSFormat);
-		reg.SetByte(REG_DONTUPSAMPLESBR,cfg->DecCfg.dontUpSampleImplicitSBR);
-//		reg.SetByte("Channels",cfg->Channels);
-	}
-	else
-		MessageBox(0,"Can't open registry!",0,MB_OK|MB_ICONSTOP);
-}
-// *********************************************************************************************
-
-void Cfaad::setFaadCfg(faacDecHandle hDecoder, CMyDecCfg Cfg)
-{
-faacDecConfigurationPtr	config=faacDecGetCurrentConfiguration(hDecoder);
-
-	if(!Cfg.DefaultCfg)
-	{
-		config->defObjectType=Cfg.DecCfg.defObjectType;
-		config->outputFormat=Cfg.DecCfg.outputFormat;
-		config->defSampleRate=Cfg.DecCfg.defSampleRate;
-		config->downMatrix=Cfg.DecCfg.downMatrix;
-		config->useOldADTSFormat=Cfg.DecCfg.useOldADTSFormat;
-		config->dontUpSampleImplicitSBR=1;
-	}
-	else
-	{
-		config->defObjectType=LC;
-		config->outputFormat=FAAD_FMT_16BIT;
-		config->defSampleRate=44100;
-		config->downMatrix=0;
-		config->useOldADTSFormat=0;
-		config->dontUpSampleImplicitSBR=1;
-	}
-	faacDecSetConfiguration(hDecoder, config);
-}
-// -----------------------------------------------------------------------------------------------
-
-void Cfaad::setDefaultFaadCfg(faacDecHandle hDecoder, BOOL showDlg)
-{
-	if(showDlg && ShowDlg4RawAAC)
-		ShowDlg4RawAAC();
-
-CMyDecCfg Cfg(false);
-	setFaadCfg(hDecoder,Cfg);
-}
-// -----------------------------------------------------------------------------------------------
-
-void Cfaad::DisplayError(char *ProcName, char *str)
-{
-MYINPUT *mi;
-char buf100="";
-
-	GlobalUnlock(hInput); // it wasn't done in getInfos()
-	GLOBALLOCK(mi,hInput,MYINPUT,return);
-
-	if(ProcName && *ProcName)
-		sprintf(buf,"%s: ", ProcName);
-	if(str && *str)
-		strcat(buf,str);
-	if(*buf && str)
-		MessageBox(0, buf, APP_NAME " plugin", MB_OK|MB_ICONSTOP);
-
-	mi->bytes_into_buffer=-1;
-	GlobalUnlock(hInput);
-}
-// *********************************************************************************************
-
-HANDLE Cfaad::getInfos(LPSTR lpstrFilename)
-{
-MYINPUT *mi;
-
-// test tags
-//CMyDecCfg cfg;	cfg.Tag.ReadMp4Tag(lpstrFilename);
-//CMyDecCfg cfg;	cfg.Tag.ReadAacTag(lpstrFilename);
-
-	GLOBALLOCK(mi,hInput,MYINPUT,return NULL);
-
-//	mi->IsAAC=strcmpi(lpstrFilename+lstrlen(lpstrFilename)-4,".aac")==0;
-	if((mi->IsMP4=IsMP4(lpstrFilename))==-1)
-		return ERROR_getInfos("Error opening file");
-
-	if(mi->IsMP4) // MP4 file ---------------------------------------------------------------------
-	{
-	MP4Duration			length;
-	unsigned __int32	buffer_size;
-	DWORD				timeScale;
-	BYTE				sf;
-    mp4AudioSpecificConfig mp4ASC;
-
-		if(!(mi->mp4File=MP4Read(lpstrFilename, 0)))
-			return ERROR_getInfos("Error opening file");
-
-		if((mi->track=GetAACTrack(mi->mp4File))<0)
-			return ERROR_getInfos(0); //"Unable to find correct AAC sound track");
-
-		if(!(mi->hDecoder=faacDecOpen()))
-			return ERROR_getInfos("Error initializing decoder library");
-
-		MP4GetTrackESConfiguration(mi->mp4File, mi->track, (unsigned __int8 **)&mi->buffer, &buffer_size);
-		if(!mi->buffer)
-			return ERROR_getInfos("MP4GetTrackESConfiguration()");
-		AudioSpecificConfig(mi->buffer, buffer_size, &mp4ASC);
-
-        timeScale = mp4ASC.samplingFrequency;
-        mi->Channels=mp4ASC.channelsConfiguration;
-        sf = mp4ASC.samplingFrequencyIndex;
-        mi->type = mp4ASC.objectTypeIndex;
-//        mi->SBR=mp4ASC.sbr_present_flag;
-
-		if(faacDecInit2(mi->hDecoder, mi->buffer, buffer_size, &mi->Samprate, &mi->Channels) < 0)
-			return ERROR_getInfos("Error initializing decoder library");
-		FREE_ARRAY(mi->buffer);
-
-		length=MP4GetTrackDuration(mi->mp4File, mi->track);
-		mi->len_ms=(DWORD)MP4ConvertFromTrackDuration(mi->mp4File, mi->track, length, MP4_MSECS_TIME_SCALE);
-		mi->file_info.bitrate=MP4GetTrackBitRate(mi->mp4File, mi->track);
-		mi->file_info.version=MP4GetTrackAudioType(mi->mp4File, mi->track)==MP4_MPEG4_AUDIO_TYPE ? 4 : 2;
-		mi->numSamples=MP4GetTrackNumberOfSamples(mi->mp4File, mi->track);
-		mi->sampleId=1;
-
-		mi->IsSeekable=true;
-		mi->LockSeeking=!mi->IsSeekable;
-	}
-	else // AAC file ------------------------------------------------------------------------------
-	{   
-	DWORD			read,
-					tmp;
-	BYTE			Channels4Raw=0;
-
-		if(!(mi->aacFile=fopen(lpstrFilename,"rb")))
-			return ERROR_getInfos("Error opening file"); 
-
-		// use bufferized stream
-		setvbuf(mi->aacFile,NULL,_IOFBF,32767);
-
-		// get size of file
-		fseek(mi->aacFile, 0, SEEK_END);
-		mi->src_size=ftell(mi->aacFile);
-		fseek(mi->aacFile, 0, SEEK_SET);
-
-		if(!(mi->buffer=(BYTE *)malloc(FAAD_STREAMSIZE)))
-			return ERROR_getInfos("Memory allocation error: mi->buffer");
-
-		tmp=mi->src_size<FAAD_STREAMSIZE ? mi->src_size : FAAD_STREAMSIZE;
-		read=fread(mi->buffer, 1, tmp, mi->aacFile);
-		if(read==tmp)
-		{
-			mi->bytes_read=read;
-			mi->bytes_into_buffer=read;
-		}
-		else
-			return ERROR_getInfos("Read failed!");
-
-		// skip Tag
-	long tagsize;
-		if(tagsize=id3v2_TagSize(mi->buffer))
-		{
-			if(tagsize>(long)mi->src_size)
-				ERROR_getInfos("Corrupt stream!");
-			if(tagsize<mi->bytes_into_buffer)
-			{
-				mi->bytes_into_buffer-=tagsize;
-				memcpy(mi->buffer,mi->buffer+tagsize,mi->bytes_into_buffer);
-			}
-			else
-			{
-				mi->bytes_read=tagsize;
-				mi->bytes_into_buffer=0;
-				if(tagsize>mi->bytes_into_buffer)
-					fseek(mi->aacFile, tagsize, SEEK_SET);
-			}
-			if(mi->src_size<mi->bytes_read+FAAD_STREAMSIZE-mi->bytes_into_buffer)
-				tmp=mi->src_size-mi->bytes_read;
-			else
-				tmp=FAAD_STREAMSIZE-mi->bytes_into_buffer;
-			read=fread(mi->buffer+mi->bytes_into_buffer, 1, tmp, mi->aacFile);
-			if(read==tmp)
-			{
-				mi->bytes_read+=read;
-				mi->bytes_into_buffer+=read;
-			}
-			else
-				ERROR_getInfos("Read failed!");
-		}
-
-		if(get_AAC_format(lpstrFilename, &mi->file_info, &mi->seek_table, &mi->seek_table_length, 0))
-			ERROR_getInfos("get_AAC_format()");
-		mi->IsSeekable=mi->file_info.headertype==ADTS && mi->seek_table && mi->seek_table_length>0;
-		mi->LockSeeking=!mi->IsSeekable;
-/*
-	aac_buffer	b;
-	float		fLength;
-	DWORD		headertype;
-		b.infile=mi->aacFile;
-		b.buffer=mi->buffer;
-	    b.bytes_into_buffer=read;
-		b.bytes_consumed=mi->bytes_consumed;
-		b.file_offset=0;
-		b.at_eof=(read!=tmp) ? 1 : 0;
-		GetAACInfos(&b,&headertype,&fLength,&mi->file_info.bitrate,mi->src_size);
-		mi->file_info.bitrate*=1024;
-		mi->file_info.headertype=headertype;
-        mi->bytes_into_buffer=b.bytes_into_buffer;
-        mi->bytes_consumed=b.bytes_consumed;
-		IsSeekable=false; // only mp4 can be seeked
-*/
-		if(!mi->FindBitrate) // open a new instance to get info from decoder
-		{
-		MYINPUT *miTmp;
-		Cfaad	*NewInst;
-			if(!(NewInst=new Cfaad()))
-				return ERROR_getInfos("Memory allocation error: NewInst");
-
-			GLOBALLOCK(miTmp,NewInst->hInput,MYINPUT,return 0);
-			miTmp->FindBitrate=TRUE;
-			NewInst->ShowDlg4RawAAC=ShowDlg4RawAAC;
-			NewInst->pCfg=pCfg;
-			if(!NewInst->getInfos(lpstrFilename))
-				return ERROR_getInfos(0);
-			mi->Channels=miTmp->frameInfo.channels;
-			if(mi->file_info.headertype==RAW)
-				mi->file_info.bitrate=miTmp->file_info.bitrate;//*mi->Channels;
-			mi->Samprate=miTmp->Samprate;
-			mi->file_info.headertype=miTmp->file_info.headertype;
-			mi->file_info.object_type=miTmp->file_info.object_type;
-			mi->file_info.version=miTmp->file_info.version;
-			GlobalUnlock(NewInst->hInput);
-			delete NewInst;
-		}
-
-		if(!(mi->hDecoder=faacDecOpen()))
-			return ERROR_getInfos("Can't open library");
-		if(mi->file_info.headertype==RAW)
-			if(pCfg)
-				setFaadCfg(mi->hDecoder,*pCfg);
-			else
-				setDefaultFaadCfg(mi->hDecoder,mi->FindBitrate);
-	BYTE Channels; // faacDecInit doesn't report correctly the number of channels in raw aac files
-		if((mi->bytes_consumed=faacDecInit(mi->hDecoder, mi->buffer, mi->bytes_into_buffer, &mi->Samprate, &Channels))<0)
-			return ERROR_getInfos("faacDecInit()");
-		mi->bytes_into_buffer-=mi->bytes_consumed;
-
-		if(mi->FindBitrate) // get info from decoder
-		{
-		DWORD	Samples,
-				BytesConsumed;
-
-			if(!processData(hInput,0,0))
-				return ERROR_getInfos(0);
-			Samples=mi->frameInfo.samples/sizeof(short);
-			BytesConsumed=mi->frameInfo.bytesconsumed;
-			if(mi->file_info.headertype==RAW || !mi->file_info.bitrate)
-				mi->file_info.bitrate=(BytesConsumed*8*mi->Samprate)/(Samples*2);
-			if(!mi->file_info.bitrate)
-				return ERROR_getInfos("Can't determine the bitrate");
-		}
-
-		mi->len_ms=(DWORD)((mi->src_size<<3)/(mi->file_info.bitrate>>10));
-//		mi->len_ms=(DWORD)((1000*((float)mi->src_size*8))/mi->file_info.bitrate);
-	}
-
-	if(mi->len_ms)
-		mi->dst_size=(DWORD)(mi->len_ms*((float)mi->Samprate/1000)*mi->Channels*(mi->BitsPerSample/8));
-	else
-		return ERROR_getInfos("Can't determine the length");
-
-	showInfo(mi);
-
-	GlobalUnlock(hInput);
-    return hInput;
-}
-// *********************************************************************************************
-
-int Cfaad::processData(HANDLE hInput, unsigned char far *bufout, long lBytes)
-{
-BYTE	*buffer;
-DWORD	BytesDecoded=0;
-char	*sample_buffer=0;
-int		read;
-MYINPUT	*mi;
-
-	GLOBALLOCK(mi,hInput,MYINPUT,return 0);
-
-	if(mi->LockSeeking)
-	{
-		NoSeek();
-		mi->LockSeeking=false;
-	}
-
-	if(mi->IsMP4) // MP4 file --------------------------------------------------------------------------
-	{   
-	unsigned __int32 buffer_size=0;
-    int rc;
-
-		if(newpos_ms>-1)
-		{
-		MP4Duration duration=MP4ConvertToTrackDuration(mi->mp4File,mi->track,newpos_ms,MP4_MSECS_TIME_SCALE);
-		MP4SampleId sampleId=MP4GetSampleIdFromTime(mi->mp4File,mi->track,duration,0);
-			mi->bytes_read=(DWORD)(((float)newpos_ms*mi->file_info.bitrate)/(8*1000));
-			if(seek(mi->bytes_read))  // update the slider
-				return ERROR_processData(0);
-			newpos_ms=-1;
-		}
-		do
-		{
-			buffer=NULL;
-			if(mi->sampleId>=mi->numSamples)
-				return ERROR_processData(0);
-
-			rc=MP4ReadSample(mi->mp4File, mi->track, mi->sampleId++, (unsigned __int8 **)&buffer, &buffer_size, NULL, NULL, NULL, NULL);
-			if(rc==0 || buffer==NULL)
-			{
-				FREE_ARRAY(buffer);
-				return ERROR_processData("MP4ReadSample()");
-			}
-
-			sample_buffer=(char *)faacDecDecode(mi->hDecoder,&mi->frameInfo,buffer,buffer_size);
-			BytesDecoded=mi->frameInfo.samples*sizeof(short);
-			if(BytesDecoded>(DWORD)lBytes)
-				BytesDecoded=lBytes;
-			memmove(bufout,sample_buffer,BytesDecoded);
-			FREE_ARRAY(buffer);
-			// to update the slider
-			mi->bytes_read+=buffer_size;
-			if(seek(mi->bytes_read))
-				return ERROR_processData(0);
-		}while(!BytesDecoded && !mi->frameInfo.error);
-	}
-	else // AAC file --------------------------------------------------------------------------
-	{   
-		if(newpos_ms>-1)
-		{
-			if(mi->IsSeekable)
-			{
-			DWORD normalized=mi->len_ms/(mi->seek_table_length-1);
-				if(normalized<1000)
-					normalized=1000;
-				mi->bytes_read=mi->seek_tablenewpos_ms/normalized;
-				fseek(mi->aacFile, mi->bytes_read, SEEK_SET);
-				if(seek(mi->bytes_read))  // update the slider
-					return ERROR_processData(0);
-				mi->bytes_into_buffer=0;
-				mi->bytes_consumed=FAAD_STREAMSIZE;
-			}
-			newpos_ms=-1;
-		}
-		buffer=mi->buffer;
-		do
-		{
-			if(mi->bytes_consumed>0)
-			{
-				if(mi->bytes_into_buffer)
-					memmove(buffer,buffer+mi->bytes_consumed,mi->bytes_into_buffer);
-
-				if(mi->bytes_read<mi->src_size)
-				{
-				int tmp;
-					if(mi->bytes_read+mi->bytes_consumed<mi->src_size)
-						tmp=mi->bytes_consumed;
-					else
-						tmp=mi->src_size-mi->bytes_read;
-					read=fread(buffer+mi->bytes_into_buffer, 1, tmp, mi->aacFile);
-					if(read==tmp)
-					{
-						mi->bytes_read+=read;
-						mi->bytes_into_buffer+=read;
-					}
-				}
-				else
-					if(mi->bytes_into_buffer)
-						memset(buffer+mi->bytes_into_buffer, 0, mi->bytes_consumed);
-
-				mi->bytes_consumed=0;
-
-				if(	(mi->bytes_into_buffer>3 && !memcmp(mi->buffer, "TAG", 3)) ||
-					(mi->bytes_into_buffer>11 && !memcmp(mi->buffer, "LYRICSBEGIN", 11)) ||
-					(mi->bytes_into_buffer>8 && !memcmp(mi->buffer, "APETAGEX", 8)))
-					return ERROR_processData(0);
-			}
-
-			if(mi->bytes_into_buffer<1)
-				if(mi->bytes_read<mi->src_size)
-					return ERROR_processData("Buffer empty!");
-				else
-					return ERROR_processData(0);
-
-			sample_buffer=(char *)faacDecDecode(mi->hDecoder,&mi->frameInfo,buffer,mi->bytes_into_buffer);
-			BytesDecoded=mi->frameInfo.samples*sizeof(short);
-			if(bufout)
-			{
-				if(BytesDecoded>(DWORD)lBytes)
-					BytesDecoded=lBytes;
-				if(sample_buffer && BytesDecoded && !mi->frameInfo.error)
-					memmove(bufout,sample_buffer,BytesDecoded);
-			}
-			else // Data needed to decode Raw files
-			{
-				mi->Channels=mi->frameInfo.channels;
-				mi->file_info.object_type=mi->frameInfo.object_type;
-			}
-		    mi->bytes_consumed+=mi->frameInfo.bytesconsumed;
-			mi->bytes_into_buffer-=mi->bytes_consumed;
-		}while(!BytesDecoded && !mi->frameInfo.error);
-	} // END AAC file --------------------------------------------------------------------------
-
-	if(mi->frameInfo.error)
-		return ERROR_processData((char *)faacDecGetErrorMessage(mi->frameInfo.error));
-
-	showProgress(mi);
-
-	GlobalUnlock(hInput);
-    return BytesDecoded;
-}

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/Cfaad.h Deleted

@@ -1,202 +0,0 @@
-/*
-CFAAC - set of classes to import/export .aac/.mp4 files
-Copyright (C) 2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-#ifndef _Cfaad_H
-#define _Cfaad_H
-
-#include <mp4.h>
-#define HAVE_INT32_T
-#include <faac.h>
-
-#ifdef MAIN
-	#undef MAIN
-#endif
-#ifdef SSR
-	#undef SSR
-#endif
-#ifdef LTP
-	#undef LTP
-#endif
-
-#include <neaacdec.h>
-//#include <faad.h>
-extern "C" {
-	#include <aacinfo.h>    // get_AAC_format()
-}
-#include "Defines.h"
-#include <CRegistry.h>
-#include <CTag.h>
-
-
-
-// *********************************************************************************************
-
-// make this higher to support files with more channels
-#define MAX_CHANNELS 6
-#if FAAD_MIN_STREAMSIZE<2048
-#undef FAAD_MIN_STREAMSIZE
-// 960 for LD or else 1024 (expanded to 2048 for HE-AAC)
-#define FAAD_MIN_STREAMSIZE 2048
-#endif
-
-#define	FAAD_STREAMSIZE	(FAAD_MIN_STREAMSIZE*MAX_CHANNELS)
-
-// -----------------------------------------------------------------------------------------------
-
-#define REG_DEFAULT "Default"
-#define REG_PROFILE "Profile"
-#define REG_SAMPLERATE "SampleRate"
-#define REG_BPS "Bps"
-#define REG_DOWNMATRIX "Downmatrix"
-#define REG_OLDADTS "Old ADTS"
-#define REG_DONTUPSAMPLESBR "Don\'t upsample implicit SBR"
-
-// *********************************************************************************************
-
-
-
-/* FAAD file buffering routines */
-/*typedef struct {
-    long bytes_into_buffer;
-    long bytes_consumed;
-    long file_offset;
-    unsigned char *buffer;
-    int at_eof;
-    FILE *infile;
-} aac_buffer;
-// -----------------------------------------------------------------------------------------------
-
-typedef struct {
-    int version;
-    int channels;
-    int sampling_rate;
-    int bitrate;
-    int length;
-    int object_type;
-    int headertype;
-} faadAACInfo;
-*/
-
-// *********************************************************************************************
-
-class CMyDecCfg
-{
-private:
-
-	bool SaveCfgOnDestroy;
-
-public:
-
-	CMyDecCfg(bool SaveOnDestroy=true) { getCfg(this); SaveCfgOnDestroy=SaveOnDestroy; }
-	virtual ~CMyDecCfg() { if(SaveCfgOnDestroy) setCfg(this); FreeCfg(this); }
-
-	void FreeCfg(CMyDecCfg *cfg) { cfg->Tag.FreeTag(); }
-	void FreeCfg() { this->Tag.FreeTag(); }
-	void getCfg(CMyDecCfg *cfg);
-	void getCfg() { getCfg(this); }
-	void setCfg(CMyDecCfg *cfg);
-	void setCfg() { setCfg(this); }
-
-	bool					DefaultCfg;
-	BYTE					Channels;
-	DWORD					BitRate;
-	faacDecConfiguration	DecCfg;
-	CMP4Tag					Tag;
-};
-// -----------------------------------------------------------------------------------------------
-
-typedef struct input_tag // any special vars associated with input file
-{
-//MP4
-MP4FileHandle	mp4File;
-MP4SampleId		sampleId,
-				numSamples;
-int				track;
-BYTE			type;
-
-//AAC
-FILE			*aacFile;
-DWORD			src_size;		// size of compressed file
-long			tagsize;
-DWORD			bytes_read;		// from file
-long			bytes_consumed;	// from buffer by faadDecDecode
-long			bytes_into_buffer;
-unsigned char	*buffer;
-DWORD			*seek_table;
-int				seek_table_length;
-
-// Raw AAC
-BOOL			FindBitrate;
-
-// GLOBAL
-faacDecHandle	hDecoder;
-faadAACInfo		file_info;
-faacDecFrameInfo	frameInfo;
-DWORD			len_ms;			// length of file in milliseconds
-BYTE			Channels;
-DWORD			Samprate;
-WORD			BitsPerSample;
-DWORD			dst_size;		// size of decoded file. Cooledit needs it to update its progress bar
-//char			*src_name;		// name of compressed file
-int				IsMP4;
-bool			LockSeeking,
-				IsSeekable;
-} MYINPUT;
-// -----------------------------------------------------------------------------------------------
-
-class Cfaad
-{
-private:
-	virtual int GetAACTrack(MP4FileHandle infile);
-	long id3v2_TagSize(unsigned char *buffer);
-/*	long id3v2_TagSize(aac_buffer *b);
-	int fill_buffer(aac_buffer *b);
-	void advance_buffer(aac_buffer *b, int bytes);
-	int adts_parse(aac_buffer *b, int *bitrate, float *length);
-	void GetAACInfos(aac_buffer *b, DWORD *header_type, float *song_length, int *pbitrate, long filesize);
-*/
-	virtual void DisplayError(char *ProcName, char *str);
-	virtual HANDLE ERROR_getInfos(char *str) { DisplayError("getInfos", str); return NULL; }
-	virtual int ERROR_processData(char *str) { DisplayError("processData", str); return 0; }
-	virtual void showInfo(MYINPUT *mi) {}
-	virtual void showProgress(MYINPUT *mi) {}
-	virtual void setDefaultFaadCfg(faacDecHandle hDecoder, BOOL showDlg);
-	virtual void setFaadCfg(faacDecHandle hDecoder, CMyDecCfg Cfg);
-	virtual int seek(int newpos_bytes) { return 0; } // !=0 => error
-	virtual void NoSeek() {} // put here the code to block seeking of player
-
-public:
-    Cfaad(HANDLE hInput=NULL);
-    virtual ~Cfaad();
-
-	int (*ShowDlg4RawAAC)(); // set this to show your dialog (to decode raw aac files)
-	int IsMP4(LPSTR lpstrFilename);
-	inline bool CanSeek() { MYINPUT	*mi; GLOBALLOCK(mi,hInput,MYINPUT,return 0); bool IsSeekable=mi->IsSeekable; GlobalUnlock(hInput); return IsSeekable; }
-//	virtual void GetAACInfos(char *Filename, aac_buffer *b, DWORD *header_type, float *song_length, int *pbitrate);
-    virtual HANDLE getInfos(LPSTR lpstrFilename);
-    virtual int processData(HANDLE hInput, unsigned char far *bufout, long lBytes);
-
-// GLOBAL
-	long            newpos_ms; // set this to change position
-	HANDLE			hInput;
-	CMyDecCfg		*pCfg; // set this to use your cfg (to decode raw aac files)
-};
-#endif

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/DecDialog.cpp Deleted

@@ -1,214 +0,0 @@
-/*
-CFAAC - set of classes to import/export .aac/.mp4 files
-Copyright (C) 2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-#include <windows.h>
-#include "resource.h"
-#include <Defines.h>	// my defines
-#include "Cfaad.h"
-#include "DecDialog.h"
-#include "EncDialog.h"
-
-// *********************************************************************************************
-
-extern HINSTANCE hInstance;
-extern HBITMAP hBmBrowse;
-
-// -----------------------------------------------------------------------------------------------
-
-#ifndef FAAD_FMT_64BIT
-#define FAAD_FMT_64BIT 5
-#endif
-
-// *********************************************************************************************
-
-int ShowDlg4RawAAC()
-{
-	return DialogBoxParam((HINSTANCE)hInstance,(LPCSTR)MAKEINTRESOURCE(IDD_DECODER),(HWND)NULL, (DLGPROC)DialogMsgProcDec, 0);
-//	return DialogBoxParam((HINSTANCE)hInstance,(LPCSTR)MAKEINTRESOURCE(IDD_DECODER),(HWND)hWnd, (DLGPROC)DialogMsgProcDec, (DWORD)&cfg);
-}
-
-// *********************************************************************************************
-
-#define INIT_CB(hWnd,nID,list,IdSelected) \
-{ \
-	for(int i=0; listi; i++) \
-		SendMessage(GetDlgItem(hWnd, nID), CB_ADDSTRING, 0, (LPARAM)listi); \
-	SendMessage(GetDlgItem(hWnd, nID), CB_SETCURSEL, IdSelected, 0); \
-}
-// -----------------------------------------------------------------------------------------------
-
-//	EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_SSR), Enabled);
-#define DISABLE_CTRLS_DEC(Enabled) \
-{ \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_MAIN), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_LOW), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_LTP), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_CHK_DOWNMATRIX), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_CHK_OLDADTS), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_CB_SAMPLERATE), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_CB_BITSPERSAMPLE), Enabled); \
-}
-// -----------------------------------------------------------------------------------------------
-
-BOOL DialogMsgProcDec(HWND hWndDlg, UINT Message, WPARAM wParam, LPARAM lParam)
-{
-	switch(Message)
-	{
-	case WM_INITDIALOG:
-		{
-/*			if(!lParam)
-			{
-				MessageBox(hWndDlg,"Pointer==NULL",0,MB_OK|MB_ICONSTOP);
-				EndDialog(hWndDlg, 0);
-				return TRUE;
-			}
-*/
-		char buf50;
-		char	*SampleRate={"6000","8000","16000","22050","32000","44100","48000","64000","88200","96000","192000",0},
-				*BitsPerSample={"16","24","32","32 bit FLOAT","64 bit FLOAT",0};
-		CMyDecCfg cfg(false);
-
-			SetWindowPos(GetDlgItem(hWndDlg,IDC_CHK_DEFAULTCFG),GetDlgItem(hWndDlg,IDC_GRP_DEFAULT),0,0,0,0,SWP_NOMOVE | SWP_NOSIZE);
-
-			INIT_CB(hWndDlg,IDC_CB_BITSPERSAMPLE,BitsPerSample,0);
-			INIT_CB(hWndDlg,IDC_CB_SAMPLERATE,SampleRate,5);
-			sprintf(buf,"%lu",cfg.DecCfg.defSampleRate);
-			SetDlgItemText(hWndDlg, IDC_CB_SAMPLERATE, buf);
-
-			switch(cfg.DecCfg.defObjectType)
-			{
-			case MAIN:
-				CheckDlgButton(hWndDlg,IDC_RADIO_MAIN,TRUE);
-				break;
-			case LC:
-				CheckDlgButton(hWndDlg,IDC_RADIO_LOW,TRUE);
-				break;
-			case SSR:
-				CheckDlgButton(hWndDlg,IDC_RADIO_SSR,TRUE);
-				break;
-			case LTP:
-				CheckDlgButton(hWndDlg,IDC_RADIO_LTP,TRUE);
-				break;
-			case HE_AAC:
-				CheckDlgButton(hWndDlg,IDC_RADIO_HE,TRUE);
-				break;
-			}
-
-			switch(cfg.DecCfg.outputFormat)
-			{
-			case FAAD_FMT_16BIT:
-				SendMessage(GetDlgItem(hWndDlg, IDC_CB_BITSPERSAMPLE), CB_SETCURSEL, 0, 0);
-				break;
-			case FAAD_FMT_24BIT:
-				SendMessage(GetDlgItem(hWndDlg, IDC_CB_BITSPERSAMPLE), CB_SETCURSEL, 1, 0);
-				break;
-			case FAAD_FMT_32BIT:
-				SendMessage(GetDlgItem(hWndDlg, IDC_CB_BITSPERSAMPLE), CB_SETCURSEL, 2, 0);
-				break;
-			case FAAD_FMT_FLOAT:
-				SendMessage(GetDlgItem(hWndDlg, IDC_CB_BITSPERSAMPLE), CB_SETCURSEL, 3, 0);
-				break;
-			case FAAD_FMT_64BIT:
-				SendMessage(GetDlgItem(hWndDlg, IDC_CB_BITSPERSAMPLE), CB_SETCURSEL, 4, 0);
-				break;
-			}
-
-			CheckDlgButton(hWndDlg,IDC_CHK_DOWNMATRIX, cfg.DecCfg.downMatrix);
-			CheckDlgButton(hWndDlg,IDC_CHK_OLDADTS, cfg.DecCfg.useOldADTSFormat);
-
-			CheckDlgButton(hWndDlg,IDC_CHK_DEFAULTCFG, cfg.DefaultCfg);
-			DISABLE_CTRLS_DEC(!cfg.DefaultCfg);
-		}
-		break; // End of WM_INITDIALOG                                 
-
-	case WM_CLOSE:
-		// Closing the Dialog behaves the same as Cancel               
-		PostMessage(hWndDlg, WM_COMMAND, IDCANCEL, 0);
-		break; // End of WM_CLOSE                                      
-
-	case WM_COMMAND:
-		switch(LOWORD(wParam))
-		{
-		case IDC_CHK_DEFAULTCFG:
-			{
-			char Enabled=!IsDlgButtonChecked(hWndDlg,IDC_CHK_DEFAULTCFG);
-				DISABLE_CTRLS_DEC(Enabled);
-			}
-			break;
-
-		case IDOK:
-			{
-		CMyDecCfg cfg;
-				if(IsDlgButtonChecked(hWndDlg,IDC_RADIO_MAIN))
-					cfg.DecCfg.defObjectType=MAIN;
-				if(IsDlgButtonChecked(hWndDlg,IDC_RADIO_LOW))
-					cfg.DecCfg.defObjectType=LC;
-				if(IsDlgButtonChecked(hWndDlg,IDC_RADIO_SSR))
-					cfg.DecCfg.defObjectType=SSR;
-				if(IsDlgButtonChecked(hWndDlg,IDC_RADIO_LTP))
-					cfg.DecCfg.defObjectType=LTP;
-				if(IsDlgButtonChecked(hWndDlg,IDC_RADIO_HE))
-					cfg.DecCfg.defObjectType=HE_AAC;
-				switch(SendMessage(GetDlgItem(hWndDlg, IDC_CB_BITSPERSAMPLE), CB_GETCURSEL, 0, 0))
-				{
-				case 0:
-					cfg.DecCfg.outputFormat=FAAD_FMT_16BIT;
-					break;
-				case 1:
-					cfg.DecCfg.outputFormat=FAAD_FMT_24BIT;
-					break;
-				case 2:
-					cfg.DecCfg.outputFormat=FAAD_FMT_32BIT;
-					break;
-				case 3:
-					cfg.DecCfg.outputFormat=FAAD_FMT_FLOAT;
-					break;
-				case 4:
-					cfg.DecCfg.outputFormat=FAAD_FMT_64BIT;
-					break;
-				}
-
-				cfg.DecCfg.defSampleRate=GetDlgItemInt(hWndDlg, IDC_CB_SAMPLERATE, 0, FALSE);
-				cfg.DecCfg.downMatrix=IsDlgButtonChecked(hWndDlg,IDC_CHK_DOWNMATRIX) ? TRUE : FALSE;
-				cfg.DecCfg.useOldADTSFormat=IsDlgButtonChecked(hWndDlg,IDC_CHK_OLDADTS) ? TRUE : FALSE;
-				cfg.DefaultCfg=IsDlgButtonChecked(hWndDlg,IDC_CHK_DEFAULTCFG) ? TRUE : FALSE;
-
-				EndDialog(hWndDlg, (DWORD)TRUE);
-			}
-			break;
-
-        case IDCANCEL:
-			// Ignore data values entered into the controls        
-			// and dismiss the dialog window returning FALSE
-			EndDialog(hWndDlg, (DWORD)FALSE);
-			break;
-
-		case IDC_BTN_ABOUT:
-				DialogBox((HINSTANCE)hInstance,(LPCSTR)MAKEINTRESOURCE(IDD_ABOUT), (HWND)hWndDlg, (DLGPROC)DialogMsgProcAbout);
-			break;
-		}
-		break; // End of WM_COMMAND
-	default: 
-		return FALSE;
-	}
- 
-	return TRUE;
-}

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/DecDialog.h Deleted

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/Email.bmp Deleted

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/EncDialog.cpp Deleted

@@ -1,944 +0,0 @@
-/*
-CFAAC - set of classes to import/export .aac/.mp4 files
-Copyright (C) 2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-#include <windows.h>
-#include <shlobj.h>		// Browse
-#include <shellapi.h>	// ShellExecute
-#include <Commdlg.h>
-#include "resource.h"
-#include "Defines.h"	// my defines
-#include "CTag.h"
-#include "Cfaac.h"
-#include "EncDialog.h"
-
-#include <commctrl.h>
-#include <id3v2tag.h>
-#include <..\..\common\id3lib\win32\config.h> // ID3LIB_FULLNAME
-
-// *********************************************************************************************
-
-#ifdef USE_OUTPUT_FOLDER
-extern char	config_AACoutdirMAX_PATH;
-#endif
-
-extern HINSTANCE hInstance;
-extern HBITMAP hBmBrowse;
-
-// *********************************************************************************************
-
-/*
-DWORD PackCfg(MY_ENC_CFG *cfg)
-{
-DWORD dwOptions=0;
-
-	if(cfg->AutoCfg)
-		dwOptions=1<<31;
-	dwOptions|=(DWORD)cfg->EncCfg.mpegVersion<<30;
-	dwOptions|=(DWORD)cfg->EncCfg.aacObjectType<<28;
-	dwOptions|=(DWORD)cfg->EncCfg.allowMidside<<27;
-	dwOptions|=(DWORD)cfg->EncCfg.useTns<<26;
-	dwOptions|=(DWORD)cfg->EncCfg.useLfe<<25;
-	dwOptions|=(DWORD)cfg->EncCfg.outputFormat<<24;
-	if(cfg->UseQuality)
-		dwOptions|=(((DWORD)cfg->EncCfg.quantqual>>1)&0xff)<<16; // 2,512
-	else
-		dwOptions|=(((DWORD)cfg->EncCfg.bitRate>>1)&0xff)<<16; // 2,512
-	if(cfg->UseQuality)
-		dwOptions|=1<<15;
-	dwOptions|=((DWORD)cfg->EncCfg.bandWidth>>1)&&0x7fff; // 0,65536
-
-	return dwOptions;
-}
-// -----------------------------------------------------------------------------------------------
-
-void UnpackCfg(MY_ENC_CFG *cfg, DWORD dwOptions)
-{
-	cfg->AutoCfg=dwOptions>>31;
-	cfg->EncCfg.mpegVersion=(dwOptions>>30)&1;
-	cfg->EncCfg.aacObjectType=(dwOptions>>28)&3;
-	cfg->EncCfg.allowMidside=(dwOptions>>27)&1;
-	cfg->EncCfg.useTns=(dwOptions>>26)&1;
-	cfg->EncCfg.useLfe=(dwOptions>>25)&1;
-	cfg->EncCfg.outputFormat=(dwOptions>>24)&1;
-	cfg->EncCfg.bitRate=((dwOptions>>16)&0xff)<<1;
-	cfg->UseQuality=(dwOptions>>15)&1;
-	cfg->EncCfg.bandWidth=(dwOptions&0x7fff)<<1;
-}*/
-// -----------------------------------------------------------------------------------------------
-
-#define INIT_CB(hWnd,nID,list,FillList,IdSelected) \
-{ \
-	if(FillList) \
-		for(int i=0; listi; i++) \
-			SendMessage(GetDlgItem(hWnd, nID), CB_ADDSTRING, 0, (LPARAM)listi); \
-	SendMessage(GetDlgItem(hWnd, nID), CB_SETCURSEL, IdSelected, 0); \
-}
-// -----------------------------------------------------------------------------------------------
-
-#define INIT_CB_GENRES(hWnd,nID,ID3Genres,IdSelected) \
-{ \
-	for(int i=0; i<(sizeof(ID3Genres)/sizeof(ID3Genres0)); i++) \
-		SendMessage(GetDlgItem(hWnd, nID), CB_ADDSTRING, 0, (LPARAM)ID3Genresi.name); \
-	SendMessage(GetDlgItem(hWnd, nID), CB_SETCURSEL, IdSelected, 0); \
-}
-// -----------------------------------------------------------------------------------------------
-
-#define DISABLE_LTP \
-{ \
-	if(IsDlgButtonChecked(hWndDlg,IDC_RADIO_MPEG2) && \
-	   IsDlgButtonChecked(hWndDlg,IDC_RADIO_LTP)) \
-	{ \
-		CheckDlgButton(hWndDlg,IDC_RADIO_LTP,FALSE); \
-		CheckDlgButton(hWndDlg,IDC_RADIO_MAIN,TRUE); \
-	} \
-    EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_LTP), FALSE); \
-}
-// -----------------------------------------------------------------------------------------------
-
-//        EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_SSR), Enabled);
-//        EnableWindow(GetDlgItem(hWndDlg, IDC_CHK_USELFE), Enabled);
-#define DISABLE_CTRLS_ENC(Enabled) \
-{ \
-	CheckDlgButton(hWndDlg,IDC_CHK_AUTOCFG, !Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_MPEG4), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_MPEG2), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_RAW), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_ADTS), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_CHK_ALLOWMIDSIDE), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_CHK_USETNS), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_CHK_USELFE), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_CB_QUALITY), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_CB_BITRATE), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_CB_BANDWIDTH), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_QUALITY), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_BITRATE), Enabled); \
-    EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_MAIN), Enabled); \
-    EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_LOW), Enabled); \
-    EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_LTP), Enabled); \
-	if(IsDlgButtonChecked(hWndDlg,IDC_RADIO_MPEG4)) \
-		EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_LTP), Enabled); \
-	else \
-		DISABLE_LTP \
-}
-// -----------------------------------------------------------------------------------------------
-
-#define ENABLE_TAG(Enabled) \
-{ \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_ARTIST), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_TITLE), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_ALBUM), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_YEAR), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_CB_GENRE), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_WRITER), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_COMMENT), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_COMPILATION), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_CHK_COMPILATION), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_TRACK), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_NTRACKS), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_DISK), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_NDISKS), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_ARTFILE), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_BTN_ARTFILE), Enabled); \
-}
-// -----------------------------------------------------------------------------------------------
-
-#define ENABLE_AACTAGS(Enabled) \
-{ \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_COMPILATION), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_CHK_COMPILATION), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_NTRACKS), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_DISK), Enabled); \
-	EnableWindow(GetDlgItem(hWndDlg, IDC_E_NDISKS), Enabled); \
-}
-// -----------------------------------------------------------------------------------------------
-
-#ifdef USE_OUTPUT_FOLDER
-static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData)
-{
-	if (uMsg == BFFM_INITIALIZED)
-	{
-		SetWindowText(hwnd,"Select folder");
-		SendMessage(hwnd,BFFM_SETSELECTION,(WPARAM)TRUE,(LPARAM)lpData);
-	}
-	return 0;
-}
-#else
-	#ifdef USE_IMPORT_TAG
-	static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData)
-	{
-		if (uMsg == BFFM_INITIALIZED)
-		{
-			SetWindowText(hwnd,"Select folder");
-			SendMessage(hwnd,BFFM_SETSELECTION,(WPARAM)TRUE,(LPARAM)lpData);
-		}
-		return 0;
-	}
-	#endif
-#endif
-
-// -----------------------------------------------------------------------------------------------
-
-BOOL DialogMsgProcAbout(HWND hWndDlg, UINT Message, WPARAM wParam, LPARAM lParam)
-{
-	switch(Message)
-	{
-	case WM_INITDIALOG:
-		{
-		char buf512;
-		char *faac_id_string, *faac_copyright_string;
-
-		sprintf(buf,
-					APP_NAME " plugin " APP_VER " by Antonio Foranna\n\n"
-					"Libraries used:\n"
-					"\tlibfaac v%s\n"
-					"\tFAAD2 v" FAAD2_VERSION "\n"
-					"\t" MPEG4IP_PACKAGE " v" MPEG4IP_VERSION "\n"
-					"\t" ID3LIB_FULLNAME "\n\n"
-					"This code is given with FAAC package and does not contain executables.\n"
-					"This program is free software and can be distributed/modifyed under the terms of the GNU General Public License.\n"
-					"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY.\n\n"
-					"Compiled on %s\n",
-				(faacEncGetVersion(&faac_id_string, &faac_copyright_string)==FAAC_CFG_VERSION) ? faac_id_string : " wrong libfaac version",
-					__DATE__
-					);
-			SetDlgItemText(hWndDlg, IDC_L_ABOUT, buf);
-		}
-		break;
-	case WM_COMMAND:
-		switch(LOWORD(wParam))
-		{
-		case IDOK:
-			EndDialog(hWndDlg, TRUE);
-			break;
-        case IDCANCEL:
-			// Ignore data values entered into the controls and dismiss the dialog window returning FALSE
-			EndDialog(hWndDlg, FALSE);
-			break;
-		case IDC_AUDIOCODING:
-			ShellExecute(hWndDlg, NULL, "http://www.audiocoding.com", NULL, NULL, SW_SHOW);
-			break;
-		case IDC_MPEG4IP:
-			ShellExecute(hWndDlg, NULL, "http://www.mpeg4ip.net", NULL, NULL, SW_SHOW);
-			break;
-		case IDC_ID3:
-			ShellExecute(hWndDlg, NULL, "http://id3lib.sourceforge.net", NULL, NULL, SW_SHOW);
-			break;
-		case IDC_EMAIL:
-			ShellExecute(hWndDlg, NULL, "mailto:ntnfrn_email-temp@yahoo.it", NULL, NULL, SW_SHOW);
-			break;
-		}
-		break;
-	default: 
-		return FALSE;
-	}
-
-	return TRUE;
-}
-// -----------------------------------------------------------------------------------------------
-
-// ripped from id3v2tag.c
-ID3GENRES ID3Genres=
-{
-    123,    "Acapella",
-    34,     "Acid",
-    74,     "Acid Jazz",
-    73,     "Acid Punk",
-    99,     "Acoustic",
-    20,     "Alternative",
-    40,     "AlternRock",
-    26,     "Ambient",
-    90,     "Avantgarde",
-    116,    "Ballad",
-    41,     "Bass",
-    85,     "Bebob",
-    96,     "Big Band",
-    89,     "Bluegrass",
-    0,      "Blues",
-    107,    "Booty Bass",
-    65,     "Cabaret",
-    88,     "Celtic",
-    104,    "Chamber Music",
-    102,    "Chanson",
-    97,     "Chorus",
-    61,     "Christian Rap",
-    1,      "Classic Rock",
-    32,     "Classical",
-    112,    "Club",
-    57,     "Comedy",
-    2,      "Country",
-    58,     "Cult",
-    3,      "Dance",
-    125,    "Dance Hall",
-    50,     "Darkwave",
-    254,    "Data",
-    22,     "Death Metal",
-    4,      "Disco",
-    55,     "Dream",
-    122,    "Drum Solo",
-    120,    "Duet",
-    98,     "Easy Listening",
-    52,     "Electronic",
-    48,     "Ethnic",
-    124,    "Euro-House",
-    25,     "Euro-Techno",
-    54,     "Eurodance",
-    84,     "Fast Fusion",
-    80,     "Folk",
-    81,     "Folk-Rock",
-    115,    "Folklore",
-    119,    "Freestyle",
-    5,      "Funk",
-    30,     "Fusion",
-    36,     "Game",
-    59,     "Gangsta",
-    38,     "Gospel",
-    49,     "Gothic",
-    91,     "Gothic Rock",
-    6,      "Grunge",
-    79,     "Hard Rock",
-    7,      "Hip-Hop",
-    35,     "House",
-    100,    "Humour",
-    19,     "Industrial",
-    33,     "Instrumental",
-    46,     "Instrumental Pop",
-    47,     "Instrumental Rock",
-    8,      "Jazz",
-    29,     "Jazz+Funk",
-    63,     "Jungle",
-    86,     "Latin",
-    71,     "Lo-Fi",
-    45,     "Meditative",
-    9,      "Metal",
-    77,     "Musical",
-    82,     "National Folk",
-    64,     "Native American",
-    10,     "New Age",
-    66,     "New Wave",
-    39,     "Noise",
-    255,    "Not Set",
-    11,     "Oldies",
-    103,    "Opera",
-    12,     "Other",
-    75,     "Polka",
-    13,     "Pop",
-    62,     "Pop/Funk",
-    53,     "Pop-Folk",
-    109,    "Porn Groove",
-    117,    "Power Ballad",
-    23,     "Pranks",
-    108,    "Primus",
-    92,     "Progressive Rock",
-    67,     "Psychadelic",
-    93,     "Psychedelic Rock",
-    43,     "Punk",
-    121,    "Punk Rock",
-    14,     "R&B",
-    15,     "Rap",
-    68,     "Rave",
-    16,     "Reggae",
-    76,     "Retro",
-    87,     "Revival",
-    118,    "Rhythmic Soul",
-    17,     "Rock",
-    78,     "Rock & Roll",
-    114,    "Samba",
-    110,    "Satire",
-    69,     "Showtunes",
-    21,     "Ska",
-    111,    "Slow Jam",
-    95,     "Slow Rock",
-    105,    "Sonata",
-    42,     "Soul",
-    37,     "Sound Clip",
-    24,     "Soundtrack",
-    56,     "Southern Rock",
-    44,     "Space",
-    101,    "Speech",
-    83,     "Swing",
-    94,     "Symphonic Rock",
-    106,    "Symphony",
-    113,    "Tango",
-    18,     "Techno",
-    51,     "Techno-Industrial",
-    60,     "Top 40",
-    70,     "Trailer",
-    31,     "Trance",
-    72,     "Tribal",
-    27,     "Trip-Hop",
-    28,     "Vocal"
-};
-
-BOOL CALLBACK DIALOGMsgProcEnc(HWND hWndDlg, UINT Message, WPARAM wParam, LPARAM lParam)
-{
-	switch(Message)
-	{
-	case WM_INITDIALOG:
-		{
-		char buf50;
-		char FillList=wParam||lParam ? 1 : 0;
-		char *Quality={"Default (100)","10","20","30","40","50","60","70","80","90","100","110","120","130","140","150","200","300","400","500",0};
-		char *BitRate={"Auto","8","16","18","20","24","32","40","48","56","64","80","96","112","128","160","192","224","256","320","384",0};
-		char *BandWidth={"Auto","Full","4000","8000","11025","16000","22050","24000","32000","44100","48000",0};
-		char *Ext={".aac",".mp4",".m4a",".m4b",0};
-		CMyEncCfg cfg(false);
-			
-//			sprintf(Quality0+8,"%3d",3);
-
-			SetWindowPos(GetDlgItem(hWndDlg,IDC_CHK_TAG),GetDlgItem(hWndDlg,IDC_GRP_TAG),0,0,0,0,SWP_NOMOVE | SWP_NOSIZE);
-
-			INIT_CB(hWndDlg,IDC_CB_QUALITY,Quality,FillList,0);
-			INIT_CB(hWndDlg,IDC_CB_BITRATE,BitRate,FillList,0);
-			INIT_CB(hWndDlg,IDC_CB_BANDWIDTH,BandWidth,FillList,0);
-			INIT_CB(hWndDlg,IDC_CB_EXT,Ext,FillList,0);
-
-			INIT_CB_GENRES(hWndDlg,IDC_CB_GENRE,ID3Genres,0);
-
-			SendMessage(GetDlgItem(hWndDlg, IDC_BTN_ARTFILE), BM_SETIMAGE, IMAGE_BITMAP, (LPARAM) hBmBrowse);
-#ifdef USE_OUTPUT_FOLDER			
-			SendMessage(GetDlgItem(hWndDlg, IDC_BTN_BROWSE), BM_SETIMAGE, IMAGE_BITMAP, (LPARAM) hBmBrowse);
-			if(!cfg.OutDir || !*cfg.OutDir)
-			{
-				GetCurrentDirectory(MAX_PATH,config_AACoutdir);
-				FREE_ARRAY(cfg.OutDir);
-				cfg.OutDir=strdup(config_AACoutdir);
-			}
-			else
-				strcpy(config_AACoutdir,cfg.OutDir);
-			SetDlgItemText(hWndDlg, IDC_E_BROWSE, cfg.OutDir);
-#else
-			ShowWindow(GetDlgItem(hWndDlg, IDC_BTN_BROWSE),SW_HIDE);
-			ShowWindow(GetDlgItem(hWndDlg, IDC_E_BROWSE),SW_HIDE);
-			ShowWindow(GetDlgItem(hWndDlg, IDC_L_BROWSE),SW_HIDE);
-#endif
-			CheckDlgButton(hWndDlg,IDC_RADIO_MPEG4,FALSE);
-			CheckDlgButton(hWndDlg,IDC_RADIO_MPEG2,FALSE);
-			if(cfg.EncCfg.mpegVersion==MPEG4)
-				CheckDlgButton(hWndDlg,IDC_RADIO_MPEG4,TRUE);
-			else
-				CheckDlgButton(hWndDlg,IDC_RADIO_MPEG2,TRUE);
-			
-			CheckDlgButton(hWndDlg,IDC_RADIO_MAIN,FALSE);
-			CheckDlgButton(hWndDlg,IDC_RADIO_LOW,FALSE);
-			CheckDlgButton(hWndDlg,IDC_RADIO_SSR,FALSE);
-			CheckDlgButton(hWndDlg,IDC_RADIO_LTP,FALSE);
-			switch(cfg.EncCfg.aacObjectType)
-			{
-			case MAIN:
-				CheckDlgButton(hWndDlg,IDC_RADIO_MAIN,TRUE);
-				break;
-			case LOW:
-				CheckDlgButton(hWndDlg,IDC_RADIO_LOW,TRUE);
-				break;
-			case SSR:
-				CheckDlgButton(hWndDlg,IDC_RADIO_SSR,TRUE);
-				break;
-			case LTP:
-				CheckDlgButton(hWndDlg,IDC_RADIO_LTP,TRUE);
-				DISABLE_LTP
-				break;
-			}
-			
-			CheckDlgButton(hWndDlg,IDC_RADIO_RAW,FALSE);
-			CheckDlgButton(hWndDlg,IDC_RADIO_ADTS,FALSE);
-			switch(cfg.EncCfg.outputFormat)
-			{
-			case RAW:
-				CheckDlgButton(hWndDlg,IDC_RADIO_RAW,TRUE);
-				break;
-			case ADTS:
-				CheckDlgButton(hWndDlg,IDC_RADIO_ADTS,TRUE);
-				break;
-			}
-			
-			CheckDlgButton(hWndDlg, IDC_CHK_ALLOWMIDSIDE, cfg.EncCfg.allowMidside);
-			CheckDlgButton(hWndDlg, IDC_CHK_USETNS, cfg.EncCfg.useTns);
-			CheckDlgButton(hWndDlg, IDC_CHK_USELFE, cfg.EncCfg.useLfe);
-
-			if(cfg.UseQuality)
-				CheckDlgButton(hWndDlg,IDC_RADIO_QUALITY,TRUE);
-			else
-				CheckDlgButton(hWndDlg,IDC_RADIO_BITRATE,TRUE);
-
-			switch(cfg.EncCfg.quantqual)
-			{
-			case 100:
-				SendMessage(GetDlgItem(hWndDlg, IDC_CB_QUALITY), CB_SETCURSEL, 0, 0);
-				break;
-			default:
-				if(cfg.EncCfg.quantqual<10)
-					cfg.EncCfg.quantqual=10;
-				if(cfg.EncCfg.quantqual>500)
-					cfg.EncCfg.quantqual=500;
-				sprintf(buf,"%lu",cfg.EncCfg.quantqual);
-				SetDlgItemText(hWndDlg, IDC_CB_QUALITY, buf);
-				break;
-			}
-			switch(cfg.EncCfg.bitRate)
-			{
-			case 0:
-				SendMessage(GetDlgItem(hWndDlg, IDC_CB_BITRATE), CB_SETCURSEL, 0, 0);
-				break;
-			default:
-				sprintf(buf,"%lu",cfg.EncCfg.bitRate);
-				SetDlgItemText(hWndDlg, IDC_CB_BITRATE, buf);
-				break;
-			}
-			switch(cfg.EncCfg.bandWidth)
-			{
-			case 0:
-				SendMessage(GetDlgItem(hWndDlg, IDC_CB_BANDWIDTH), CB_SETCURSEL, 0, 0);
-				break;
-			case 0xffffffff:
-				SendMessage(GetDlgItem(hWndDlg, IDC_CB_BANDWIDTH), CB_SETCURSEL, 1, 0);
-				break;
-			default:
-				sprintf(buf,"%lu",cfg.EncCfg.bandWidth);
-				SetDlgItemText(hWndDlg, IDC_CB_BANDWIDTH, buf);
-				break;
-			}
-			
-			SendMessage(GetDlgItem(hWndDlg, IDC_CB_EXT), CB_SETCURSEL, cfg.SaveMP4, 0);
-
-			if(wParam|lParam)
-			{
-				CheckDlgButton(hWndDlg,IDC_CHK_AUTOCFG, cfg.AutoCfg);
-				DISABLE_CTRLS_ENC(!cfg.AutoCfg);
-			}
-#ifdef USE_IMPORT_TAG
-			CheckDlgButton(hWndDlg,IDC_CHK_IMPORTTAG, cfg.TagImport);
-			cfg.TagImport=IsDlgButtonChecked(hWndDlg,IDC_CHK_IMPORTTAG) ? 1 : 0;
-			ShowWindow(GetDlgItem(hWndDlg, IDC_CHK_IMPORTTAG),SW_SHOW);
-	#ifdef USE_PATHEXT
-			SetDlgItemText(hWndDlg, IDC_E_SOURCEPATH, cfg.TagSrcPath);
-			SetDlgItemText(hWndDlg, IDC_E_SOURCEEXT, cfg.TagSrcExt);
-			SendMessage(GetDlgItem(hWndDlg, IDC_BTN_BROWSEIMPORT), BM_SETIMAGE, IMAGE_BITMAP, (LPARAM) hBmBrowse);
-			ShowWindow(GetDlgItem(hWndDlg, IDC_E_SOURCEEXT),SW_SHOW);
-			ShowWindow(GetDlgItem(hWndDlg, IDC_E_SOURCEPATH),SW_SHOW);
-			ShowWindow(GetDlgItem(hWndDlg, IDC_BTN_BROWSEIMPORT),SW_SHOW);
-	#endif
-#endif
-			CheckDlgButton(hWndDlg,IDC_CHK_TAG, cfg.TagOn);
-			ENABLE_TAG(cfg.TagOn && !cfg.TagImport);
-			ENABLE_AACTAGS(cfg.TagOn && !cfg.TagImport && cfg.SaveMP4);
-			SetDlgItemText(hWndDlg, IDC_E_ARTIST, cfg.Tag.artist);
-			SetDlgItemText(hWndDlg, IDC_E_TITLE, cfg.Tag.title);
-			SetDlgItemText(hWndDlg, IDC_E_ALBUM, cfg.Tag.album);
-			SetDlgItemText(hWndDlg, IDC_E_YEAR, cfg.Tag.year);
-			SetDlgItemText(hWndDlg, IDC_CB_GENRE, cfg.Tag.genre);
-			SetDlgItemText(hWndDlg, IDC_E_WRITER, cfg.Tag.writer);
-			SetDlgItemText(hWndDlg, IDC_E_COMMENT, cfg.Tag.comment);
-			SetDlgItemText(hWndDlg, IDC_E_ARTFILE, cfg.Tag.artFilename);
-			SetDlgItemInt(hWndDlg, IDC_E_TRACK, cfg.Tag.trackno, FALSE);
-			SetDlgItemInt(hWndDlg, IDC_E_NTRACKS, cfg.Tag.ntracks, FALSE);
-			SetDlgItemInt(hWndDlg, IDC_E_DISK, cfg.Tag.discno, FALSE);
-			SetDlgItemInt(hWndDlg, IDC_E_NDISKS, cfg.Tag.ndiscs, FALSE);
-			SetDlgItemInt(hWndDlg, IDC_E_COMPILATION, cfg.Tag.compilation, FALSE);
-			CheckDlgButton(hWndDlg, IDC_CHK_COMPILATION, cfg.Tag.compilation);
-		}
-		break; // End of WM_INITDIALOG                                 
-		
-	case WM_CLOSE:
-		// Closing the Dialog behaves the same as Cancel               
-		PostMessage(hWndDlg, WM_COMMAND, IDCANCEL, 0L);
-		break; // End of WM_CLOSE                                      
-		
-	case WM_COMMAND:
-		switch(LOWORD(wParam))
-		{
-		case IDOK:
-			{
-//			HANDLE hCfg=(HANDLE)lParam;
-			char buf50;
-			CMyEncCfg cfg;
-
-				cfg.AutoCfg=IsDlgButtonChecked(hWndDlg,IDC_CHK_AUTOCFG) ? TRUE : FALSE;
-				if(!cfg.AutoCfg)
-				{
-					cfg.EncCfg.mpegVersion=IsDlgButtonChecked(hWndDlg,IDC_RADIO_MPEG4) ? MPEG4 : MPEG2;
-					if(IsDlgButtonChecked(hWndDlg,IDC_RADIO_MAIN))
-						cfg.EncCfg.aacObjectType=MAIN;
-					if(IsDlgButtonChecked(hWndDlg,IDC_RADIO_LOW))
-						cfg.EncCfg.aacObjectType=LOW;
-					if(IsDlgButtonChecked(hWndDlg,IDC_RADIO_SSR))
-						cfg.EncCfg.aacObjectType=SSR;
-					if(IsDlgButtonChecked(hWndDlg,IDC_RADIO_LTP))
-						cfg.EncCfg.aacObjectType=LTP;
-					cfg.EncCfg.allowMidside=IsDlgButtonChecked(hWndDlg, IDC_CHK_ALLOWMIDSIDE);
-					cfg.EncCfg.useTns=IsDlgButtonChecked(hWndDlg, IDC_CHK_USETNS);
-					cfg.EncCfg.useLfe=IsDlgButtonChecked(hWndDlg, IDC_CHK_USELFE);
-					
-					GetDlgItemText(hWndDlg, IDC_CB_BITRATE, buf, 50);
-					switch(*buf)
-					{
-					case 'A': // Auto
-						cfg.EncCfg.bitRate=0;
-						break;
-					default:
-						cfg.EncCfg.bitRate=GetDlgItemInt(hWndDlg, IDC_CB_BITRATE, 0, FALSE);
-					}
-					GetDlgItemText(hWndDlg, IDC_CB_BANDWIDTH, buf, 50);
-					switch(*buf)
-					{
-					case 'A': // Auto
-						cfg.EncCfg.bandWidth=0;
-						break;
-					case 'F': // Full
-						cfg.EncCfg.bandWidth=0xffffffff;
-						break;
-					default:
-						cfg.EncCfg.bandWidth=GetDlgItemInt(hWndDlg, IDC_CB_BANDWIDTH, 0, FALSE);
-					}
-					cfg.UseQuality=IsDlgButtonChecked(hWndDlg,IDC_RADIO_QUALITY) ? TRUE : FALSE;
-					GetDlgItemText(hWndDlg, IDC_CB_QUALITY, buf, 50);
-					switch(*buf)
-					{
-					case 'D': // Default
-						cfg.EncCfg.quantqual=100;
-						break;
-					default:
-						cfg.EncCfg.quantqual=GetDlgItemInt(hWndDlg, IDC_CB_QUALITY, 0, FALSE);
-					}
-				}
-
-				cfg.EncCfg.outputFormat=IsDlgButtonChecked(hWndDlg,IDC_RADIO_RAW) ? RAW : ADTS;
-#ifdef USE_OUTPUT_FOLDER
-				GetDlgItemText(hWndDlg, IDC_E_BROWSE, config_AACoutdir, MAX_PATH);
-				FREE_ARRAY(cfg.OutDir);
-				cfg.OutDir=strdup(config_AACoutdir);
-#endif
-				cfg.SaveMP4=(BYTE)SendMessage(GetDlgItem(hWndDlg, IDC_CB_EXT), CB_GETCURSEL, 0, 0);
-
-				cfg.TagOn=IsDlgButtonChecked(hWndDlg,IDC_CHK_TAG) ? 1 : 0;
-			char bufferMAX_PATH;
-#ifdef USE_IMPORT_TAG
-				cfg.TagImport=IsDlgButtonChecked(hWndDlg,IDC_CHK_IMPORTTAG) ? 1 : 0;
-	#ifdef USE_PATHEXT
-				GetDlgItemText(hWndDlg, IDC_E_SOURCEPATH, buffer, MAX_PATH);
-				cfg.TagSrcPath=strdup(buffer);
-				GetDlgItemText(hWndDlg, IDC_E_SOURCEEXT, buffer, MAX_PATH);
-				cfg.TagSrcExt=strdup(buffer);
-	#endif
-#endif
-				GetDlgItemText(hWndDlg, IDC_E_ARTIST, buffer, MAX_PATH);
-				cfg.Tag.artist=strdup(buffer);
-				GetDlgItemText(hWndDlg, IDC_E_TITLE, buffer, MAX_PATH);
-				cfg.Tag.title=strdup(buffer);
-				GetDlgItemText(hWndDlg, IDC_E_ALBUM, buffer, MAX_PATH);
-				cfg.Tag.album=strdup(buffer);
-				GetDlgItemText(hWndDlg, IDC_E_YEAR, buffer, MAX_PATH);
-				cfg.Tag.year=strdup(buffer);
-				GetDlgItemText(hWndDlg, IDC_CB_GENRE, buffer, MAX_PATH);
-				cfg.Tag.genre=strdup(buffer);
-				GetDlgItemText(hWndDlg, IDC_E_WRITER, buffer, MAX_PATH);
-				cfg.Tag.writer=strdup(buffer);
-				GetDlgItemText(hWndDlg, IDC_E_COMMENT, buffer, MAX_PATH);
-				cfg.Tag.comment=strdup(buffer);
-				GetDlgItemText(hWndDlg, IDC_E_ARTFILE, buffer, MAX_PATH);
-				cfg.Tag.artFilename=strdup(buffer);
-				cfg.Tag.trackno=GetDlgItemInt(hWndDlg, IDC_E_TRACK, 0, FALSE);
-				cfg.Tag.ntracks=GetDlgItemInt(hWndDlg, IDC_E_NTRACKS, 0, FALSE);
-				cfg.Tag.discno=GetDlgItemInt(hWndDlg, IDC_E_DISK, 0, FALSE);
-				cfg.Tag.ndiscs=GetDlgItemInt(hWndDlg, IDC_E_NDISKS, 0, FALSE);
-				cfg.Tag.compilation=(BYTE)GetDlgItemInt(hWndDlg, IDC_E_COMPILATION, 0, FALSE);
-				cfg.Tag.compilation=IsDlgButtonChecked(hWndDlg, IDC_CHK_COMPILATION) ? 1 : 0;
-				EndDialog(hWndDlg, TRUE);//(DWORD)hCfg);
-			}
-			break;
-			
-        case IDCANCEL:
-			// Ignore data values entered into the controls        
-			// and dismiss the dialog window returning FALSE
-			EndDialog(hWndDlg, FALSE);
-			break;
-
-		case IDC_BTN_ABOUT:
-			DialogBox((HINSTANCE)hInstance,(LPCSTR)MAKEINTRESOURCE(IDD_ABOUT), (HWND)hWndDlg, (DLGPROC)DialogMsgProcAbout);
-			break;
-
-		case IDC_BTN_LICENSE:
-			{
-			char *license =
-				"\nPlease note that the use of this software may require the payment of patent royalties.\n"
-				"You need to consider this issue before you start building derivative works.\n"
-				"We are not warranting or indemnifying you in any way for patent royalities!\n"
-				"YOU ARE SOLELY RESPONSIBLE FOR YOUR OWN ACTIONS!\n"
-				"\n"
-				"FAAC is based on the ISO MPEG-4 reference code. For this code base the\n"
-				"following license applies:\n"
-				"\n"
-/*				"This software module was originally developed by\n"
-				"\n"
-				"FirstName LastName (CompanyName)\n"
-				"\n"
-				"and edited by\n"
-				"\n"
-				"FirstName LastName (CompanyName)\n"
-				"FirstName LastName (CompanyName)\n"
-				"\n"
-*/				"in the course of development of the MPEG-2 NBC/MPEG-4 Audio standard\n"
-				"ISO/IEC 13818-7, 14496-1,2 and 3. This software module is an\n"
-				"implementation of a part of one or more MPEG-2 NBC/MPEG-4 Audio tools\n"
-				"as specified by the MPEG-2 NBC/MPEG-4 Audio standard. ISO/IEC gives\n"
-				"users of the MPEG-2 NBC/MPEG-4 Audio standards free license to this\n"
-				"software module or modifications thereof for use in hardware or\n"
-				"software products claiming conformance to the MPEG-2 NBC/ MPEG-4 Audio\n"
-				"standards. Those intending to use this software module in hardware or\n"
-				"software products are advised that this use may infringe existing\n"
-				"patents. The original developer of this software module and his/her\n"
-				"company, the subsequent editors and their companies, and ISO/IEC have\n"
-				"no liability for use of this software module or modifications thereof\n"
-				"in an implementation. Copyright is not released for non MPEG-2\n"
-				"NBC/MPEG-4 Audio conforming products. The original developer retains\n"
-				"full right to use the code for his/her own purpose, assign or donate\n"
-				"the code to a third party and to inhibit third party from using the\n"
-				"code for non MPEG-2 NBC/MPEG-4 Audio conforming products. This\n"
-				"copyright notice must be included in all copies or derivative works.\n"
-				"\n"
-				"Copyright (c) 1997.\n"
-				"\n"
-				"For the changes made for the FAAC project the GNU Lesser General Public\n"
-				"License (LGPL), version 2 1991 applies:\n"
-				"\n"
-				"FAAC - Freeware Advanced Audio Coder\n"
-				"Copyright (C) 2001-2004 The individual contributors\n"
-				"\n"
-				"This library is free software; you can redistribute it and/or modify it under the terms of\n"
-				"the GNU Lesser General Public License as published by the Free Software Foundation;\n"
-				"either version 2.1 of the License, or (at your option) any later version.\n"
-				"\n"
-				"This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;\n"
-				"without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-				"See the GNU Lesser General Public License for more details.\n"
-				"\n"
-				"You should have received a copy of the GNU Lesser General Public\n"
-				"License along with this library; if not, write to the Free Software\n"
-				"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n";
-
-				MessageBox(hWndDlg,license,"FAAC libray License",MB_OK|MB_ICONINFORMATION);
-			}
-			break;
-
-#ifdef USE_OUTPUT_FOLDER
-		case IDC_BTN_BROWSE:
-			{
-			BROWSEINFO bi;
-			ITEMIDLIST *idlist;
-
-				GetDlgItemText(hWndDlg, IDC_E_BROWSE, config_AACoutdir, MAX_PATH);
-				bi.hwndOwner = hWndDlg;
-				bi.pidlRoot = 0;
-				bi.pszDisplayName = config_AACoutdir;
-				bi.lpszTitle = "Select a directory for aac/mp4 file output:";
-				bi.ulFlags = BIF_RETURNONLYFSDIRS;
-				bi.lpfn = BrowseCallbackProc;
-				bi.lParam = (LPARAM)config_AACoutdir;
-				
-				idlist = SHBrowseForFolder(&bi);
-				if(idlist)
-				{
-					SHGetPathFromIDList(idlist, config_AACoutdir);
-					SetDlgItemText(hWndDlg, IDC_E_BROWSE, config_AACoutdir);
-				}
-			}
-			break;
-#endif			
-		case IDC_BTN_ARTFILE:
-			{
-			OPENFILENAME ofn;
-			char ArtFilenameMAX_PATH="";
-
-				GetDlgItemText(hWndDlg, IDC_E_ARTFILE, ArtFilename, MAX_PATH);
-				ofn.lStructSize			= sizeof(OPENFILENAME);
-				ofn.hwndOwner			= (HWND)hWndDlg;
-				ofn.lpstrFilter			= "Cover art files (*.gif,*jpg,*.png)\0*.gif;*.jpg;*.png\0";
-				ofn.lpstrCustomFilter	= NULL;
-				ofn.nFilterIndex		= 1;
-				ofn.lpstrFile			= ArtFilename;
-				ofn.nMaxFile			= MAX_PATH; //sizeof ArtFilename;
-				ofn.lpstrFileTitle		= NULL;
-				ofn.nMaxFileTitle		= 0;
-				ofn.lpstrInitialDir		= NULL;
-				ofn.lpstrTitle			= "Select cover art file";
-				ofn.Flags				= OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLESIZING;
-				ofn.lpstrDefExt			= NULL;//"jpg";
-				ofn.hInstance			= hInstance;
-
-				if(GetOpenFileName(&ofn))
-					SetDlgItemText(hWndDlg, IDC_E_ARTFILE, ArtFilename);
-			}
-			break;
-
-#ifdef USE_IMPORT_TAG
-		case IDC_BTN_BROWSEIMPORT:
-			{
-			char pathMAX_PATH;
-			BROWSEINFO bi;
-			ITEMIDLIST *idlist;
-
-				GetDlgItemText(hWndDlg, IDC_E_SOURCEPATH, path, MAX_PATH);
-				bi.hwndOwner = hWndDlg;
-				bi.pidlRoot = 0;
-				bi.pszDisplayName = path;
-				bi.lpszTitle = "Select the folder where source files are stored:";
-				bi.ulFlags = BIF_RETURNONLYFSDIRS;
-				bi.lpfn = BrowseCallbackProc;
-				bi.lParam = (LPARAM)path;
-				
-				idlist=SHBrowseForFolder(&bi);
-				if(idlist)
-				{
-					SHGetPathFromIDList(idlist, path);
-					SetDlgItemText(hWndDlg, IDC_E_SOURCEPATH, path);
-				}
-			}
-			break;
-#endif			
-		case IDC_RADIO_MPEG4:
-			EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_LTP), !IsDlgButtonChecked(hWndDlg,IDC_CHK_AUTOCFG));
-			break;
-			
-		case IDC_RADIO_MPEG2:
-			EnableWindow(GetDlgItem(hWndDlg, IDC_RADIO_LTP), FALSE);
-			DISABLE_LTP
-			break;
-
-		case IDC_CHK_AUTOCFG:
-			{
-			BYTE Enabled=IsDlgButtonChecked(hWndDlg,IDC_CHK_AUTOCFG);
-				DISABLE_CTRLS_ENC(!Enabled);
-				if(!Enabled)
-					SendMessage(hWndDlg, WM_INITDIALOG, 0L, 0L);
-				else
-				{
-					SetDlgItemInt(hWndDlg, IDC_CB_QUALITY, DEF_QUALITY, FALSE);
-					SetDlgItemInt(hWndDlg, IDC_CB_BITRATE, DEF_BITRATE, FALSE);
-					SetDlgItemInt(hWndDlg, IDC_CB_BANDWIDTH, DEF_BANDWIDTH, FALSE);
-
-					CheckDlgButton(hWndDlg,IDC_RADIO_MPEG4,FALSE);
-					CheckDlgButton(hWndDlg,IDC_RADIO_MPEG2,FALSE);
-					if(DEF_MPEGVER==MPEG4)
-						CheckDlgButton(hWndDlg,IDC_RADIO_MPEG4,TRUE);
-					else
-						CheckDlgButton(hWndDlg,IDC_RADIO_MPEG2,TRUE);
-					
-					CheckDlgButton(hWndDlg,IDC_RADIO_MAIN,FALSE);
-					CheckDlgButton(hWndDlg,IDC_RADIO_LOW,FALSE);
-					CheckDlgButton(hWndDlg,IDC_RADIO_SSR,FALSE);
-					CheckDlgButton(hWndDlg,IDC_RADIO_LTP,FALSE);
-					switch(DEF_PROFILE)
-					{
-					case MAIN:
-						CheckDlgButton(hWndDlg,IDC_RADIO_MAIN,TRUE);
-						break;
-					case LOW:
-						CheckDlgButton(hWndDlg,IDC_RADIO_LOW,TRUE);
-						break;
-					case SSR:
-						CheckDlgButton(hWndDlg,IDC_RADIO_SSR,TRUE);
-						break;
-					case LTP:
-						CheckDlgButton(hWndDlg,IDC_RADIO_LTP,TRUE);
-						DISABLE_LTP
-						break;
-					}
-					
-					CheckDlgButton(hWndDlg,IDC_RADIO_RAW,FALSE);
-					CheckDlgButton(hWndDlg,IDC_RADIO_ADTS,FALSE);
-					switch(DEF_HEADER)
-					{
-					case RAW:
-						CheckDlgButton(hWndDlg,IDC_RADIO_RAW,TRUE);
-						break;
-					case ADTS:
-						CheckDlgButton(hWndDlg,IDC_RADIO_ADTS,TRUE);
-						break;
-					}
-					
-					CheckDlgButton(hWndDlg, IDC_CHK_ALLOWMIDSIDE, DEF_MIDSIDE);
-					CheckDlgButton(hWndDlg, IDC_CHK_USETNS, DEF_TNS);
-					CheckDlgButton(hWndDlg, IDC_CHK_USELFE, DEF_LFE);
-
-					if(DEF_USEQUALTY)
-						CheckDlgButton(hWndDlg,IDC_RADIO_QUALITY,true);
-					else
-						CheckDlgButton(hWndDlg,IDC_RADIO_BITRATE,true);
-
-					if(DEF_QUALITY<10)
-						SetDlgItemInt(hWndDlg, IDC_CB_QUALITY, 10, FALSE);
-					else
-						if(DEF_QUALITY>500)
-							SetDlgItemInt(hWndDlg, IDC_CB_QUALITY, 500, FALSE);
-						else
-							SetDlgItemInt(hWndDlg, IDC_CB_QUALITY, DEF_QUALITY, FALSE);
-
-					switch(DEF_BITRATE)
-					{
-					case 0:
-						SendMessage(GetDlgItem(hWndDlg, IDC_CB_BITRATE), CB_SETCURSEL, 0, 0);
-//						SetDlgItemInt(hWndDlg, IDC_CB_BITRATE, 128, FALSE);
-						break;
-					default:
-						SetDlgItemInt(hWndDlg, IDC_CB_BITRATE, DEF_BITRATE, FALSE);
-						break;
-					}
-					switch(DEF_BANDWIDTH)
-					{
-					case 0:
-						SendMessage(GetDlgItem(hWndDlg, IDC_CB_BANDWIDTH), CB_SETCURSEL, 0, 0);
-						break;
-					case 0xffffffff:
-						SendMessage(GetDlgItem(hWndDlg, IDC_CB_BANDWIDTH), CB_SETCURSEL, 1, 0);
-						break;
-					default:
-						SetDlgItemInt(hWndDlg, IDC_CB_BANDWIDTH, DEF_BANDWIDTH, FALSE);
-						break;
-					}
-					
-					SendMessage(GetDlgItem(hWndDlg, IDC_CB_EXT), CB_SETCURSEL, DEF_WRITEMP4, 0);
-//					DISABLE_CTRLS_ENC(!Enabled);
-				}
-			}
-			break;
-
-		case IDC_CHK_TAG:
-		case IDC_CB_EXT:
-			{
-			char TagImport=IsDlgButtonChecked(hWndDlg,IDC_CHK_IMPORTTAG);
-			char TagEnabled=IsDlgButtonChecked(hWndDlg,IDC_CHK_TAG);
-				ENABLE_TAG(TagEnabled && !TagImport);
-			char Enabled=SendMessage(GetDlgItem(hWndDlg, IDC_CB_EXT), CB_GETCURSEL, 0, 0)!=0;
-				ENABLE_AACTAGS(TagEnabled && !TagImport && Enabled);
-			}
-			break;
-#ifdef USE_IMPORT_TAG
-		case IDC_CHK_IMPORTTAG:
-			SendMessage(hWndDlg, WM_COMMAND, IDC_CHK_TAG, 0);
-			break;
-#endif
-		}
-		break; // End of WM_COMMAND
-	default: 
-		return FALSE;
-	}
-	
-	return TRUE;
-} // End of DIALOGSMsgProc

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/EncDialog.h Deleted

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/FAAC.rc Deleted

@@ -1,343 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ENCODER DIALOGEX 0, 0, 338, 219
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "MPEG4-AAC options"
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    DEFPUSHBUTTON   "&OK",IDOK,12,200,36,14
-    PUSHBUTTON      "&Cancel",IDCANCEL,48,200,36,14
-    PUSHBUTTON      "&About",IDC_BTN_ABOUT,84,200,36,14
-    PUSHBUTTON      "&License",IDC_BTN_LICENSE,120,200,36,14
-    CONTROL         "Automatic configuration",IDC_CHK_AUTOCFG,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,4,90,10
-    CONTROL         "Main",IDC_RADIO_MAIN,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,9,28,31,10
-    CONTROL         "LC",IDC_RADIO_LOW,"Button",BS_AUTORADIOBUTTON,9,40,25,
-                    10
-    CONTROL         "LTP",IDC_RADIO_LTP,"Button",BS_AUTORADIOBUTTON,9,52,29,
-                    10
-    CONTROL         "SSR",IDC_RADIO_SSR,"Button",BS_AUTORADIOBUTTON | NOT 
-                    WS_VISIBLE | WS_DISABLED,9,63,31,10
-    CONTROL         "MPEG4",IDC_RADIO_MPEG4,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,62,27,40,10
-    CONTROL         "MPEG2",IDC_RADIO_MPEG2,"Button",BS_AUTORADIOBUTTON,62,
-                    40,40,9
-    CONTROL         "Raw",IDC_RADIO_RAW,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,112,27,42,10
-    CONTROL         "ADTS",IDC_RADIO_ADTS,"Button",BS_AUTORADIOBUTTON,112,40,
-                    41,9
-    CONTROL         "Quality",IDC_RADIO_QUALITY,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,9,84,37,10
-    COMBOBOX        IDC_CB_QUALITY,102,81,48,97,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_GROUP | WS_TABSTOP
-    CONTROL         "Bitrate",IDC_RADIO_BITRATE,"Button",BS_AUTORADIOBUTTON,
-                    9,100,36,10
-    COMBOBOX        IDC_CB_BITRATE,102,97,48,86,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-    LTEXT           "Cutoff",IDC_STATIC,21,121,20,8
-    COMBOBOX        IDC_CB_BANDWIDTH,102,118,48,81,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-    LTEXT           "Write",IDC_STATIC,22,138,18,8
-    COMBOBOX        IDC_CB_EXT,102,135,48,81,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Allow Mid/Side",IDC_CHK_ALLOWMIDSIDE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,9,152,63,10
-    CONTROL         "Use TNS",IDC_CHK_USETNS,"Button",BS_AUTOCHECKBOX | NOT 
-                    WS_VISIBLE | WS_DISABLED | WS_TABSTOP,9,162,45,10
-    CONTROL         "Use LFE channel",IDC_CHK_USELFE,"Button",
-                    BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | 
-                    WS_TABSTOP,88,152,67,10
-    EDITTEXT        IDC_E_BROWSE,50,172,83,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse",IDC_BTN_BROWSE,137,172,18,14,BS_BITMAP | 
-                    BS_FLAT
-    GROUPBOX        "",IDC_GRP_TAG,160,4,174,210
-    CONTROL         "Tag",IDC_CHK_TAG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    165,3,29,10
-    CONTROL         "Import",IDC_CHK_IMPORTTAG,"Button",BS_AUTOCHECKBOX | 
-                    NOT WS_VISIBLE | WS_TABSTOP,165,15,35,10
-    EDITTEXT        IDC_E_SOURCEPATH,207,11,63,14,ES_AUTOHSCROLL | NOT 
-                    WS_VISIBLE
-    PUSHBUTTON      "Browse",IDC_BTN_BROWSEIMPORT,273,11,18,14,BS_BITMAP | 
-                    BS_FLAT | NOT WS_VISIBLE
-    EDITTEXT        IDC_E_SOURCEEXT,294,11,34,14,ES_AUTOHSCROLL | NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_E_ARTIST,207,27,121,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_E_TITLE,207,42,121,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_E_ALBUM,207,57,121,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_E_YEAR,207,72,121,14,ES_AUTOHSCROLL
-    COMBOBOX        IDC_CB_GENRE,207,87,121,161,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-    EDITTEXT        IDC_E_WRITER,207,101,121,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_E_COMMENT,207,116,121,29,ES_MULTILINE | 
-                    ES_AUTOHSCROLL
-    EDITTEXT        IDC_E_COMPILATION,207,146,121,14,ES_AUTOHSCROLL | NOT 
-                    WS_VISIBLE
-    CONTROL         "Part of a compilation",IDC_CHK_COMPILATION,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,165,148,80,10
-    EDITTEXT        IDC_E_TRACK,233,162,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_E_NTRACKS,288,162,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_E_DISK,233,177,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_E_NDISKS,288,177,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_E_ARTFILE,207,192,98,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&...",IDC_BTN_ARTFILE,311,192,17,14,BS_BITMAP | BS_FLAT
-    GROUPBOX        "AAC type",IDC_STATIC,56,16,48,52
-    GROUPBOX        "Profile",IDC_STATIC,4,16,48,52
-    GROUPBOX        "Header",IDC_STATIC,108,16,48,52
-    GROUPBOX        "Encoding mode",IDC_STATIC,4,73,152,42
-    LTEXT           "Artist",IDC_STATIC,165,29,16,8
-    LTEXT           "Title",IDC_STATIC,165,44,14,8
-    LTEXT           "Album",IDC_STATIC,165,59,20,8
-    LTEXT           "Year",IDC_STATIC,165,74,16,8
-    LTEXT           "Genre",IDC_STATIC,165,89,20,8
-    LTEXT           "Writer",IDC_STATIC,165,103,20,8
-    LTEXT           "Comment\n(ctrl-Enter\nto go down)",IDC_STATIC,165,118,
-                    37,26
-    LTEXT           "Track",IDC_STATIC,165,166,20,8
-    LTEXT           "/",IDC_STATIC,277,166,8,8
-    LTEXT           "Disk",IDC_STATIC,165,180,15,8
-    LTEXT           "/",IDC_STATIC,277,180,8,8
-    LTEXT           "Cover art file",IDC_STATIC,165,195,40,8
-    LTEXT           "Output folder",IDC_L_BROWSE,4,175,42,8
-END
-
-IDD_DECODER DIALOGEX 0, 0, 162, 153
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "Raw .AAC options"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "&OK",IDOK,47,132,36,14
-    PUSHBUTTON      "&Cancel",IDCANCEL,83,132,36,14
-    PUSHBUTTON      "&About",IDC_BTN_ABOUT,119,132,36,14
-    CONTROL         "Main",IDC_RADIO_MAIN,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,19,33,31,10
-    CONTROL         "Low",IDC_RADIO_LOW,"Button",BS_AUTORADIOBUTTON,19,44,29,
-                    10
-    CONTROL         "SSR",IDC_RADIO_SSR,"Button",BS_AUTORADIOBUTTON | 
-                    WS_DISABLED,19,56,31,10
-    CONTROL         "LTP",IDC_RADIO_LTP,"Button",BS_AUTORADIOBUTTON,19,68,29,
-                    10
-    GROUPBOX        "Profile",IDC_STATIC,13,23,48,70
-    COMBOBOX        IDC_CB_SAMPLERATE,72,74,69,87,CBS_DROPDOWN | WS_DISABLED | 
-                    WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Default settings",IDC_CHK_DEFAULTCFG,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,13,7,64,10
-    GROUPBOX        "Sample rate",IDC_STATIC,66,61,81,32
-    CONTROL         "HE",IDC_RADIO_HE,"Button",BS_AUTORADIOBUTTON | 
-                    WS_DISABLED,19,80,26,10
-    CONTROL         "Down matrix 5.1 to 2 channels",IDC_CHK_DOWNMATRIX,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,98,111,10
-    CONTROL         "Assume old ADTS format",IDC_CHK_OLDADTS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,13,110,95,10
-    COMBOBOX        IDC_CB_BITSPERSAMPLE,72,35,69,87,CBS_DROPDOWNLIST | 
-                    WS_DISABLED | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Output bits per sample",IDC_STATIC,66,23,81,32
-    GROUPBOX        "",IDC_GRP_DEFAULT,7,8,147,118
-END
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_ENCODER, DIALOG
-    BEGIN
-        LEFTMARGIN, 4
-        RIGHTMARGIN, 334
-        TOPMARGIN, 4
-        BOTTOMMARGIN, 214
-    END
-
-    IDD_DECODER, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 154
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 146
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Italian (Italy) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
-#ifdef _WIN32
-LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ABOUT DIALOGEX 0, 0, 191, 230
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
-CAPTION "About"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "&OK",IDOK,145,208,39,14
-    CONTROL         104,IDC_AUDIOCODING,"Static",SS_BITMAP | SS_NOTIFY | 
-                    SS_SUNKEN,7,7,178,69
-    CONTROL         107,IDC_MPEG4IP,"Static",SS_BITMAP | SS_NOTIFY | 
-                    SS_SUNKEN,7,202,59,20
-    CONTROL         106,IDC_EMAIL,"Static",SS_BITMAP | SS_NOTIFY,96,204,43,
-                    18
-    LTEXT           "Text",IDC_L_ABOUT,7,55,177,142
-    ICON            IDI_ID3,IDC_ID3,70,202,20,20,SS_NOTIFY | SS_SUNKEN
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_ABOUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 184
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 222
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_AUDIOCODING         BITMAP                  "AudioCoding.bmp"
-IDB_EMAIL               BITMAP                  "Email.bmp"
-IDB_MPEG4IP             BITMAP                  "mpeg4ip-v.bmp"
-IDB_BROWSE              BITMAP                  "Open.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ID3                 ICON                    "id3v2.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,0,0,0
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "041004b0"
-        BEGIN
-            VALUE "FileDescription", "CFAAC"
-            VALUE "FileVersion", "1, 3, 0, 0"
-            VALUE "InternalName", "FAAC"
-            VALUE "LegalCopyright", "Copyright (C) 2004"
-            VALUE "OriginalFilename", "FAAC.dll"
-            VALUE "ProductName", " FAAC Dynamic Link Library"
-            VALUE "ProductVersion", "1, 0, 0, 0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x410, 1200
-    END
-END
-
-#endif    // Italian (Italy) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/Open.bmp Deleted

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/ReadMe.txt Deleted

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/TypeDef.h Deleted

@@ -1,45 +0,0 @@
-/*
-FAAC - codec plugin for Cooledit
-Copyright (C) 2002-2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-//---------------------------------------------------------------------------
-#ifndef TypeDefH
-#define TypeDefH
-//---------------------------------------------------------------------------
-
-/* typedef.h */
-
-#ifndef BYTE
-typedef unsigned char    BYTE;
-#endif
-#ifndef WORD
-typedef unsigned short   WORD;
-#endif
-#ifndef DWORD
-typedef unsigned long    DWORD;
-#endif
-#ifndef QWORD
-typedef unsigned __int64 QWORD;
-#endif
-
-//---------------------------------------------------------------------------
-#endif
-//---------------------------------------------------------------------------
-

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/id3v2.ico Deleted

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/mpeg4ip-v.bmp Deleted

_service:obs_scm:faac-1.31.obscpio/common/Cfaac/resource.h Deleted

@@ -1,81 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by FAAC.rc
-//
-#define IDD_ENCODER                     101
-#define IDD_DECODER                     102
-#define IDD_ABOUT                       103
-#define IDB_AUDIOCODING                 104
-#define IDB_EMAIL                       106
-#define IDB_MPEG4IP                     107
-#define IDB_BROWSE                      108
-#define IDI_ID3                         110
-#define IDC_CHK_DEFAULTCFG              1000
-#define IDC_CHK_DOWNMATRIX              1001
-#define IDC_CHK_OLDADTS                 1002
-#define IDC_CB_SAMPLERATE               1003
-#define IDC_AUDIOCODING                 1004
-#define IDC_CB_BITSPERSAMPLE            1004
-#define IDC_EMAIL                       1005
-#define IDC_MPEG4IP                     1006
-#define IDC_E_BROWSE                    1007
-#define IDC_BTN_BROWSE                  1008
-#define IDC_RADIO_MPEG4                 1009
-#define IDC_RADIO_MPEG2                 1010
-#define IDC_RADIO_LOW                   1011
-#define IDC_RADIO_MAIN                  1012
-#define IDC_RADIO_SSR                   1013
-#define IDC_RADIO_LTP                   1014
-#define IDC_RADIO_RAW                   1015
-#define IDC_RADIO_HE                    1016
-#define IDC_BTN_BROWSE2                 1016
-#define IDC_BTN_BROWSEIMPORT            1016
-#define IDC_RADIO_ADTS                  1017
-#define IDC_CB_BANDWIDTH                1018
-#define IDC_CB_BITRATE                  1019
-#define IDC_CHK_ALLOWMIDSIDE            1020
-#define IDC_CHK_USETNS                  1021
-#define IDC_CHK_USELFE                  1022
-#define IDC_CHK_AUTOCFG                 1023
-#define IDC_BTN_ABOUT                   1024
-#define IDC_L_ABOUT                     1025
-#define IDC_BTN_ARTFILE                 1026
-#define IDC_CHK_USETNS2                 1027
-#define IDC_CB_EXT                      1028
-#define IDC_RADIO_BITRATE               1030
-#define IDC_RADIO_QUALITY               1031
-#define IDC_CB_QUALITY                  1032
-#define IDC_E_ARTIST                    1034
-#define IDC_CHK_TAG                     1035
-#define IDC_E_TITLE                     1036
-#define IDC_E_ALBUM                     1037
-#define IDC_E_YEAR                      1038
-#define IDC_CB_GENRE                    1039
-#define IDC_E_WRITER                    1040
-#define IDC_E_COMMENT                   1041
-#define IDC_E_TRACK                     1042
-#define IDC_E_NTRACKS                   1043
-#define IDC_E_DISK                      1044
-#define IDC_E_NDISKS                    1045
-#define IDC_GRP_TAG                     1046
-#define IDC_E_COMPILATION               1047
-#define IDC_E_ARTFILE                   1048
-#define IDC_BTN_LICENSE                 1049
-#define IDC_CHK_COMPILATION             1050
-#define IDC_GRP_DEFAULT                 1051
-#define IDC_ID3                         1052
-#define IDC_L_BROWSE                    1054
-#define IDC_CHK_IMPORTTAG               1055
-#define IDC_E_SOURCEEXT                 1056
-#define IDC_E_SOURCEPATH                1057
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        111
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1057
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

_service:obs_scm:faac-1.31.obscpio/common/Makefile.am Deleted

_service:obs_scm:faac-1.31.obscpio/configure.ac Deleted

@@ -1,64 +0,0 @@
-AC_PREREQ(2.71)
-AC_INIT(faac,1.31,https://github.com/knik0/faac)
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(subdir-objects)
-
-AC_CONFIG_HEADERS(config.h)
-AH_TOP(#ifndef CONFIG_H
-#define CONFIG_H)
-AH_BOTTOM(#endif /* CONFIG_H */)
-
-AC_DEFUN(MY_DEFINE,  AC_DEFINE($1, 1, define if needed) )
-
-CFLAGS=${CFLAGS:-"-O2 -Wall -fexceptions"}
-
-AC_PROG_CC
-AC_PROG_CXX
-LT_INIT
-
-AC_CHECK_HEADERS(getopt.h immintrin.h)
-
-AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE_STRCASECMP))
-
-AC_CHECK_LIB(gnugetopt, getopt_long)
-
-AM_CONDITIONAL(MINGW, test "$host_os" = "mingw32")
-AM_CONDITIONAL(CPUSSE, test "$host_cpu" = "x86_64" || test "$host_cpu" = "i686")
-
-AC_COMPILE_IFELSE(
-	AC_LANG_SOURCE(
-#if !defined(__clang__)
-#error not clang
-#endif
-	),
-	AM_CONDITIONAL(CLANG, true),
-	AM_CONDITIONAL(CLANG, false))
-
-AC_CHECK_TOOL(WINDRES, windres)
-
-AC_C_BIGENDIAN
-
-AC_SYS_LARGEFILE
-AC_CHECK_HEADERS(stdint.h inttypes.h)
-AC_CHECK_HEADERS(mathf.h)
-AC_CHECK_HEADERS(float.h)
-AC_CHECK_DECL(strchr, MY_DEFINE(HAVE_STRCHR))
-AC_CHECK_DECL(memcpy, MY_DEFINE(HAVE_MEMCPY))
-AC_CHECK_DECL(strsep, MY_DEFINE(HAVE_STRSEP))
-AC_CHECK_HEADERS_ONCE(sys/time.h)
-
-AC_TYPE_OFF_T
-AC_CHECK_TYPES(in_port_t, socklen_t, , , 
-	#include <sys/types.h>
-	 #include <sys/socket.h>
-	 #include <netinet/in.h>)
-AC_CHECK_MEMBERS(fpos_t.__pos,,, #include <stdio.h>)
-
-AC_CONFIG_FILES(
-common/Makefile
-libfaac/Makefile
-libfaac/faac.pc
-frontend/Makefile
-include/Makefile
-Makefile)
-AC_OUTPUT

_service:obs_scm:faac-1.31.obscpio/frontend/Makefile.am Deleted

_service:obs_scm:faac-1.31.obscpio/include/Makefile.am Deleted

_service:obs_scm:faac-1.31.obscpio/libfaac/Makefile.am Deleted

@@ -1,34 +0,0 @@
-common_SOURCES = bitstream.c fft.c frame.c blockswitch.c util.c channels.c filtbank.c tns.c quantize.c huff2.c huffdata.c stereo.c
-common_INCLUDES = channels.h filtbank.h blockswitch.h coder.h frame.h tns.h bitstream.h fft.h util.h quantize.h huffdata.h huff2.h stereo.h
-common_LIBADD = -lm
-common_CFLAGS = -fvisibility=hidden
-if CPUSSE
-common_CFLAGS += -msse2
-endif
-
-common_LDFLAGS = -no-undefined
-if MINGW
-if !CLANG
-common_LDFLAGS += -Wl,--add-stdcall-alias
-endif
-endif
-
-lib_LTLIBRARIES = libfaac_drm.la libfaac.la
-
-libfaac_drm_la_SOURCES = ${common_SOURCES} ${common_INCLUDES} kiss_fft/kiss_fftr.c kiss_fft/kiss_fft.c kiss_fft/kiss_fft.h
-EXTRA_libfaac_drm_la_SOURCES = kiss_fft/_kiss_fft_guts.h kiss_fft/kiss_fftr.h kiss_fft/README kiss_fft/README.kiss_fft
-libfaac_drm_la_LDFLAGS = ${common_LDFLAGS}
-libfaac_drm_la_LIBADD = ${common_LIBADD}
-libfaac_drm_la_CFLAGS = ${common_CFLAGS} -DDRM
-
-libfaac_la_SOURCES = ${common_SOURCES} ${common_INCLUDES}
-libfaac_la_LDFLAGS = ${common_LDFLAGS}
-libfaac_la_LIBADD = ${common_LIBADD}
-libfaac_la_CFLAGS = ${common_CFLAGS}
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = faac.pc
-
-EXTRA_DIST = faac.pc.in

_service:obs_scm:faac-1.31.obscpio/libfaac/kiss_fft Deleted

_service:obs_scm:faac-1.31.obscpio/libfaac/kiss_fft/CHANGELOG Deleted

@@ -1,58 +0,0 @@
-1.2.1 (April 4, 2004) 
-    compiles cleanly with just about every -W warning flag under the sun
-
-    reorganized kiss_fft_state so it could be read-only/const. This may be useful for embedded systems
-    that are willing to predeclare twiddle factors, factorization.
-
-    Fixed C_MUL,S_MUL on 16-bit platforms.
-
-    tmpbuf will only be allocated if input & output buffers are same
-    scratchbuf will only be allocated for ffts that are not multiples of 2,3,5
- 
-    NOTE: The tmpbuf,scratchbuf changes may require synchronization code for multi-threaded apps.
-
-
-1.2 (Feb 23, 2004)
-    interface change -- cfg object is forward declaration of struct instead of void*
-    This maintains type saftey and lets the compiler warn/error about stupid mistakes.
-            (prompted by suggestion from Erik de Castro Lopo)
-
-    small speed improvements
-
-    added psdpng.c -- sample utility that will create png spectrum "waterfalls" from an input file
-        ( not terribly useful yet)
-
-1.1.1 (Feb 1, 2004 )
-    minor bug fix -- only affects odd rank, in-place, multi-dimensional FFTs
-
-1.1 : (Jan 30,2004)
-    split sample_code/ into test/ and tools/
-
-    Removed 2-D fft and added N-D fft (arbitrary)
-
-    modified fftutil.c to allow multi-d FFTs
-
-    Modified core fft routine to allow an input stride via kiss_fft_stride()
-    (eased support of multi-D ffts)
-
-    Added fast convolution filtering (FIR filtering using overlap-scrap method, with tail scrap)
-
-    Add kfc.ch: the KISS FFT Cache. It takes care of allocs for you ( suggested by Oscar Lesta ).
-
-1.0.1 (Dec 15, 2003)
-    fixed bug that occurred when nfft==1
-    
-1.0 : (Dec 14, 2003)
-    changed kiss_fft function from using a single buffer, to two buffers.
-    If the same buffer pointer is supplied for both in and out, kiss will
-    manage the buffer copies.
-
-    added kiss_fft2d and kiss_fftr as separate source files (declarations in kiss_fft.h )
-
-0.4 :(Nov 4,2003) optimized for radix 2,3,4,5
-
-0.3 :(Oct 28, 2003) woops, version 2 didn't actually factor out any radices other than 2
-
-0.2 :(Oct 27, 2003) added mixed radix, only radix 2,4 optimized versions
-
-0.1 :(May 19 2003)  initial release, radix 2 only

_service:obs_scm:faac-1.31.obscpio/libfaac/kiss_fft/COPYING Deleted

@@ -1,11 +0,0 @@
-Copyright (c) 2003-2004 Mark Borgerding
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

_service:obs_scm:faac-1.31.obscpio/libfaac/kiss_fft/README Deleted

@@ -1,109 +0,0 @@
-KISS FFT - A mixed-radix Fast Fourier Transform based up on the principle, 
-"Keep It Simple, Stupid."
-
-    There are many great fft libraries already around.  Kiss FFT is not trying
-to be better than any of them.  It only attempts to be a reasonably efficient, 
-moderately useful FFT that can use fixed or floating data types and can be 
-incorporated into someone's C program in a few minutes with trivial licensing.
-
-USAGE:
-
-    The basic usage for 1-d complex FFT is:
-
-        #include "kiss_fft.h"
-
-        kiss_fft_cfg cfg = kiss_fft_alloc( nfft ,inverse_fft );
-
-        while ...
-        
-            ... // put kth sample in cx_ink.r and cx_ink.i
-            
-            kiss_fft( cfg , cx_in , cx_out );
-            
-            ... // transformed. DC is in cx_out0.r and cx_out0.i 
-            
-        free(cfg);
-
-    Note: frequency-domain data is stored from dc up to 2pi.
-    so cx_out0 is the dc bin of the FFT
-    and cx_outnfft/2 is the Nyquist bin (if exists)
-
-    Declarations are in "kiss_fft.h", along with a brief description of the 
-functions you'll need to use. 
-
-Code definitions for 1d complex FFTs are in kiss_fft.c.
-
-You can do other cool stuff with the extras you'll find in tools/
-
-    * arbitrary dimension complex FFTs 
-    * 1-d real FFTs
-    * fast convolution FIR filtering
-    * spectrum image creation
-
-The core fft and most tools/ code can be compiled to use float, double 
-or Q15 short samples. The default is float.
-
-
-BACKGROUND:
-
-    I started coding this because I couldn't find a fixed point FFT that didn't 
-use assembly code.  I started with floating point numbers so I could get the 
-theory straight before working on fixed point issues.  In the end, I had a 
-little bit of code that could be recompiled easily to do ffts with short, float
-or double (other types should be easy too).  
-
-    Once I got my FFT working, I was curious about the speed compared to
-a well respected and highly optimized fft library.  I don't want to criticize 
-this great library, so let's call it FFT_BRANDX.
-During this process, I learned:
-
-    1. FFT_BRANDX has more than 100K lines of code. The core of kiss_fft is about 500 lines (cpx 1-d).
-    2. It took me an embarrassingly long time to get FFT_BRANDX working.
-    3. A simple program using FFT_BRANDX is 522KB. A similar program using kiss_fft is 18KB.
-    4. FFT_BRANDX is roughly twice as fast as KISS FFT.
-
-    It is wonderful that free, highly optimized libraries like FFT_BRANDX exist.
-But such libraries carry a huge burden of complexity necessary to extract every 
-last bit of performance.
-
-    Sometimes simpler is better, even if it's not better.
-
-PERFORMANCE:
-    (on Athlon XP 2100+, with gcc 2.96, float data type)
-
-    Kiss performed 10000 1024-pt cpx ffts in .63 s of cpu time.
-    For comparison, it took md5sum twice as long to process the same amount of data.
-
-    Transforming 5 minutes of CD quality audio takes less than a second (nfft=1024). 
-
-DO NOT:
-    ... use Kiss if you need the Fastest Fourier Transform in the World
-    ... ask me to add features that will bloat the code
-
-UNDER THE HOOD:
-
-    Kiss FFT uses a time decimation, mixed-radix, out-of-place FFT. 
-No scaling is done.  Optimized butterflies are used for factors 2,3,4, and 5. 
-
-    The real optimization code only works for even length ffts.  It does two half-length
-    FFTs in parallel (packed into real&imag), and then combines them via twiddling.
-
-    The fast convolution filtering uses the overlap-scrap method, slightly 
-    modified to put the scrap at the tail.
-
-LICENSE:
-    BSD, see COPYING for details. Basically, "free to use&change, give credit where due, no guarantees"
-
-TODO:
-    *) Add real optimization for odd length FFTs (DST?)
-    *) Add real optimization to the n-dimensional FFT
-    *) Add simple windowing function, e.g. Hamming : w(i)=.54-.46*cos(2pi*i/(n-1))
-    *) Make the fixed point scaling and bit shifts more easily configurable.
-    *) Document/revisit the input/output fft scaling
-    *) See if the fixed point code can be optimized a little without adding complexity.
-    *) Make doc describing the overlap (tail) scrap fast convolution filtering in kiss_fastfir.c
-    *) Test all the ./tools/ code with fixed point (kiss_fastfir.c doesn't work, maybe others)
-
-AUTHOR:
-    Mark Borgerding
-    Mark@Borgerding.net

_service:obs_scm:faac-1.31.obscpio/libfaac/kiss_fft/README.kiss_fft Deleted

_service:obs_scm:faac-1.31.obscpio/libfaac/kiss_fft/TIPS Deleted

@@ -1,23 +0,0 @@
-Speed:
-    * experiment with compiler flags
-        Special thanks to Oscar Lesta. He suggested some compiler flags 
-        for gcc that make a big difference. They shave 10-15% off
-        execution time on some systems.  Try some combination of:
-                -march=pentiumpro
-                -ffast-math
-                -fomit-frame-pointer
-
-    * If the input data has no imaginary component, use the kiss_fftr code under tools/.
-      Real ffts are roughly twice as fast as complex.
-
-Reducing code size:
-    * remove some of the butterflies. There are currently butterflies optimized for radices
-        2,3,4,5.  It is worth mentioning that you can still use FFT sizes that contain 
-        these factors, they just won't be quite as fast.  You can decide for yourself 
-        whether to keep radix 2 or 4.  If you do some work in this area, let me 
-        know what you find.
-
-    * For platforms where ROM/code space is more plentiful than RAM,
-     consider creating a hardcoded kiss_fft_state. In other words, decide which 
-     FFT size(s) you want and make a structure with the correct factors and twiddles.
-

_service:obs_scm:faac-1.31.obscpio/libfaac/kiss_fft/_kiss_fft_guts.h Deleted

@@ -1,97 +0,0 @@
-/*
-Copyright (c) 2003-2004, Mark Borgerding
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* kiss_fft.h
-   defines kiss_fft_scalar as either short or a float type
-   and defines
-   typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */
-#include "kiss_fft.h"
-
-
-#define MAXFACTORS 32
-/* e.g. an fft of length 128 has 4 factors 
- as far as kissfft is concerned
- 4*4*4*2
- */
-
-struct kiss_fft_state{
-    int nfft;
-    int inverse;
-    int factors2*MAXFACTORS;
-    kiss_fft_cpx twiddles1;
-};
-
-/*
-  Explanation of macros dealing with complex math:
-
-   C_MUL(m,a,b)         : m = a*b
-   C_FIXDIV( c , div )  : if a fixed point impl., c /= div. noop otherwise
-   C_SUB( res, a,b)     : res = a - b
-   C_SUBFROM( res , a)  : res -= a
-   C_ADDTO( res , a)    : res += a
- * */
-#ifdef FIXED_POINT
-
-#   define smul(a,b) ( (long)(a)*(b) )
-#   define sround( x )  (short)( ( (x) + (1<<14) ) >>15 )
-
-#   define S_MUL(a,b) sround( smul(a,b) )
-
-#   define C_MUL(m,a,b) \
-      do{ (m).r = sround( smul((a).r,(b).r) - smul((a).i,(b).i) ); \
-          (m).i = sround( smul((a).r,(b).i) + smul((a).i,(b).r) ); }while(0)
-
-#   define C_FIXDIV(c,div) \
-    do{ (c).r /= div; (c).i /=div; }while(0)
-
-#   define C_MULBYSCALAR( c, s ) \
-    do{ (c).r =  sround( smul( (c).r , s ) ) ;\
-        (c).i =  sround( smul( (c).i , s ) ) ; }while(0)
-
-#else  /* not FIXED_POINT*/
-
-#   define S_MUL(a,b) ( (a)*(b) )
-#define C_MUL(m,a,b) \
-    do{ (m).r = (a).r*(b).r - (a).i*(b).i;\
-        (m).i = (a).r*(b).i + (a).i*(b).r; }while(0)
-#   define C_FIXDIV(c,div) /* NOOP */
-#   define C_MULBYSCALAR( c, s ) \
-    do{ (c).r *= (s);\
-        (c).i *= (s); }while(0)
-#endif
-
-#define  C_ADD( res, a,b)\
-    do {    (res).r=(a).r+(b).r;  (res).i=(a).i+(b).i;  }while(0)
-#define  C_SUB( res, a,b)\
-    do {    (res).r=(a).r-(b).r;  (res).i=(a).i-(b).i;  }while(0)
-#define C_ADDTO( res , a)\
-    do {    (res).r += (a).r;  (res).i += (a).i;  }while(0)
-#define C_SUBFROM( res , a)\
-    do {    (res).r -= (a).r;  (res).i -= (a).i;  }while(0)
-
-static 
-void kf_cexp(kiss_fft_cpx * x,double phase) /* returns e ** (j*phase)   */
-{
-#ifdef FIXED_POINT
-    x->r = (kiss_fft_scalar) (32767 * cos (phase));
-    x->i = (kiss_fft_scalar) (32767 * sin (phase));
-#else
-    x->r = cos (phase);
-    x->i = sin (phase);
-#endif
-}
-
-/* a debugging function */
-#define pcpx(c)\
-    fprintf(stderr,"%g + %gi\n",(double)((c)->r),(double)((c)->i) )

_service:obs_scm:faac-1.31.obscpio/libfaac/kiss_fft/kiss_fft.c Deleted

@@ -1,362 +0,0 @@
-/*
-Copyright (c) 2003-2004, Mark Borgerding
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include "_kiss_fft_guts.h"
-/* The guts header contains all the multiplication and addition macros that are defined for
- fixed or floating point complex numbers.  It also delares the kf_ internal functions.
- */
-
-static void kf_bfly2(
-        kiss_fft_cpx * Fout,
-        const size_t fstride,
-        const kiss_fft_cfg st,
-        int m
-        )
-{
-    kiss_fft_cpx * Fout2;
-    kiss_fft_cpx * tw1 = st->twiddles;
-    kiss_fft_cpx t;
-    Fout2 = Fout + m;
-    do{
-        C_FIXDIV(*Fout,2); C_FIXDIV(*Fout2,2);
-
-        C_MUL (t,  *Fout2 , *tw1);
-        tw1 += fstride;
-        C_SUB( *Fout2 ,  *Fout , t );
-        C_ADDTO( *Fout ,  t );
-        ++Fout2;
-        ++Fout;
-    }while (--m);
-}
-
-static void kf_bfly4(
-        kiss_fft_cpx * Fout,
-        const size_t fstride,
-        const kiss_fft_cfg st,
-        const size_t m
-        )
-{
-    kiss_fft_cpx *tw1,*tw2,*tw3;
-    kiss_fft_cpx scratch6;
-    size_t k=m;
-    const size_t m2=2*m;
-    const size_t m3=3*m;
-
-    tw3 = tw2 = tw1 = st->twiddles;
-
-    do {
-        C_FIXDIV(*Fout,4); C_FIXDIV(Foutm,4); C_FIXDIV(Foutm2,4); C_FIXDIV(Foutm3,4);
-
-        C_MUL(scratch0,Foutm , *tw1 );
-        C_MUL(scratch1,Foutm2 , *tw2 );
-        C_MUL(scratch2,Foutm3 , *tw3 );
-
-        C_SUB( scratch5 , *Fout, scratch1 );
-        C_ADDTO(*Fout, scratch1);
-        C_ADD( scratch3 , scratch0 , scratch2 );
-        C_SUB( scratch4 , scratch0 , scratch2 );
-        C_SUB( Foutm2, *Fout, scratch3 );
-        tw1 += fstride;
-        tw2 += fstride*2;
-        tw3 += fstride*3;
-        C_ADDTO( *Fout , scratch3 );
-
-        if(st->inverse) {
-            Foutm.r = scratch5.r - scratch4.i;
-            Foutm.i = scratch5.i + scratch4.r;
-            Foutm3.r = scratch5.r + scratch4.i;
-            Foutm3.i = scratch5.i - scratch4.r;
-        }else{
-            Foutm.r = scratch5.r + scratch4.i;
-            Foutm.i = scratch5.i - scratch4.r;
-            Foutm3.r = scratch5.r - scratch4.i;
-            Foutm3.i = scratch5.i + scratch4.r;
-        }
-        ++Fout;
-    }while(--k);
-}
-
-static void kf_bfly3(
-         kiss_fft_cpx * Fout,
-         const size_t fstride,
-         const kiss_fft_cfg st,
-         size_t m
-         )
-{
-     size_t k=m;
-     const size_t m2 = 2*m;
-     kiss_fft_cpx *tw1,*tw2;
-     kiss_fft_cpx scratch5;
-     kiss_fft_cpx epi3;
-     epi3 = st->twiddlesfstride*m;
-
-     tw1=tw2=st->twiddles;
-
-     do{
-         C_FIXDIV(*Fout,3); C_FIXDIV(Foutm,3); C_FIXDIV(Foutm2,3);
-
-         C_MUL(scratch1,Foutm , *tw1);
-         C_MUL(scratch2,Foutm2 , *tw2);
-
-         C_ADD(scratch3,scratch1,scratch2);
-         C_SUB(scratch0,scratch1,scratch2);
-         tw1 += fstride;
-         tw2 += fstride*2;
-
-         Foutm.r = Fout->r - scratch3.r/2;
-         Foutm.i = Fout->i - scratch3.i/2;
-
-         C_MULBYSCALAR( scratch0 , epi3.i );
-
-         C_ADDTO(*Fout,scratch3);
-
-         Foutm2.r = Foutm.r + scratch0.i;
-         Foutm2.i = Foutm.i - scratch0.r;
-
-         Foutm.r -= scratch0.i;
-         Foutm.i += scratch0.r;
-
-         ++Fout;
-     }while(--k);
-}
-
-static void kf_bfly5(
-        kiss_fft_cpx * Fout,
-        const size_t fstride,
-        const kiss_fft_cfg st,
-        int m
-        )
-{
-    kiss_fft_cpx *Fout0,*Fout1,*Fout2,*Fout3,*Fout4;
-    int u;
-    kiss_fft_cpx scratch13;
-    kiss_fft_cpx * twiddles = st->twiddles;
-    kiss_fft_cpx *tw;
-    kiss_fft_cpx ya,yb;
-    ya = twiddlesfstride*m;
-    yb = twiddlesfstride*2*m;
-
-    Fout0=Fout;
-    Fout1=Fout0+m;
-    Fout2=Fout0+2*m;
-    Fout3=Fout0+3*m;
-    Fout4=Fout0+4*m;
-
-    tw=st->twiddles;
-    for ( u=0; u<m; ++u ) {
-        C_FIXDIV( *Fout0,5); C_FIXDIV( *Fout1,5); C_FIXDIV( *Fout2,5); C_FIXDIV( *Fout3,5); C_FIXDIV( *Fout4,5);
-        scratch0 = *Fout0;
-
-        C_MUL(scratch1 ,*Fout1, twu*fstride);
-        C_MUL(scratch2 ,*Fout2, tw2*u*fstride);
-        C_MUL(scratch3 ,*Fout3, tw3*u*fstride);
-        C_MUL(scratch4 ,*Fout4, tw4*u*fstride);
-
-        C_ADD( scratch7,scratch1,scratch4);
-        C_SUB( scratch10,scratch1,scratch4);
-        C_ADD( scratch8,scratch2,scratch3);
-        C_SUB( scratch9,scratch2,scratch3);
-
-        Fout0->r += scratch7.r + scratch8.r;
-        Fout0->i += scratch7.i + scratch8.i;
-
-        scratch5.r = scratch0.r + S_MUL(scratch7.r,ya.r) + S_MUL(scratch8.r,yb.r);
-        scratch5.i = scratch0.i + S_MUL(scratch7.i,ya.r) + S_MUL(scratch8.i,yb.r);
-
-        scratch6.r =  S_MUL(scratch10.i,ya.i) + S_MUL(scratch9.i,yb.i);
-        scratch6.i = -S_MUL(scratch10.r,ya.i) - S_MUL(scratch9.r,yb.i);
-
-        C_SUB(*Fout1,scratch5,scratch6);
-        C_ADD(*Fout4,scratch5,scratch6);
-
-        scratch11.r = scratch0.r + S_MUL(scratch7.r,yb.r) + S_MUL(scratch8.r,ya.r);
-        scratch11.i = scratch0.i + S_MUL(scratch7.i,yb.r) + S_MUL(scratch8.i,ya.r);
-        scratch12.r = - S_MUL(scratch10.i,yb.i) + S_MUL(scratch9.i,ya.i);
-        scratch12.i = S_MUL(scratch10.r,yb.i) - S_MUL(scratch9.r,ya.i);
-
-        C_ADD(*Fout2,scratch11,scratch12);
-        C_SUB(*Fout3,scratch11,scratch12);
-
-        ++Fout0;++Fout1;++Fout2;++Fout3;++Fout4;
-    }
-}
-
-/* perform the butterfly for one stage of a mixed radix FFT */
-static void kf_bfly_generic(
-        kiss_fft_cpx * Fout,
-        const size_t fstride,
-        const kiss_fft_cfg st,
-        int m,
-        int p
-        )
-{
-    int u,k,q1,q;
-    kiss_fft_cpx * twiddles = st->twiddles;
-    kiss_fft_cpx t;
-    int Norig = st->nfft;
-    
-    kiss_fft_cpx *scratchbuf=(kiss_fft_cpx *)malloc( sizeof(kiss_fft_cpx) * p );
-
-    for ( u=0; u<m; ++u ) {
-        k=u;
-        for ( q1=0 ; q1<p ; ++q1 ) {
-            scratchbufq1 = Fout k  ;
-            C_FIXDIV(scratchbufq1,p);
-            k += m;
-        }
-
-        k=u;
-        for ( q1=0 ; q1<p ; ++q1 ) {
-            int twidx=0;
-            Fout k  = scratchbuf0;
-            for (q=1;q<p;++q ) {
-                twidx += fstride * k;
-                if (twidx>=Norig) twidx-=Norig;
-                C_MUL(t,scratchbufq , twiddlestwidx );
-                C_ADDTO( Fout k  ,t);
-            }
-            k += m;
-        }
-    }
-
-    free( scratchbuf );
-}
-
-static
-void kf_work(
-        kiss_fft_cpx * Fout,
-        const kiss_fft_cpx * f,
-        const size_t fstride,
-        int in_stride,
-        int * factors,
-        const kiss_fft_cfg st
-        )
-{
-    kiss_fft_cpx * Fout_beg=Fout;
-    const int p=*factors++; /* the radix  */
-    const int m=*factors++; /* stage's fft length/p */
-    const kiss_fft_cpx * Fout_end = Fout + p*m;
-
-    if (m==1) {
-        do{
-            *Fout = *f;
-            f += fstride*in_stride;
-        }while(++Fout != Fout_end );
-    }else{
-        do{
-            kf_work( Fout , f, fstride*p, in_stride, factors,st);
-            f += fstride*in_stride;
-        }while( (Fout += m) != Fout_end );
-    }
-
-    Fout=Fout_beg;
-
-    switch (p) {
-        case 2: kf_bfly2(Fout,fstride,st,m); break;
-        case 3: kf_bfly3(Fout,fstride,st,m); break; 
-        case 4: kf_bfly4(Fout,fstride,st,m); break;
-        case 5: kf_bfly5(Fout,fstride,st,m); break; 
-        default: kf_bfly_generic(Fout,fstride,st,m,p); break;
-    }
-}
-
-/*  facbuf is populated by p1,m1,p2,m2, ...
-    where 
-    pi * mi = mi-1
-    m0 = n                  */
-static 
-void kf_factor(int n,int * facbuf)
-{
-    int p=4;
-    double floor_sqrt;
-    floor_sqrt = floor( sqrt((double)n) );
-
-    /*factor out powers of 4, powers of 2, then any remaining primes */
-    do {
-        while (n % p) {
-            switch (p) {
-                case 4: p = 2; break;
-                case 2: p = 3; break;
-                default: p += 2; break;
-            }
-            if (p > floor_sqrt)
-                p = n;          /* no more factors, skip to end */
-        }
-        n /= p;
-        *facbuf++ = p;
-        *facbuf++ = n;
-    } while (n > 1);
-}
-
-/*
- *
- * User-callable function to allocate all necessary storage space for the fft.
- *
- * The return value is a contiguous block of memory, allocated with malloc.  As such,
- * It can be freed with free(), rather than a kiss_fft-specific function.
- * */
-kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem )
-{
-    kiss_fft_cfg st=NULL;
-    size_t memneeded = sizeof(struct kiss_fft_state)
-        + sizeof(kiss_fft_cpx)*(nfft-1); /* twiddle factors*/
-
-    if ( lenmem==NULL ) {
-        st = ( kiss_fft_cfg)malloc( memneeded );
-    }else{
-        if (*lenmem >= memneeded)
-            st = (kiss_fft_cfg)mem;
-        *lenmem = memneeded;
-    }
-    if (st) {
-        int i;
-        const double pi=3.14159265358979323846264338327;
-        const double phase0 = -2.0 * pi / (double)( nfft );
-
-        st->nfft=nfft;
-        st->inverse = inverse_fft;
-
-        for (i=0;i<nfft;++i) {
-            double phase = phase0 * i;
-            if (st->inverse)
-                phase *= -1;
-            kf_cexp(st->twiddles+i, phase );
-        }
-
-        kf_factor(nfft,st->factors);
-    }
-    return st;
-}
-
-
-
-    
-void kiss_fft_stride(kiss_fft_cfg st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int in_stride)
-{
-    if (fin == fout) {
-        kiss_fft_cpx *tmpbuf=(kiss_fft_cpx*)malloc( sizeof(kiss_fft_cpx) * st->nfft );
-        kf_work(tmpbuf,fin,1,in_stride, st->factors,st);
-        memcpy(fout,tmpbuf,sizeof(kiss_fft_cpx)*st->nfft);
-        free( tmpbuf );
-    }else{
-        kf_work( fout, fin, 1,in_stride, st->factors,st );
-    }
-}
-
-void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
-{
-    kiss_fft_stride(cfg,fin,fout,1);
-}
-

_service:obs_scm:faac-1.31.obscpio/libfaac/kiss_fft/kiss_fft.h Deleted

@@ -1,88 +0,0 @@
-#ifndef KISS_FFT_H
-#define KISS_FFT_H
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <memory.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- ATTENTION!
- If you would like a :
- -- a utility that will handle the caching of fft objects
- -- real-only FFT
- -- a multi-dimensional FFT
- -- a command-line utility to perform ffts
- -- a command-line utility to perform fast-convolution filtering
-
- then see tools/
- */
-
-#ifdef FIXED_POINT
-# define kiss_fft_scalar short
-#else
-# ifndef kiss_fft_scalar
-/*  default is float */
-#   define kiss_fft_scalar float
-# endif
-#endif
-
-typedef struct {
-    kiss_fft_scalar r;
-    kiss_fft_scalar i;
-}kiss_fft_cpx;
-
-typedef struct kiss_fft_state* kiss_fft_cfg;
-
-/* 
- *  kiss_fft_alloc
- *  
- *  Initialize a FFT (or IFFT) algorithm's cfg/state buffer.
- *
- *  typical usage:      kiss_fft_cfg mycfg=kiss_fft_alloc(1024,0,NULL,NULL);
- *
- *  The return value from fft_alloc is a cfg buffer used internally
- *  by the fft routine or NULL.
- *
- *  If lenmem is NULL, then kiss_fft_alloc will allocate a cfg buffer using malloc.
- *  The returned value should be free()d when done to avoid memory leaks.
- *  
- *  The state can be placed in a user supplied buffer 'mem':
- *  If lenmem is not NULL and mem is not NULL and *lenmem is large enough,
- *      then the function places the cfg in mem and the size used in *lenmem
- *      and returns mem.
- *  
- *  If lenmem is not NULL and ( mem is NULL or *lenmem is not large enough),
- *      then the function returns NULL and places the minimum cfg 
- *      buffer size in *lenmem.
- * */
-
-kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem); 
-
-/*
- * kiss_fft(cfg,in_out_buf)
- *
- * Perform an FFT on a complex input buffer.
- * for a forward FFT,
- * fin should be  f0 , f1 , ... ,fnfft-1
- * fout will be   F0 , F1 , ... ,Fnfft-1
- * Note that each element is complex and can be accessed like
-    fk.r and fk.i
- * */
-void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
-
-void kiss_fft_stride(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int fin_stride);
-
-/* If kiss_fft_alloc allocated a buffer, it is one contiguous 
-   buffer and can be simply free()d when no longer needed*/
-#define kiss_fft_free free
-
-#ifdef __cplusplus
-} 
-#endif
-
-#endif

_service:obs_scm:faac-1.31.obscpio/libfaac/kiss_fft/kiss_fftr.c Deleted

@@ -1,137 +0,0 @@
-/*
-Copyright (c) 2003-2004, Mark Borgerding
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include "kiss_fftr.h"
-#include "_kiss_fft_guts.h"
-
-struct kiss_fftr_state{
-    kiss_fft_cfg substate;
-    kiss_fft_cpx * tmpbuf;
-    kiss_fft_cpx * super_twiddles;
-};
-
-kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem)
-{
-    int i;
-    kiss_fftr_cfg st = NULL;
-    size_t subsize, memneeded;
-
-    if (nfft & 1) {
-        fprintf(stderr,"Real FFT optimization must be even.\n");
-        return NULL;
-    }
-    nfft >>= 1;
-
-    kiss_fft_alloc (nfft, inverse_fft, NULL, &subsize);
-    memneeded = sizeof(struct kiss_fftr_state) + subsize + sizeof(kiss_fft_cpx) * ( nfft * 2);
-
-    if (lenmem == NULL) {
-        st = (kiss_fftr_cfg) malloc (memneeded);
-    } else {
-        if (*lenmem >= memneeded)
-            st = (kiss_fftr_cfg) mem;
-        *lenmem = memneeded;
-    }
-    if (!st)
-        return NULL;
-
-    st->substate = (kiss_fft_cfg) (st + 1); /*just beyond kiss_fftr_state struct */
-    st->tmpbuf = (kiss_fft_cpx *) (((char *) st->substate) + subsize);
-    st->super_twiddles = st->tmpbuf + nfft;
-    kiss_fft_alloc(nfft, inverse_fft, st->substate, &subsize);
-
-    for (i = 0; i < nfft; ++i) {
-        double phase =
-            -3.14159265358979323846264338327 * ((double) i / nfft + .5);
-        if (inverse_fft)
-            phase *= -1;
-        kf_cexp (st->super_twiddles+i,phase);
-    }
-    return st;
-}
-
-void kiss_fftr(kiss_fftr_cfg st,const kiss_fft_scalar *timedata,kiss_fft_cpx *freqdata)
-{
-    /* input buffer timedata is stored row-wise */
-    int k,N;
-
-    if ( st->substate->inverse) {
-        fprintf(stderr,"kiss fft usage error: improper alloc\n");
-        exit(1);
-    }
-
-    N = st->substate->nfft;
-
-    /*perform the parallel fft of two real signals packed in real,imag*/
-    kiss_fft( st->substate , (const kiss_fft_cpx*)timedata, st->tmpbuf );
- 
-    freqdata0.r = st->tmpbuf0.r + st->tmpbuf0.i;
-    freqdata0.i = 0;
-    C_FIXDIV(freqdata0,2);
-
-    for (k=1;k <= N/2 ; ++k ) {
-        kiss_fft_cpx fpnk,fpk,f1k,f2k,tw;
-
-        fpk = st->tmpbufk; 
-        fpnk.r =  st->tmpbufN-k.r;
-        fpnk.i = -st->tmpbufN-k.i;
-        C_FIXDIV(fpk,2);
-        C_FIXDIV(fpnk,2);
-
-        C_ADD( f1k, fpk , fpnk );
-        C_SUB( f2k, fpk , fpnk );
-        C_MUL( tw , f2k , st->super_twiddlesk);
-
-        C_ADD( freqdatak , f1k ,tw);
-        freqdatak.r = (f1k.r + tw.r) / 2;
-        freqdatak.i = (f1k.i + tw.i) / 2;
-
-        freqdataN-k.r =   (f1k.r - tw.r)/2;
-        freqdataN-k.i = - (f1k.i - tw.i)/2;
-    }
-    freqdataN.r = st->tmpbuf0.r - st->tmpbuf0.i;
-    freqdataN.i = 0;
-    C_FIXDIV(freqdataN,2);
-}
-
-void kiss_fftri(kiss_fftr_cfg st,const kiss_fft_cpx *freqdata,kiss_fft_scalar *timedata)
-{
-    /* input buffer timedata is stored row-wise */
-    int k, N;
-
-    if (st->substate->inverse == 0) {
-        fprintf (stderr, "kiss fft usage error: improper alloc\n");
-        exit (1);
-    }
-
-    N = st->substate->nfft;
-
-    st->tmpbuf0.r = freqdata0.r + freqdataN.r;
-    st->tmpbuf0.i = freqdata0.r - freqdataN.r;
-
-    for (k = 1; k <= N / 2; ++k) {
-        kiss_fft_cpx fk, fnkc, fek, fok, tmpbuf;
-        fk = freqdatak;
-        fnkc.r = freqdataN - k.r;
-        fnkc.i = -freqdataN - k.i;
-
-        C_ADD (fek, fk, fnkc);
-        C_SUB (tmpbuf, fk, fnkc);
-        C_MUL (fok, tmpbuf, st->super_twiddlesk);
-        C_ADD (st->tmpbufk, fek, fok);
-        C_SUB (st->tmpbufN - k, fek, fok);
-        st->tmpbufN - k.i *= -1;
-    }
-    kiss_fft (st->substate, st->tmpbuf, (kiss_fft_cpx *) timedata);
-}

_service:obs_scm:faac-1.31.obscpio/libfaac/kiss_fft/kiss_fftr.h Deleted

_service:obs_scm:faac-1.31.obscpio/plugins Deleted

_service:obs_scm:faac-1.31.obscpio/plugins/cooledit Deleted

_service:obs_scm:faac-1.31.obscpio/plugins/cooledit/Copying Deleted

@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-&#xc;
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-&#xc;
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-&#xc;
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-&#xc;
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-&#xc;
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

_service:obs_scm:faac-1.31.obscpio/plugins/cooledit/FAAC.def Deleted

_service:obs_scm:faac-1.31.obscpio/plugins/cooledit/FAAC.sln Deleted

@@ -1,43 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FAAC", "FAAC.vcproj", "{DEC2740A-F3D5-430C-BB81-C57006D20378}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2E6FD2E8-55B9-4740-8882-CF823F77F7E1} = {2E6FD2E8-55B9-4740-8882-CF823F77F7E1}
-		{429A062F-81E0-4EFD-832B-55E0DE931FC8} = {429A062F-81E0-4EFD-832B-55E0DE931FC8}
-		{BD8FBE75-314D-476B-B13C-A206C52F0BD1} = {BD8FBE75-314D-476B-B13C-A206C52F0BD1}
-		{7F01A591-0084-4749-B53F-F9D2BFE8DF6E} = {7F01A591-0084-4749-B53F-F9D2BFE8DF6E}
-		{6440BFC6-57A6-4F6E-A8FB-F960D088ADEE} = {6440BFC6-57A6-4F6E-A8FB-F960D088ADEE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aacInfoLib", "aacInfoLib.vcproj", "{3257D980-5029-486B-94DC-AA520B501C62}"
-EndProject
-Project("{059D6162-CD51-11D0-AE1F-00A0C90FFFC3}") = "id3lib", "..\..\..\faad2\common\id3lib\libprj\id3lib.dsp", "{7F01A591-0084-4749-B53F-F9D2BFE8DF6E}"
-EndProject
-Project("{059D6162-CD51-11D0-AE1F-00A0C90FFFC3}") = "libfaac", "..\..\libfaac\libfaac.dsp", "{2E6FD2E8-55B9-4740-8882-CF823F77F7E1}"
-EndProject
-Project("{059D6162-CD51-11D0-AE1F-00A0C90FFFC3}") = "libfaad", "..\..\..\faad2\libfaad\libfaad.dsp", "{429A062F-81E0-4EFD-832B-55E0DE931FC8}"
-EndProject
-Project("{059D6162-CD51-11D0-AE1F-00A0C90FFFC3}") = "libmp4v2_st", "..\..\..\faad2\common\mp4v2\libmp4v2_st60.dsp", "{BD8FBE75-314D-476B-B13C-A206C52F0BD1}"
-EndProject
-Project("{059D6162-CD51-11D0-AE1F-00A0C90FFFC3}") = "zlib", "..\..\..\faad2\common\id3lib\zlib\prj\zlib.dsp", "{6440BFC6-57A6-4F6E-A8FB-F960D088ADEE}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DEC2740A-F3D5-430C-BB81-C57006D20378}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DEC2740A-F3D5-430C-BB81-C57006D20378}.Debug|Win32.Build.0 = Debug|Win32
-		{DEC2740A-F3D5-430C-BB81-C57006D20378}.Release|Win32.ActiveCfg = Release|Win32
-		{DEC2740A-F3D5-430C-BB81-C57006D20378}.Release|Win32.Build.0 = Release|Win32
-		{3257D980-5029-486B-94DC-AA520B501C62}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3257D980-5029-486B-94DC-AA520B501C62}.Debug|Win32.Build.0 = Debug|Win32
-		{3257D980-5029-486B-94DC-AA520B501C62}.Release|Win32.ActiveCfg = Release|Win32
-		{3257D980-5029-486B-94DC-AA520B501C62}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

_service:obs_scm:faac-1.31.obscpio/plugins/cooledit/FAAC.vcproj Deleted

@@ -1,521 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="FAAC"
-	ProjectGUID="{DEC2740A-F3D5-430C-BB81-C57006D20378}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/FAAC.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,../../common/Cfaac,../../../faad2/common/id3lib/include,../../include,../../../faad2/include,../../../faad2/common/faad,../../common/mp4v2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/FAAC.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1040"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
-				OutputFile="Release/FAAC.flt"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\FAAC.def"
-				ProgramDatabaseFile=".\Release/FAAC.pdb"
-				ImportLibrary=".\Release/FAAC.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/FAAC.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/FAAC.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".,../../common/Cfaac,../../../faad2/common/id3lib/include,../../include,../../../faad2/include,../../../faad2/common/faad,../../common/mp4v2"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/FAAC.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1040"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
-				OutputFile="Debug\FAAC.flt"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\FAAC.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/FAAC.pdb"
-				ImportLibrary=".\Debug/FAAC.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/FAAC.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\common\Cfaac\Cfaac.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\Cfaad.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\CRegistry.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\CTag.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\DecDialog.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\EncDialog.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Faac.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="FAAC.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\FAAC.rc"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\Audiocoding.com\repository\faac\common\Cfaac"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="\Audiocoding.com\repository\faac\common\Cfaac"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Faad.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Main.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\common\Cfaac\Cfaac.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\Cfaad.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\CRegistry.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\CTag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\DecDialog.h"
-				>
-			</File>
-			<File
-				RelativePath="Defines.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\EncDialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\faac.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\faad2\include\faad.h"
-				>
-			</File>
-			<File
-				RelativePath="Filters.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\resource.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\TypeDef.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="..\..\common\Cfaac\AudioCoding.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\Email.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\id3v2.ico"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\Mail.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\Cfaac\mpeg4ip-v.bmp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

_service:obs_scm:faac-1.31.obscpio/plugins/cooledit/Faac.cpp Deleted

@@ -1,108 +0,0 @@
-/*
-FAAC - codec plugin for Cooledit
-Copyright (C) 2002-2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-#include <windows.h>
-#include "resource.h"
-#include "filters.h"	// CoolEdit
-#include "Defines.h"	// my defines
-#include "EncDialog.h"
-#include "Cfaac.h"
-
-
-
-// *********************************************************************************************
-
-
-
-inline DWORD ERROR_FGO(char *msg)
-{
-	if(msg)
-	{
-	char buf100;
-		sprintf(buf,"FilterGetOptions: %s", msg);
-		MessageBox(0, buf, APP_NAME " plugin", MB_OK|MB_ICONSTOP);
-	}
-	return 0;
-}
-// -----------------------------------------------------------------------------------------------
-
-DWORD FAR PASCAL FilterGetOptions(HWND hWnd, HINSTANCE hInst, long lSamprate, WORD wChannels, WORD wBitsPerSample, DWORD dwOptions)
-{
-long retVal=DialogBoxParam((HINSTANCE)hInst,(LPCSTR)MAKEINTRESOURCE(IDD_ENCODER), (HWND)hWnd, (DLGPROC)DIALOGMsgProcEnc, dwOptions);
-
-	if(retVal==-1)
-		/*return */ERROR_FGO("DialogBoxParam");
-
-	return !retVal ? dwOptions : retVal;
-}
-// *********************************************************************************************
-
-// GetSuggestedSampleType() is called if OpenFilterOutput() returns NULL
-void FAR PASCAL GetSuggestedSampleType(LONG *lplSamprate, WORD *lpwBitsPerSample, WORD *wChannels)
-{
-	*lplSamprate=0; // don't care
-	*lpwBitsPerSample= *lpwBitsPerSample<=16 ? 0 : 16;
-	*wChannels= *wChannels<49 ? 0 : 48;
-}
-// *********************************************************************************************
-
-void FAR PASCAL CloseFilterOutput(HANDLE hOutput)
-{
-	if(!hOutput)
-		return;
-
-Cfaac tmp(hOutput); // this line frees memory
-}              
-// *********************************************************************************************
-
-HANDLE FAR PASCAL OpenFilterOutput(LPSTR lpstrFilename,long lSamprate,WORD wBitsPerSample,WORD wChannels,long lSize, long far *lpChunkSize, DWORD dwOptions)
-{
-HANDLE	hOutput;
-Cfaac	tmp;
-CMyEncCfg	cfg(false);
-char	*srcFilename=tmp.getSourceFilename(cfg.TagSrcPath,lpstrFilename,cfg.TagSrcExt);
-
-	if(hOutput=tmp.Init(srcFilename,lpstrFilename,lSamprate,wBitsPerSample,wChannels,lSize))
-	{
-	MYOUTPUT *mo;
-		GLOBALLOCK(mo,hOutput,MYOUTPUT,return NULL);
-		*lpChunkSize=mo->samplesInput*(wBitsPerSample>>3); // size of samplesInput
-
-		GlobalUnlock(hOutput);
-		tmp.hOutput=NULL;
-	}
-
-	FREE_ARRAY(srcFilename);
-	return hOutput;
-}
-// *********************************************************************************************
-
-DWORD FAR PASCAL WriteFilterOutput(HANDLE hOutput, unsigned char far *bufIn, long lBytes)
-{
-	if(!hOutput)
-		return 0;
-
-Cfaac tmp;
-DWORD bytesWritten;
-
-	bytesWritten=tmp.processData(hOutput,bufIn,lBytes);
-	return bytesWritten ? bytesWritten : 0x7fffffff; // bytesWritten<=0 stops CoolEdit
-}

_service:obs_scm:faac-1.31.obscpio/plugins/cooledit/Faad.cpp Deleted

@@ -1,216 +0,0 @@
-/*
-FAAC - codec plugin for Cooledit
-Copyright (C) 2002-2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-#include <windows.h>
-//#include "resource.h"
-#include "filters.h"	// CoolEdit
-#include "DecDialog.h"
-#include "Cfaad.h"
-
-// *********************************************************************************************
-
-BOOL FAR PASCAL FilterUnderstandsFormat(LPSTR filename)
-{
-WORD len;
-
-	if((len=lstrlen(filename))>4 && 
-		(!strcmpi(filename+len-4,".aac") ||
-		!strcmpi(filename+len-4,".mp4") ||
-		!strcmpi(filename+len-4,".m4a")))
-		return TRUE;
-	return FALSE;
-}
-// *********************************************************************************************
-
-long FAR PASCAL FilterGetFileSize(HANDLE hInput)
-{
-	if(!hInput)
-		return 0;
-
-DWORD	dst_size;
-MYINPUT	*mi;
-
-	GLOBALLOCK(mi,hInput,MYINPUT,return 0);
-	dst_size=mi->dst_size;
-	
-	GlobalUnlock(hInput);
-
-	return dst_size;
-}
-// *********************************************************************************************
-
-DWORD FAR PASCAL FilterOptionsString(HANDLE hInput, LPSTR szString)
-{
-	if(!hInput)
-	{
-		lstrcpy(szString,"");
-		return 0;
-	}
-
-MYINPUT	*mi;
-
-	GLOBALLOCK(mi,hInput,MYINPUT,return 0);
-
-	sprintf(szString,"MPEG%d - %lu bps\n", mi->file_info.version ? 4 : 2, mi->file_info.bitrate);
-	
-	if(mi->IsMP4)  // MP4 file --------------------------------------------------------------------
-		lstrcat(szString,mpeg4AudioNamesmi->type);
-	else  // AAC file -----------------------------------------------------------------------------
-	{
-		switch(mi->file_info.headertype)
-		{
-		case RAW:
-			sprintf(szString,"MPEG%d\nRaw\n", mi->file_info.version ? 4 : 2);
-			lstrcat(szString,mpeg4AudioNamesmi->file_info.object_type);
-			GlobalUnlock(hInput);
-			return 1;//0; // call FilterGetOptions()
-		case ADIF:
-			lstrcat(szString,"ADIF\n");
-			break;
-		case ADTS:
-			lstrcat(szString,"ADTS\n");
-			break;
-		}
-		
-		lstrcat(szString,mpeg4AudioNamesmi->file_info.object_type);
-/*		switch(mi->file_info.object_type)
-		{
-		case MAIN:
-			lstrcat(szString,"Main");
-			break;
-		case LC:
-			lstrcat(szString,"LC (Low Complexity)");
-			break;
-		case SSR:
-			lstrcat(szString,"SSR (unsupported)");
-			break;
-		case LTP:
-			lstrcat(szString,"LTP (Long Term Prediction)");
-			break;
-		case HE_AAC:
-			lstrcat(szString,"HE (High Efficiency)");
-			break;
-		}*/
-	}
-	
-	GlobalUnlock(hInput);
-	return 1; // don't call FilterGetOptions()
-}
-// *********************************************************************************************
-/*
-DWORD FAR PASCAL FilterOptions(HANDLE hInput)
-{
-//	FilterGetOptions() is called if this function and FilterSetOptions() are exported and FilterOptionsString() returns 0
-//	FilterSetOptions() is called only if this function is exported and and it returns 0
-
-	return 1;
-}
-// ---------------------------------------------------------------------------------------------
-
-DWORD FAR PASCAL FilterSetOptions(HANDLE hInput, DWORD dwOptions, LONG lSamprate, WORD wChannels, WORD wBPS)
-{
-	return dwOptions;
-}*/
-// *********************************************************************************************
-
-void FAR PASCAL CloseFilterInput(HANDLE hInput)
-{
-	if(!hInput)
-		return;
-
-/*	if(mi->file_info.headertype==RAW)
-	{
-	CRegistry	reg;
-
-		if(reg.openCreateReg(HKEY_CURRENT_USER,REGISTRY_PROGRAM_NAME  "\\FAAD"))
-			reg.setRegBool("OpenDialog",FALSE);
-		else
-			MessageBox(0,"Can't open registry!",0,MB_OK|MB_ICONSTOP);
-	}*/
-
-Cfaad tmp(hInput);
-}
-// *********************************************************************************************
-
-#define ERROR_OFI(msg) \
-{ \
-	if(msg) \
-		MessageBox(0, msg, APP_NAME " plugin", MB_OK|MB_ICONSTOP); \
-	if(hInput) \
-	{ \
-		GlobalUnlock(hInput); \
-		CloseFilterInput(hInput); \
-	} \
-	return 0; \
-}
-// -----------------------------------------------------------------------------------------------
-
-// return handle that will be passed in to close, and write routines
-HANDLE FAR PASCAL OpenFilterInput(LPSTR lpstrFilename, long far *lSamprate, WORD far *wBitsPerSample, WORD far *wChannels, HWND hWnd, long far *lChunkSize)
-{
-HANDLE	hInput=NULL;
-Cfaad	tmp;
-CMyDecCfg cfg(false);
-
-	if(!*lSamprate && !tmp.IsMP4(lpstrFilename))
-	{
-/*	aac_buffer	b;
-	float		fLength;
-	int			bitrate;
-	DWORD		headertype;
-		tmp.GetAACInfos(lpstrFilename,&b,&headertype,&fLength,&bitrate);
-		if(headertype==RAW)
-			tmp.ShowDlg4RawAAC=ShowDlg4RawAAC;*/
-    DWORD           *seek_table;
-    int             seek_table_length;
-	faadAACInfo     file_info;
-		if(!get_AAC_format(lpstrFilename, &file_info, &seek_table, &seek_table_length, 0))
-			if(file_info.headertype==RAW)
-				tmp.ShowDlg4RawAAC=ShowDlg4RawAAC;
-	}
-
-	if(hInput=tmp.getInfos(lpstrFilename))
-	{
-	MYINPUT	*mi;
-		GLOBALLOCK(mi,hInput,MYINPUT,return NULL);
-	
-		*wChannels=(WORD)mi->Channels;
-		*lSamprate=mi->Samprate;
-		*wBitsPerSample=mi->BitsPerSample;
-		*lChunkSize=(*wBitsPerSample/8)*1024**wChannels*2;
-
-		GlobalUnlock(hInput);
-		tmp.hInput=NULL;
-	}
-
-	return hInput;
-}
-// *********************************************************************************************
-
-DWORD FAR PASCAL ReadFilterInput(HANDLE hInput, unsigned char far *bufout, long lBytes)
-{
-	if(!hInput)
-		return 0;
-
-Cfaad tmp;
-
-	return tmp.processData(hInput,bufout,lBytes);
-}

_service:obs_scm:faac-1.31.obscpio/plugins/cooledit/Main.cpp Deleted

@@ -1,122 +0,0 @@
-/*
-FAAC - codec plugin for Cooledit
-Copyright (C) 2002-2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-#include <windows.h>
-#include "resource.h"
-#include "filters.h"	//CoolEdit
-//#include "faac.h"
-#include "Defines.h"	// my defines
-
-// Plugins of CoolEdit can be unloaded between each call of its exported funcs,
-// that's why no global variables can be used
-
-HINSTANCE hInstance=NULL;
-HBITMAP hBmBrowse=NULL;
-
-BOOL WINAPI DllMain (HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
-{
-	switch (fdwReason)
-	{
-	case DLL_PROCESS_ATTACH:
-		hInstance=(HINSTANCE)hModule;
-		if(!hBmBrowse)
-			hBmBrowse=(HBITMAP)LoadImage(hInstance,MAKEINTRESOURCE(IDB_BROWSE),IMAGE_BITMAP,0,0,/*LR_CREATEDIBSECTION|*/LR_LOADTRANSPARENT|LR_LOADMAP3DCOLORS);
-        /*	Code from LibMain inserted here.  Return TRUE to keep the
-			DLL loaded or return FALSE to fail loading the DLL.
-
-			You may have to modify the code in your original LibMain to
-			account for the fact that it may be called more than once.
-			You will get one DLL_PROCESS_ATTACH for each process that
-			loads the DLL. This is different from LibMain which gets
-			called only once when the DLL is loaded. The only time this
-			is critical is when you are using shared data sections.
-			If you are using shared data sections for statically
-			allocated data, you will need to be careful to initialize it
-			only once. Check your code carefully.
-
-			Certain one-time initializations may now need to be done for
-			each process that attaches. You may also not need code from
-			your original LibMain because the operating system may now
-			be doing it for you.
-         */
-         break;
-		
-	case DLL_THREAD_ATTACH:
-         /*	Called each time a thread is created in a process that has
-			already loaded (attached to) this DLL. Does not get called
-			for each thread that exists in the process before it loaded
-			the DLL.
-			Do thread-specific initialization here.
-         */
-		break;
-		
-	case DLL_THREAD_DETACH:
-         /*	Same as above, but called when a thread in the process
-            exits.
-            Do thread-specific cleanup here.
-         */
-		break;
-		
-	case DLL_PROCESS_DETACH:
-		/*	Code from _WEP inserted here.  This code may (like the
-			LibMain) not be necessary.  Check to make certain that the
-			operating system is not doing it for you.
-			*/
-		hInstance=NULL;
-		if(hBmBrowse)
-		{
-            DeleteObject(hBmBrowse);
-            hBmBrowse=NULL;
-		}
-		break;
-	}
- 
-	/*	The return value is only used for DLL_PROCESS_ATTACH; all other
-		conditions are ignored.
-	*/
-	return TRUE;   // successful DLL_PROCESS_ATTACH
-}
-
-// Fill COOLQUERY structure with information regarding this file filter
-short FAR PASCAL QueryCoolFilter(COOLQUERY far * cq)
-{
-	lstrcpy(cq->szName, APP_NAME);		
-	lstrcpy(cq->szCopyright, APP_NAME " codec");
-	lstrcpy(cq->szExt,"AAC");
-	lstrcpy(cq->szExt2,"MP4"); 
-	lstrcpy(cq->szExt3,"M4A"); 
-	cq->lChunkSize=16384; 
-	cq->dwFlags=QF_RATEADJUSTABLE|QF_CANLOAD|QF_CANSAVE|QF_HASOPTIONSBOX|QF_CANDO32BITFLOATS;
- 	cq->Mono8=R_5500|R_11025|R_22050|R_32075|R_44100|R_48000;
- 	cq->Mono12=0;		// no support
- 	cq->Mono16=R_5500|R_11025|R_22050|R_32075|R_44100|R_48000;
- 	cq->Mono24=0;
- 	cq->Mono32=R_5500|R_11025|R_22050|R_32075|R_44100|R_48000;
- 	cq->Stereo8=R_5500|R_11025|R_22050|R_32075|R_44100|R_48000;
- 	cq->Stereo12=0;
- 	cq->Stereo16=R_5500|R_11025|R_22050|R_32075|R_44100|R_48000;
- 	cq->Stereo24=0;
- 	cq->Stereo32=R_5500|R_11025|R_22050|R_32075|R_44100|R_48000;
- 	cq->Quad8=0;
- 	cq->Quad16=0;
- 	cq->Quad32=0;
- 	return C_VALIDLIBRARY;
-}

_service:obs_scm:faac-1.31.obscpio/plugins/cooledit/Readme.txt Deleted

@@ -1,33 +0,0 @@
-+-----------------------------------------------------------------+
-|                                                                 |
-|                    Cooledit/Audition plugin                     |
-|                    ------------------------                     |
-|                                                                 |
-+-----------------------------------------------------------------+
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY.
-
-----------------------------------------------------------------------------
-
-FAAC is a codec plugin for Cooledit/Audition to import and export .aac/.mp4 files.
-
-To use it:
-----------
-
-1) put FAAC and FAAD2 packages into the same folder;
-2) open the project, set "Active Configuration = FAAC - win32 Release" and compile;
-3) copy FAAC.flt into CoolEdit folder and delete flt.dat
-
-To write .mp4 files:
---------------------
-
-Select "Write .mp4" in the config dialog or
-append .mp4 extension to the name of file in the "Save waveform as" dialog.
-
-----------------------------------------------------------------------------
-
-For suggestions, bugs report, etc., you can contact me at
-ntnfrn_email-temp@yahoo.it

_service:obs_scm:faac-1.31.obscpio/plugins/cooledit/aacInfoLib.sln Deleted

_service:obs_scm:faac-1.31.obscpio/plugins/cooledit/aacInfoLib.vcproj Deleted

@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="aacInfoLib"
-	ProjectGUID="{3257D980-5029-486B-94DC-AA520B501C62}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../faad2/common/faad"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/aacInfoLib.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1040"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\Debug\aacInfoLib.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/aacInfoLib.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../faad2/common/faad"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/aacInfoLib.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1040"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\Release\aacInfoLib.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/aacInfoLib.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\..\faad2\common\faad\aacinfo.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\faad2\common\faad\filestream.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\common\faad\aacinfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\faad\filestream.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

_service:obs_scm:faac-1.31.obscpio/plugins/cooledit/defines.h Deleted

@@ -1,48 +0,0 @@
-/*
-FAAC - codec plugin for Cooledit
-Copyright (C) 2002-2004 Antonio Foranna
-
-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.
-	
-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., 675 Mass Ave, Cambridge, MA 02139, USA.
-			
-The author can be contacted at:
-ntnfrn_email-temp@yahoo.it
-*/
-
-#define APP_NAME "MPEG4-AAC"
-#define APP_VER "v2.6"
-#define REGISTRY_PROGRAM_NAME "SOFTWARE\\4N\\CoolEdit\\AAC-MPEG4"
-
-//#define USE_OUTPUT_FOLDER
-#define USE_IMPORT_TAG
-#define USE_PATHEXT
-
-// *********************************************************************************************
-
-#define FREE_ARRAY(ptr) \
-{ \
-	if(ptr!=NULL) \
-		free(ptr); \
-	ptr=NULL; \
-}
-
-// -----------------------------------------------------------------------------------------------
-
-#define GLOBALLOCK(ptr,handle,type,ret) \
-{ \
-	if(!(ptr=(type *)GlobalLock(handle))) \
-	{ \
-		MessageBox(0, "GlobalLock", APP_NAME " plugin", MB_OK|MB_ICONSTOP); \
-		ret; \
-	} \
-}

_service:obs_scm:faac-1.31.obscpio/plugins/cooledit/filters.h Deleted

@@ -1,121 +0,0 @@
-//////////////////////////////////////////////////////
-// GENERAL PURPOSE DEFS FOR CREATING CUSTOM FILTERS //
-//////////////////////////////////////////////////////
-
-
-typedef struct riffspecialdata_t
-{	HANDLE hSpecialData;	
-	HANDLE hData;			// Actual data handle
-	DWORD  dwSize;			// size of data in handle
-	DWORD  dwExtra;			// optional extra data (usually a count)
-	char   szListType8;	// Parent list type (usually "WAVE" or "INFO", or "adtl")
-	char   szType8;		// Usually a four character code for data, but can be up to 7 chars
-} SPECIALDATA;
-
-// "CUE " dwExtra=number of cues, each cue is 8 bytes		(4 name 4 sample offset)
-// "LTXT" dwExtra=number of items, each one is 8 bytes		(4 ltxt len 4 name 4 cue length 4 purpose n data)
-// "NOTE" dwExtra=number of strings, each one is n bytes	(4 name n-4 length zero term)
-// "LABL" dwExtra=number of strings, each one is n bytes	(4 name n-4 length zero term)
-// "PLST" dwExtra=number if items, each one is 16 bytes		(4 name 4 dwLen 4 dwLoops 4 dwMode)
-
-
-// For special data, .FLT must implement FilterGetFirstSpecialData and FilterGetNextSpecialData
-
-
-typedef DWORD           FOURCC;         // a four character code
-
-struct cue_type { DWORD dwName;
-				  DWORD dwPosition;
-				  FOURCC fccChunk;
-				  DWORD dwChunkStart;
-				  DWORD dwBlockStart;
-				  DWORD dwSampleOffset;
-				 };
-
-struct play_type {DWORD dwName;
-					 DWORD dwLength;
-					 DWORD dwLoops;
-					};
-
-
-typedef struct coolquery_tag
-	{char szName24;
-	 char szCopyright80;
-	 
-	 // rate table, bits are set for modes that can be handled
-	 WORD Quad32;  // Quads are 3-D encoded
-	 WORD Quad16;
-	 WORD Quad8;
-	 WORD Stereo8;    		// rates are from lowest bit:
-	 WORD Stereo12;   		// bit 0 set: 5500 (5512.5)
-	 WORD Stereo16;   		// bit 1 set: 11025 (11K)
-	 WORD Stereo24;   		// bit 2 set: 22050 (22K)
-	 WORD Stereo32;   		// bit 3 set: 32075 (32K, or 32000)
-	 WORD Mono8;      		// bit 4 set: 44100 (44K)
-	 WORD Mono12;	  		// bit 5 set: 48000 (48K)
-	 WORD Mono16;	  		// bit 6 set: 88200 (88K)   (future ultra-sonic rates?)
-	 WORD Mono24;	  		// bit 7 set: 96000 (96K)
-	 WORD Mono32;     		// bit 8 set: 132300 (132K)
-	 				  		// bit 9 set: 176400 (176K)
-	 DWORD dwFlags;
-	 char szExt4;
-	 long lChunkSize;
-	 char szExt24;
-	 char szExt34;
-	 char szExt44;
-	} COOLQUERY;
-
-#define R_5500   1
-#define R_11025  2
-#define R_22050  4
-#define R_32075  8
-#define R_44100  16
-#define R_48000  32
-#define R_88200  64
-#define R_96000  128
-#define R_132300 256
-#define R_176400 512
-
-#define C_VALIDLIBRARY 1154
-
-#define QF_RATEADJUSTABLE		0x001   // if can handle non-standard sample rates
-										// if not, only rates in bit rate table understood
-#define QF_CANSAVE				0x002		  
-#define QF_CANLOAD				0x004
-#define QF_UNDERSTANDSALL		0x008   // will read ANYTHING, so it is the last resort if no other
-										// formats match
-#define QF_READSPECIALFIRST		0x010	// read special info before trying to read data
-#define QF_READSPECIALLAST		0x020	// read special info after reading data
-#define QF_WRITESPECIALFIRST	0x040	// when writing a file, special info is sent to DLL before data
-#define QF_WRITESPECIALLAST		0x080	// when writing, special info is sent to DLL after data
-#define QF_HASOPTIONSBOX		0x100	// set if options box implemented
-#define QF_NOASKFORCONVERT		0x200	// set to bypass asking for conversion if original in different rate, auto convert
-#define QF_NOHEADER				0x400	// set if this is a raw data format with no header
-#define QF_CANDO32BITFLOATS		0x800	// set if file format can handle 32-bit sample data for input
-#define QF_CANOPENVIRTUAL		0x1000	// Set if data is in Intel 8-bit or 16-bit sample format, or floats
-										// and the GetDataOffset() function is implemented
-
-// special types are read from and written to DLL in the order below
-/*
-// special types (particular to Windows waveforms)
-#define SP_IART  20
-#define SP_ICMT  21
-#define SP_ICOP  22
-#define SP_ICRD  23
-#define SP_IENG  24
-#define SP_IGNR  25
-#define SP_IKEY  26
-#define SP_IMED  27
-#define SP_INAM  28
-#define SP_ISFT  29
-#define SP_ISRC  30
-#define SP_ITCH  31
-#define SP_ISBJ  32
-#define SP_ISRF  33
-#define SP_DISP  34
-#define SP_CUE   40 // returns number of cues of size cue_type 
-#define SP_LTXT  41 // returns number of adtl texts of size 8 (4,id and 4,len)
-#define SP_NOTE  42 // returns LO=size, HI=number of strings (sz sz sz...)
-#define SP_LABL	 43 // returns LO=size, HI=number of strings (sz sz sz...)
-#define SP_PLST  44 // returns number of playlist entries size play_type 
-*/
\ No newline at end of file

_service:obs_scm:faac-1.31.obscpio/plugins/winamp Deleted

_service:obs_scm:faac-1.31.obscpio/plugins/winamp/filters.h Deleted

_service:obs_scm:faac-1.31.obscpio/plugins/winamp/out_FAAC.dsp Deleted

@@ -1,171 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Out_FAAC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=Out_FAAC - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "Out_FAAC.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Out_FAAC.mak" CFG="Out_FAAC - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Out_FAAC - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "Out_FAAC - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Out_FAAC - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OUT_FAAC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "../../common/mp4v2" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x410 /d "NDEBUG"
-# ADD RSC /l 0x410 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"Release/Out_AAC.dll"
-
-!ELSEIF  "$(CFG)" == "Out_FAAC - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OUT_FAAC_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../faad2/include" /I "../../../faad2/common/faad" /I "../../common/mp4v2" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x410 /d "_DEBUG"
-# ADD RSC /l 0x410 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"C:\Program Files\Audio\Gen\Winamp\Plugins\Out_AAC.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Out_FAAC - Win32 Release"
-# Name "Out_FAAC - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\Cfaac.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CRegistry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FAAC.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\Out_faac.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Out_FAAC.def
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\Cfaac.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CRegistry.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\defines.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\faac.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\FILTERS.H
-# End Source File
-# Begin Source File
-
-SOURCE=.\OUT.H
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\AudioCoding.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Email.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=".\mpeg4ip-v.bmp"
-# End Source File
-# Begin Source File
-
-SOURCE=.\Open.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Open.ico
-# End Source File
-# End Group
-# End Target
-# End Project

_service:obs_scm:faac-1.31.obscpio/project Deleted

_service:obs_scm:faac-1.31.obscpio/project/msvc Deleted

_service:obs_scm:faac-1.31.obscpio/project/msvc/faac.sln Deleted

@@ -1,71 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29424.173
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaac_dll", "libfaac_dll.vcxproj", "{856BB8CF-B944-4D7A-9D59-4945316229AA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaac_dll_drm", "libfaac_dll_drm.vcxproj", "{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaac", "libfaac.vcxproj", "{9CC48C6E-92EB-4814-AD37-97AB3622AB65}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "faac", "faac.vcxproj", "{92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "faacgui", "faacgui.vcxproj", "{B4FD0E50-5379-48C3-8D3E-D948A8921CA8}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Debug|Win32.Build.0 = Debug|Win32
-		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Debug|x64.ActiveCfg = Debug|x64
-		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Debug|x64.Build.0 = Debug|x64
-		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Release|Win32.ActiveCfg = Release|Win32
-		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Release|Win32.Build.0 = Release|Win32
-		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Release|x64.ActiveCfg = Release|x64
-		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Release|x64.Build.0 = Release|x64
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Debug|Win32.Build.0 = Debug|Win32
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Debug|Win32.Deploy.0 = Debug|Win32
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Debug|x64.ActiveCfg = Debug|x64
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Debug|x64.Build.0 = Debug|x64
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Release|Win32.ActiveCfg = Release|Win32
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Release|Win32.Build.0 = Release|Win32
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Release|x64.ActiveCfg = Release|x64
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Release|x64.Build.0 = Release|x64
-		{9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Debug|Win32.Build.0 = Debug|Win32
-		{9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Debug|x64.ActiveCfg = Debug|x64
-		{9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Debug|x64.Build.0 = Debug|x64
-		{9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Release|Win32.ActiveCfg = Release|Win32
-		{9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Release|Win32.Build.0 = Release|Win32
-		{9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Release|x64.ActiveCfg = Release|x64
-		{9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Release|x64.Build.0 = Release|x64
-		{92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}.Debug|Win32.Build.0 = Debug|Win32
-		{92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}.Debug|x64.ActiveCfg = Debug|x64
-		{92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}.Debug|x64.Build.0 = Debug|x64
-		{92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}.Release|Win32.ActiveCfg = Release|Win32
-		{92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}.Release|Win32.Build.0 = Release|Win32
-		{92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}.Release|x64.ActiveCfg = Release|x64
-		{92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}.Release|x64.Build.0 = Release|x64
-		{B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Debug|Win32.Build.0 = Debug|Win32
-		{B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Debug|x64.ActiveCfg = Debug|x64
-		{B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Debug|x64.Build.0 = Debug|x64
-		{B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Release|Win32.ActiveCfg = Release|Win32
-		{B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Release|Win32.Build.0 = Release|Win32
-		{B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Release|x64.ActiveCfg = Release|x64
-		{B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FEB55784-5428-470E-835B-D21D471570FE}
-	EndGlobalSection
-EndGlobal

_service:obs_scm:faac-1.31.obscpio/project/msvc/faac.vcxproj Deleted

@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.26730.12</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0413</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0413</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0413</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0413</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\frontend\input.c" />
-    <ClCompile Include="..\..\frontend\main.c" />
-    <ClCompile Include="..\..\frontend\mp4write.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\frontend\mp4write.h" />
-    <ClInclude Include="..\..\include\faac.h" />
-    <ClInclude Include="..\..\frontend\getopt.h" />
-    <ClInclude Include="..\..\frontend\input.h" />
-    <ClInclude Include="unistd.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libfaac.vcxproj">
-      <Project>{9cc48c6e-92eb-4814-ad37-97ab3622ab65}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

_service:obs_scm:faac-1.31.obscpio/project/msvc/faac.vcxproj.filters Deleted

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{c76ca49b-b803-46e5-a392-7c630b482af6}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{321d4908-5e90-4d86-b269-14d20fca0a59}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\frontend\input.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\frontend\main.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\frontend\mp4write.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\faac.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\frontend\getopt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\frontend\input.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\frontend\mp4write.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="unistd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file

_service:obs_scm:faac-1.31.obscpio/project/msvc/faacgui.vcxproj Deleted

@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B4FD0E50-5379-48C3-8D3E-D948A8921CA8}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.26730.12</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\frontend\input.c" />
-    <ClCompile Include="..\..\frontend\maingui.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\faac.h" />
-    <ClInclude Include="..\..\frontend\resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\frontend\faacgui.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libfaac.vcxproj">
-      <Project>{9cc48c6e-92eb-4814-ad37-97ab3622ab65}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

_service:obs_scm:faac-1.31.obscpio/project/msvc/faacgui.vcxproj.filters Deleted

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{15442f02-1807-49f3-baea-57f94733975e}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{f1df32bb-4c02-4682-b956-6fb8f7f6db58}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{df6f7e21-d746-4dd4-96d7-f3abd45ce335}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\frontend\input.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\frontend\maingui.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\faac.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\frontend\resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\frontend\faacgui.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file

_service:obs_scm:faac-1.31.obscpio/project/msvc/libfaac.vcxproj Deleted

@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>libfaac</ProjectName>
-    <ProjectGuid>{9CC48C6E-92EB-4814-AD37-97AB3622AB65}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.26730.12</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-    <TargetName>faac</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-    <TargetName>faac</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-    <TargetName>faac</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-    <TargetName>faac</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Lib>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PreBuildEvent>
-      <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faac" "$(SolutionDir)..\..\configure.ac" &gt; "$(SolutionDir)..\..\libfaac\win32_ver.h"</Command>
-      <Message>Retrieving package version...</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Lib>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PreBuildEvent>
-      <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faac" "$(SolutionDir)..\..\configure.ac" &gt; "$(SolutionDir)..\..\libfaac\win32_ver.h"</Command>
-      <Message>Retrieving package version...</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Lib>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PreBuildEvent>
-      <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faac" "$(SolutionDir)..\..\configure.ac" &gt; "$(SolutionDir)..\..\libfaac\win32_ver.h"</Command>
-      <Message>Retrieving package version...</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Lib>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PreBuildEvent>
-      <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faac" "$(SolutionDir)..\..\configure.ac" &gt; "$(SolutionDir)..\..\libfaac\win32_ver.h"</Command>
-      <Message>Retrieving package version...</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libfaac\bitstream.c" />
-    <ClCompile Include="..\..\libfaac\blockswitch.c" />
-    <ClCompile Include="..\..\libfaac\channels.c" />
-    <ClCompile Include="..\..\libfaac\fft.c" />
-    <ClCompile Include="..\..\libfaac\filtbank.c" />
-    <ClCompile Include="..\..\libfaac\frame.c" />
-    <ClCompile Include="..\..\libfaac\huff2.c" />
-    <ClCompile Include="..\..\libfaac\huffdata.c" />
-    <ClCompile Include="..\..\libfaac\quantize.c" />
-    <ClCompile Include="..\..\libfaac\stereo.c" />
-    <ClCompile Include="..\..\libfaac\tns.c" />
-    <ClCompile Include="..\..\libfaac\util.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\faac.h" />
-    <ClInclude Include="..\..\include\faaccfg.h" />
-    <ClInclude Include="..\..\libfaac\bitstream.h" />
-    <ClInclude Include="..\..\libfaac\blockswitch.h" />
-    <ClInclude Include="..\..\libfaac\channels.h" />
-    <ClInclude Include="..\..\libfaac\coder.h" />
-    <ClInclude Include="..\..\libfaac\fft.h" />
-    <ClInclude Include="..\..\libfaac\filtbank.h" />
-    <ClInclude Include="..\..\libfaac\frame.h" />
-    <ClInclude Include="..\..\libfaac\huff2.h" />
-    <ClInclude Include="..\..\libfaac\huffdata.h" />
-    <ClInclude Include="..\..\libfaac\quantize.h" />
-    <ClInclude Include="..\..\libfaac\stereo.h" />
-    <ClInclude Include="..\..\libfaac\tns.h" />
-    <ClInclude Include="..\..\libfaac\util.h" />
-    <ClInclude Include="..\..\libfaac\win32_ver.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

_service:obs_scm:faac-1.31.obscpio/project/msvc/libfaac.vcxproj.filters Deleted

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{349c2ac9-04e9-4300-93df-39710715f031}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{e69450a4-7cd1-43b1-94d5-ccf9041f042e}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libfaac\bitstream.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\channels.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\fft.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\filtbank.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\frame.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\tns.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\util.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\blockswitch.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\quantize.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\huff2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\huffdata.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\stereo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\libfaac\bitstream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\blockswitch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\channels.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\coder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\fft.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\filtbank.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\frame.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\quantize.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\tns.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\faac.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\faaccfg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\huff2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\huffdata.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\stereo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\win32_ver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file

_service:obs_scm:faac-1.31.obscpio/project/msvc/libfaac_dll.vcxproj Deleted

@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>libfaac_dll</ProjectName>
-    <ProjectGuid>{856BB8CF-B944-4D7A-9D59-4945316229AA}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.26730.12</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\libfaac.def</ModuleDefinitionFile>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Message>Retrieving package version...</Message>
-      <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faac" "$(SolutionDir)..\..\configure.ac" &gt; "$(SolutionDir)..\..\libfaac\win32_ver.h"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\libfaac.def</ModuleDefinitionFile>
-    </Link>
-    <PreBuildEvent>
-      <Message>Retrieving package version...</Message>
-      <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faac" "$(SolutionDir)..\..\configure.ac" &gt; "$(SolutionDir)..\..\libfaac\win32_ver.h"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\libfaac.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Message>Retrieving package version...</Message>
-      <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faac" "$(SolutionDir)..\..\configure.ac" &gt; "$(SolutionDir)..\..\libfaac\win32_ver.h"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\libfaac.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PreBuildEvent>
-      <Message>Retrieving package version...</Message>
-      <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faac" "$(SolutionDir)..\..\configure.ac" &gt; "$(SolutionDir)..\..\libfaac\win32_ver.h"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libfaac\bitstream.c" />
-    <ClCompile Include="..\..\libfaac\blockswitch.c" />
-    <ClCompile Include="..\..\libfaac\channels.c" />
-    <ClCompile Include="..\..\libfaac\fft.c" />
-    <ClCompile Include="..\..\libfaac\filtbank.c" />
-    <ClCompile Include="..\..\libfaac\frame.c" />
-    <ClCompile Include="..\..\libfaac\huff2.c" />
-    <ClCompile Include="..\..\libfaac\huffdata.c" />
-    <ClCompile Include="..\..\libfaac\quantize.c" />
-    <ClCompile Include="..\..\libfaac\stereo.c" />
-    <ClCompile Include="..\..\libfaac\tns.c" />
-    <ClCompile Include="..\..\libfaac\util.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\faac.h" />
-    <ClInclude Include="..\..\include\faaccfg.h" />
-    <ClInclude Include="..\..\libfaac\bitstream.h" />
-    <ClInclude Include="..\..\libfaac\blockswitch.h" />
-    <ClInclude Include="..\..\libfaac\channels.h" />
-    <ClInclude Include="..\..\libfaac\coder.h" />
-    <ClInclude Include="..\..\libfaac\fft.h" />
-    <ClInclude Include="..\..\libfaac\filtbank.h" />
-    <ClInclude Include="..\..\libfaac\frame.h" />
-    <ClInclude Include="..\..\libfaac\huff2.h" />
-    <ClInclude Include="..\..\libfaac\huffdata.h" />
-    <ClInclude Include="..\..\libfaac\quantize.h" />
-    <ClInclude Include="..\..\libfaac\stereo.h" />
-    <ClInclude Include="..\..\libfaac\tns.h" />
-    <ClInclude Include="..\..\libfaac\util.h" />
-    <ClInclude Include="..\..\libfaac\win32_ver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="libfaac.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

_service:obs_scm:faac-1.31.obscpio/project/msvc/libfaac_dll.vcxproj.filters Deleted

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{35bf31c0-b124-46f6-9087-c32503a1d44b}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{d888c91e-6378-4ac5-ad49-f6ba46864a85}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libfaac\bitstream.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\channels.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\fft.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\filtbank.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\frame.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\tns.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\util.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\blockswitch.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\quantize.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\huff2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\huffdata.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\stereo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\libfaac\bitstream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\blockswitch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\channels.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\coder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\fft.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\filtbank.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\frame.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\quantize.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\tns.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\faac.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\faaccfg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\huff2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\huffdata.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\stereo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\win32_ver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="libfaac.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file

_service:obs_scm:faac-1.31.obscpio/project/msvc/libfaac_dll_drm.vcxproj Deleted

@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>libfaac_dll_drm</ProjectName>
-    <ProjectGuid>{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.26730.12</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>.\bin\$(Configuration)\</OutDir>
-    <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS;DRM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\libfaac.def</ModuleDefinitionFile>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImportLibrary>$(OutDir)libfaacdrm.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Message>Retrieving package version...</Message>
-      <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faac" "$(SolutionDir)..\..\configure.ac" &gt; "$(SolutionDir)..\..\libfaac\win32_ver.h"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS;DRM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\libfaac.def</ModuleDefinitionFile>
-      <ImportLibrary>$(OutDir)libfaacdrm.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Message>Retrieving package version...</Message>
-      <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faac" "$(SolutionDir)..\..\configure.ac" &gt; "$(SolutionDir)..\..\libfaac\win32_ver.h"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS;DRM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\libfaac.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImportLibrary>$(OutDir)libfaacdrm.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Message>Retrieving package version...</Message>
-      <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faac" "$(SolutionDir)..\..\configure.ac" &gt; "$(SolutionDir)..\..\libfaac\win32_ver.h"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS;DRM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\libfaac.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(OutDir)libfaacdrm.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Message>Retrieving package version...</Message>
-      <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faac" "$(SolutionDir)..\..\configure.ac" &gt; "$(SolutionDir)..\..\libfaac\win32_ver.h"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libfaac\bitstream.c" />
-    <ClCompile Include="..\..\libfaac\blockswitch.c" />
-    <ClCompile Include="..\..\libfaac\channels.c" />
-    <ClCompile Include="..\..\libfaac\fft.c" />
-    <ClCompile Include="..\..\libfaac\filtbank.c" />
-    <ClCompile Include="..\..\libfaac\frame.c" />
-    <ClCompile Include="..\..\libfaac\huff2.c" />
-    <ClCompile Include="..\..\libfaac\huffdata.c" />
-    <ClCompile Include="..\..\libfaac\kiss_fft\kiss_fft.c" />
-    <ClCompile Include="..\..\libfaac\kiss_fft\kiss_fftr.c" />
-    <ClCompile Include="..\..\libfaac\quantize.c" />
-    <ClCompile Include="..\..\libfaac\stereo.c" />
-    <ClCompile Include="..\..\libfaac\tns.c" />
-    <ClCompile Include="..\..\libfaac\util.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\faac.h" />
-    <ClInclude Include="..\..\include\faaccfg.h" />
-    <ClInclude Include="..\..\libfaac\bitstream.h" />
-    <ClInclude Include="..\..\libfaac\blockswitch.h" />
-    <ClInclude Include="..\..\libfaac\channels.h" />
-    <ClInclude Include="..\..\libfaac\coder.h" />
-    <ClInclude Include="..\..\libfaac\fft.h" />
-    <ClInclude Include="..\..\libfaac\filtbank.h" />
-    <ClInclude Include="..\..\libfaac\frame.h" />
-    <ClInclude Include="..\..\libfaac\huff2.h" />
-    <ClInclude Include="..\..\libfaac\huffdata.h" />
-    <ClInclude Include="..\..\libfaac\kiss_fft\kiss_fft.h" />
-    <ClInclude Include="..\..\libfaac\kiss_fft\kiss_fftr.h" />
-    <ClInclude Include="..\..\libfaac\kiss_fft\_kiss_fft_guts.h" />
-    <ClInclude Include="..\..\libfaac\quantize.h" />
-    <ClInclude Include="..\..\libfaac\stereo.h" />
-    <ClInclude Include="..\..\libfaac\tns.h" />
-    <ClInclude Include="..\..\libfaac\util.h" />
-    <ClInclude Include="..\..\libfaac\win32_ver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="libfaac.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

_service:obs_scm:faac-1.31.obscpio/project/msvc/libfaac_dll_drm.vcxproj.filters Deleted

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{20c99963-1750-4885-ad2c-cd181cf772b6}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{34e89214-d9ae-4ebf-8bf8-6ae480b13a44}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-    <Filter Include="kiss_fft">
-      <UniqueIdentifier>{4cccac5e-3144-404c-b486-e4237c2d461c}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libfaac\bitstream.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\channels.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\fft.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\filtbank.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\frame.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\tns.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\util.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\kiss_fft\kiss_fft.c">
-      <Filter>kiss_fft</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\kiss_fft\kiss_fftr.c">
-      <Filter>kiss_fft</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\blockswitch.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\quantize.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\huff2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\huffdata.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libfaac\stereo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\libfaac\bitstream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\blockswitch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\channels.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\coder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\fft.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\filtbank.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\frame.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\quantize.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\tns.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\kiss_fft\_kiss_fft_guts.h">
-      <Filter>kiss_fft</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\kiss_fft\kiss_fft.h">
-      <Filter>kiss_fft</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\kiss_fft\kiss_fftr.h">
-      <Filter>kiss_fft</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\faac.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\faaccfg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\huff2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\huffdata.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\stereo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libfaac\win32_ver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="libfaac.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file

_service:obs_scm:faac-1.31.obscpio/project/msvc/unistd.h Deleted

_service:obs_scm:faac-1.31.obscpio/utils Deleted

_service:obs_scm:faac-1.31.obscpio/utils/win32 Deleted

_service:obs_scm:faac-1.31.obscpio/utils/win32/ac2ver.c Deleted

@@ -1,103 +0,0 @@
-/*
-** AC2VER - extract version number from AC_INIT macro (configure.ac)
-** Copyright (C) 2017 LoRd_MuldeR <mulder2@GMX.de>
-**  
-** This software is released under the CC0 1.0 Universal CC0 1.0 licence!
-** https://creativecommons.org/publicdomain/zero/1.0/legalcode
-**/
-
-#define BUFF_SIZE 4096
-#define _CRT_SECURE_NO_WARNINGS 1
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-static int clean_string(char *const str)
-{
-	size_t i = 0, j = 0;
-	while(stri)
-	{
-		if(isalnum(stri) || strchr("._-", stri))
-		{
-			if(i != j)
-			{
-				strj = stri;
-			}
-			++j;
-		}
-		++i;
-	}
-	strj = '\0';
-	return !!j;
-}
-
-static int parse_version(FILE *const input, const char *const format, char *const version)
-{
-	char bufferBUFF_SIZE;
-
-	while(!(feof(input) || ferror(input)))
-	{
-		const char *line = fgets(buffer, BUFF_SIZE, input);
-		if(line)
-		{
-			while((*line) && (isspace(*line)))
-			{
-				++line; /*skip space*/
-			}
-			if(sscanf(line, format, version) == 1)
-			{
-				if(clean_string(version))
-				{
-					return 1; /*found!*/
-				}
-			}
-		}
-	}
-
-	version0 = '\0';
-	return 0;
-}
-
-static int get_version(const wchar_t *const lib_name, const wchar_t *const file_name)
-{
-	char format128, versionBUFF_SIZE;
-
-	FILE *const input = _wfopen(file_name, L"r");
-	if(!input)
-	{
-		fprintf(stderr, "Error: Failed to open input file!\n%S\n\n", file_name);
-		return 0;
-	}
-
-	_snprintf(format, 128, "AC_INIT ( %S , %%s", lib_name);
-	//printf("<%s>\n", format);
-
-	if(parse_version(input, format, version))
-	{
-		printf("#define PACKAGE_VERSION \"%s\"\n", version);
-		fclose(input);
-		return 1;
-	}
-	else
-	{
-		fprintf(stderr, "Error: Version string could not be found!\n\n");
-		fclose(input);
-		return 0;
-	}
-}
-
-int wmain(int argc, wchar_t* argv)
-{
-	if((argc != 3) || (!argv10) || (!argv20))
-	{
-		wchar_t file_name_MAX_FNAME, file_ext_MAX_EXT;
-		_wsplitpath(argv0, NULL, NULL, file_name, file_ext);
-		fprintf(stderr, "AC2VER %s\n\n", __DATE__);
-		fprintf(stderr, "Usage: %S%S <lib_name> <path/to/configure.ac>\n\n", file_name, file_ext);
-		return EXIT_FAILURE;
-	}
-
-	return get_version(argv1, argv2) ? EXIT_SUCCESS : EXIT_FAILURE;
-}

_service:obs_scm:faac-1.31.obscpio/utils/win32/ac2ver.exe Deleted

_service:obs_scm:faac-1.40.obscpio/.github/dependabot.yml Added

_service:obs_scm:faac-1.31.obscpio/.github/workflows/master.yml -> _service:obs_scm:faac-1.40.obscpio/.github/workflows/master.yml Changed

@@ -25,12 +25,23 @@
               os: ubuntu-latest,
               compiler: gcc,
               shell: bash,
+              options: -Dfloating-point=double,
+              cflags: -Wall
+            }
+          - {
+              name: Linux GCC (Single Precision),
+              os: ubuntu-latest,
+              compiler: gcc,
+              shell: bash,
+              options: -Dfloating-point=single,
+              cflags: -Wall
             }
           - {
               name: macOS Clang,
               os: macos-latest,
               compiler: clang,
               shell: bash,
+              cflags: -Wall
             }
           - {
               name: MSYS2 UCRT64,
@@ -39,9 +50,21 @@
               shell: 'msys2 {0}',
               msystem: ucrt64,
               msys-env: mingw-w64-ucrt-x86_64,
+              cflags: -Wall
+            }
+          - {
+              name: Windows MSVC,
+              os: windows-latest,
+              compiler: cl,
+              shell: pwsh,
+              options: -Dfloating-point=double,
+              cflags: /W4
             }
 
     steps:
+      - name: Install dependencies (Ubuntu)
+        if: runner.os == 'Linux'
+        run: sudo apt install meson-1.5
 
       - name: Install dependencies (macOS)
         if: runner.os == 'macOS'
@@ -50,30 +73,57 @@
         run: |
           brew update || true
           brew install \
-            autoconf \
-            automake \
-            libtool
+            meson
 
       - name: Install dependencies (MSYS2)
         if: matrix.config.shell == 'msys2 {0}'
-        uses: msys2/setup-msys2@v2
+        uses: msys2/setup-msys2@v2.30.0
         with:
           msystem: ${{ matrix.config.msystem }}
           update: false
           install: >-
-            ${{ matrix.config.msys-env }}-autotools
+            ${{ matrix.config.msys-env }}-meson
             ${{ matrix.config.msys-env }}-gcc
 
-      - uses: actions/checkout@v3
+      - name: Install dependencies (MSVC)
+        if: matrix.config.compiler == 'cl'
+        run: |
+          pip install meson ninja
 
-      - name: Build
+      - name: Set up MSVC
+        if: matrix.config.compiler == 'cl'
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x64
+
+      - uses: actions/checkout@v6
+
+      - name: Build (MSYS2)
+        if: matrix.config.shell == 'msys2 {0}'
         env:
           CC: ${{ matrix.config.compiler }}
-          CFLAGS: -Wall
+          CFLAGS: ${{ matrix.config.cflags }}
         run: |
-          autoreconf -fiv
-          ./configure
-          make
+          mkdir -p build temp
+          cd build
+          meson setup .. -Dprefix=$(realpath ../temp) ${{ matrix.config.options }}
+          meson install
+
+      - name: Build (General)
+        if: matrix.config.shell != 'msys2 {0}'
+        env:
+          CC: ${{ matrix.config.compiler }}
+          CFLAGS: ${{ matrix.config.cflags }}
+        run: |
+          meson setup build -Dprefix="${{ github.workspace }}/temp" ${{ matrix.config.options }}
+          meson install -C build
+
+      - name: Upload artifacts (Windows)
+        uses: actions/upload-artifact@v7
+        if: runner.os == 'Windows'
+        with:
+          name: faac-${{ github.sha }}-${{ matrix.config.name }}
+          path: temp/*
 
   cppcheck:
     name: Cppcheck
@@ -85,7 +135,7 @@
           sudo apt-get update
           sudo apt-get install cppcheck
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
       - name: Run cppcheck
         shell: bash

_service:obs_scm:faac-1.31.obscpio/ChangeLog -> _service:obs_scm:faac-1.40.obscpio/ChangeLog Changed

@@ -1,3 +1,51 @@
+1.40 (Mar 17, 2026)
+
+	 tatsuz 
+	* Fix compilation with Visual Studio
+
+	 enWILLYado 
+	* Fix SIMD calls
+
+	 David Fort 
+	* Add meson as build system
+
+	 KokonoeTooru 
+	* Meson: Install faac executable
+
+	 Fabian Greffrath 
+	* CI: fix artifact path
+	* Remove autoconf/automake build system
+	* Remove plugins stuff, unmaintained for decades
+	* Remove MSVC projects, deprecated in favour of meson
+	* Do not check for unused headers
+	* Generalize OS check in CI rule
+	* Remove redundant defines
+	* Make `faacgui` usable again
+	* Report library version on version mismatch
+	* Maintain library SONAME version 0.0.0
+	* Build both static and shared library by default
+	* Properly declare symbol visibility as hidden
+
+	 Nils Schimmelmann 
+	* Add options to disable DRM and opt for single floating-point precision
+	* CI: add native MSVC build and fix Windows compatibility
+	* Remove dead code
+	* Optimize FFT reordering by combining real and imaginary passes
+	* Optimize FFT performance
+	* CI: update GitHub Actions and add Dependabot configuration
+	* Refactor quantizer for portable C and extensible SIMD dispatch
+	* Optimize memory allocation and unify MDCT implementation
+	* Optimize MDCT by removing conditional branches and hoisting logic
+	* Rrefactor the hot path for writing bits to the output stream
+	* Remove Digital Radio Mondiale (DRM) support
+
+1.31.1 (Mar 03, 2025)
+
+	 Fabian Greffrath 
+	* Reduce autoconf requirement back down to 2.69
+	* Reformat configure.ac for the ac2ver.exe hack to work
+	* Upload Windows artifacts
+
 1.31 (Feb 28, 2025)
 
 	 Tatsuya Suzuki

_service:obs_scm:faac-1.31.obscpio/README -> _service:obs_scm:faac-1.40.obscpio/README Changed

_service:obs_scm:faac-1.31.obscpio/TODO -> _service:obs_scm:faac-1.40.obscpio/TODO Changed

_service:obs_scm:faac-1.31.obscpio/docs/faac.1 -> _service:obs_scm:faac-1.40.obscpio/docs/faac.1 Changed

_service:obs_scm:faac-1.40.obscpio/docs/meson.build Added

_service:obs_scm:faac-1.31.obscpio/frontend/faacgui.rc -> _service:obs_scm:faac-1.40.obscpio/frontend/faacgui.rc Changed

_service:obs_scm:faac-1.31.obscpio/frontend/main.c -> _service:obs_scm:faac-1.40.obscpio/frontend/main.c Changed

@@ -167,9 +167,7 @@
 };
 
 static help_t help_mp4 = {
-    {"-w\t\tWrap AAC data in MP4 container. (default for *.mp4 and *.m4a)\n",
-    "\t\tWrap AAC data in MP4 container. (default for *.mp4, *.m4a and\n"
-    "\t\t*.m4b)\n"},
+    {"-w\tWrap AAC data in MP4 container (default for *.mp4, *.m4a and *.m4b)\n"},
     {"--tag <tagname,tagvalue> Add named tag (iTunes '----')\n"},
     {"--artist <name>\tSet artist name\n"},
     {"--artistsort <name>\tSet artist sort order\n"},
@@ -503,7 +501,9 @@
     }
     else
     {
-        fprintf(stderr, __FILE__ "(%d): wrong libfaac version\n", __LINE__);
+        fprintf(stderr, __FILE__ "(%d): wrong libfaac version "
+                "(expected %s, found %s)\n", __LINE__,
+                PACKAGE_VERSION, faac_id_string);
         return 1;
     }
 
@@ -1019,7 +1019,7 @@
         fprintf(stderr, "LTP");
         break;
     }
-    fprintf(stderr, "(MPEG-%d)", (mpegVersion == MPEG4) ? 4 : 2);
+    fprintf(stderr, " (MPEG-%d)", (mpegVersion == MPEG4) ? 4 : 2);
     if (myFormat->useTns)
         fprintf(stderr, " + TNS");

_service:obs_scm:faac-1.31.obscpio/frontend/maingui.c -> _service:obs_scm:faac-1.40.obscpio/frontend/maingui.c Changed

@@ -159,8 +159,7 @@
 
             config->mpegVersion = SendMessage(GetDlgItem(hWnd, IDC_MPEGVERSION), CB_GETCURSEL, 0, 0);
             config->aacObjectType = SendMessage(GetDlgItem(hWnd, IDC_OBJECTTYPE), CB_GETCURSEL, 0, 0);
-            if (config->aacObjectType == SSR) /* Set to LTP */
-                config->aacObjectType = LTP;
+            config->aacObjectType = LOW;
 
             GetDlgItemText(hWnd, IDC_QUALITY, szTemp, sizeof(szTemp));
 	    config->quantqual = atoi(szTemp);
@@ -336,9 +335,7 @@
         SendMessage(GetDlgItem(hWnd, IDC_MPEGVERSION), CB_ADDSTRING, 0, (LPARAM)(LPCTSTR)"MPEG2");
         SendMessage(GetDlgItem(hWnd, IDC_MPEGVERSION), CB_SETCURSEL, 0, 0);
 
-//        SendMessage(GetDlgItem(hWnd, IDC_OBJECTTYPE), CB_ADDSTRING, 0, (LPARAM)(LPCTSTR)"Main");
         SendMessage(GetDlgItem(hWnd, IDC_OBJECTTYPE), CB_ADDSTRING, 0, (LPARAM)(LPCTSTR)"Low Complexity");
-//        SendMessage(GetDlgItem(hWnd, IDC_OBJECTTYPE), CB_ADDSTRING, 0, (LPARAM)(LPCTSTR)"LTP");
         SendMessage(GetDlgItem(hWnd, IDC_OBJECTTYPE), CB_SETCURSEL, 0, 0);
 
         CheckDlgButton(hWnd, IDC_ALLOWMIDSIDE, TRUE);

_service:obs_scm:faac-1.40.obscpio/frontend/meson.build Added

_service:obs_scm:faac-1.31.obscpio/frontend/mp4write.c -> _service:obs_scm:faac-1.40.obscpio/frontend/mp4write.c Changed

_service:obs_scm:faac-1.40.obscpio/include/meson.build Added

_service:obs_scm:faac-1.31.obscpio/libfaac/bitstream.c -> _service:obs_scm:faac-1.40.obscpio/libfaac/bitstream.c Changed

@@ -85,23 +85,8 @@
                             int writeFlag);
 static int FindGroupingBits(CoderInfo *coderInfo);
 static long BufferNumBit(BitStream *bitStream);
-static int WriteByte(BitStream *bitStream,
-                     unsigned long data,
-                     int numBit);
 static int ByteAlign(BitStream* bitStream,
                      int writeFlag, int bitsSoFar);
-#ifdef DRM
-static int PutBitHcr(BitStream *bitStream,
-                     unsigned long curpos,
-                     unsigned long data,
-                     int numBit);
-static int rewind_word(int W, int len);
-static int WriteReorderedSpectralData(CoderInfo *coderInfo,
-                                      BitStream *bitStream,
-                                      int writeFlag);
-static void calc_CRC(BitStream *bitStream, int len);
-#endif
-
 
 static int WriteFAACStr(BitStream *bitStream, char *version, int write)
 {
@@ -142,7 +127,6 @@
   return bitcnt;
 }
 
-
 int WriteBitstream(faacEncStruct* hEncoder,
                    CoderInfo *coderInfo,
                    ChannelInfo *channelInfo,
@@ -163,10 +147,8 @@
     }
 
 /* sur: faad2 complains about scalefactor error if we are writing FAAC String */
-#ifndef DRM
     if (hEncoder->frameNum == 4)
       WriteFAACStr(bitStream, hEncoder->config.name, 1);
-#endif
 
     for (channel = 0; channel < numChannel; channel++) {
 
@@ -245,7 +227,6 @@
     int bits = 0;
     int bitsLeftAfterFill, numFillBits;
 
-
     if(hEncoder->config.outputFormat == 1){
         bits += WriteADTSHeader(hEncoder, bitStream, 0);
     }else{
@@ -253,10 +234,8 @@
     }
 
 /* sur: faad2 complains about scalefactor error if we are writing FAAC String */
-#ifndef DRM
     if (hEncoder->frameNum == 4)
       bits += WriteFAACStr(bitStream, hEncoder->config.name, 0);
-#endif
 
     for (channel = 0; channel < numChannel; channel++) {
 
@@ -394,7 +373,6 @@
 {
     int bits = 0;
 
-#ifndef DRM
     if (writeFlag) {
         /* write ID_CPE, single_element_channel() identifier */
         PutBit(bitStream, ID_CPE, LEN_SE_ID);
@@ -409,7 +387,6 @@
     bits += LEN_SE_ID;
     bits += LEN_TAG;
     bits += LEN_COM_WIN;
-#endif
 
     /* if common_window, write ics_info */
     if (channelInfo->common_window) {
@@ -451,7 +428,6 @@
 {
     int bits = 0;
 
-#ifndef DRM
     if (writeFlag) {
         /* write Single Element Channel (SCE) identifier */
         PutBit(bitStream, ID_SCE, LEN_SE_ID);
@@ -462,7 +438,6 @@
 
     bits += LEN_SE_ID;
     bits += LEN_TAG;
-#endif
 
     /* Write an Individual Channel Stream element */
     bits += WriteICS(coderInfo, bitStream, 0, objectType, writeFlag);
@@ -533,19 +508,11 @@
             PutBit(bitStream, coderInfo->sfbn, LEN_MAX_SFBL);
         }
         bits += LEN_MAX_SFBL;
-#ifdef DRM
-    }
-    if (writeFlag) {
-        PutBit(bitStream,coderInfo->tnsInfo.tnsDataPresent,LEN_TNS_PRES);
-    }
-    bits += LEN_TNS_PRES;
-#endif
-            bits++;
-            if (writeFlag)
-                PutBit(bitStream, 0, LEN_PRED_PRES);  /* predictor_data_present */
-#ifndef DRM
+
+        bits++;
+        if (writeFlag)
+            PutBit(bitStream, 0, LEN_PRED_PRES);  /* predictor_data_present */
     }
-#endif
 
     return bits;
 }
@@ -560,53 +527,24 @@
     /* returns the number of bits written to the bitstream */
     int bits = 0;
 
-#ifndef DRM
     /* Write the 8-bit global_gain */
     if (writeFlag)
         PutBit(bitStream, coderInfo->global_gain, LEN_GLOB_GAIN);
     bits += LEN_GLOB_GAIN;
-#endif
 
     /* Write ics information */
     if (!commonWindow) {
         bits += WriteICSInfo(coderInfo, bitStream, objectType, commonWindow, writeFlag);
     }
 
-#ifdef DRM
-    /* Write the 8-bit global_gain */
-    if (writeFlag)
-        PutBit(bitStream, coderInfo->global_gain, LEN_GLOB_GAIN);
-    bits += LEN_GLOB_GAIN;
-#endif
-
     bits += writebooks(coderInfo, bitStream, writeFlag);
     bits += writesf(coderInfo, bitStream, writeFlag);
-#ifdef DRM
-    if (writeFlag) {
-        /* length_of_reordered_spectral_data */
-        PutBit(bitStream, coderInfo->iLenReordSpData, LEN_HCR_REORDSD);
 
-        /* length_of_longest_codeword */
-        PutBit(bitStream, coderInfo->iLenLongestCW, LEN_HCR_LONGCW);
-    }
-    bits += LEN_HCR_REORDSD + LEN_HCR_LONGCW;
-#else
     bits += WritePulseData(coderInfo, bitStream, writeFlag);
-#endif
     bits += WriteTNSData(coderInfo, bitStream, writeFlag);
-#ifndef DRM
     bits += WriteGainControlData(coderInfo, bitStream, writeFlag);
-#endif
-
-#ifdef DRM
-    /* DRM CRC calculation */
-    if (writeFlag)
-        calc_CRC(bitStream, bits);
 
-    bits += WriteReorderedSpectralData(coderInfo, bitStream, writeFlag);
-#else
     bits += WriteSpectralData(coderInfo, bitStream, writeFlag);
-#endif
 
     /* Return number of bits */
     return bits;
@@ -644,12 +582,10 @@
 
     TnsInfo* tnsInfoPtr = &coderInfo->tnsInfo;
 
-#ifndef DRM
     if (writeFlag) {
         PutBit(bitStream,tnsInfoPtr->tnsDataPresent,LEN_TNS_PRES);
     }
     bits += LEN_TNS_PRES;
-#endif
 
     /* If TNS is not present, bail */
     if (!tnsInfoPtr->tnsDataPresent) {
@@ -842,14 +778,8 @@
 
     bitStream = AllocMemory(sizeof(BitStream));
     bitStream->size = size;
-#ifdef DRM
-    /* skip first byte for CRC */
-    bitStream->numBit = 8;
-    bitStream->currentBit = 8;
-#else
     bitStream->numBit = 0;
     bitStream->currentBit = 0;
-#endif
     bitStream->data = buffer;
     SetMemory(bitStream->data, 0, size);
 
@@ -870,47 +800,49 @@
     return bitStream->numBit;
 }
 
-static int WriteByte(BitStream *bitStream,
-                     unsigned long data,
-                     int numBit)
-{
-    long numUsed,idx;
-
-    idx = (bitStream->currentBit / BYTE_NUMBIT) % bitStream->size;
-    numUsed = bitStream->currentBit % BYTE_NUMBIT;
-#ifndef DRM
-    if (numUsed == 0)
-        bitStream->dataidx = 0;
-#endif
-    bitStream->dataidx |= (data & ((1<<numBit)-1)) <<
-        (BYTE_NUMBIT-numUsed-numBit);
-    bitStream->currentBit += numBit;
-    bitStream->numBit = bitStream->currentBit;
-
-    return 0;
-}
-
 int PutBit(BitStream *bitStream,
            unsigned long data,
            int numBit)
 {
-    int num,maxNum,curNum;
-    unsigned long bits;
+    /* write bits in packets according to buffer byte boundaries */
 
     if (numBit == 0)
         return 0;
 
-    /* write bits in packets according to buffer byte boundaries */
-    num = 0;
-    maxNum = BYTE_NUMBIT - bitStream->currentBit % BYTE_NUMBIT;
-    while (num < numBit) {
-        curNum = min(numBit-num,maxNum);
-        bits = data>>(numBit-num-curNum);
-        if (WriteByte(bitStream, bits, curNum)) {
-            return 1;
+    /* Hoist bitstream state for faster access */
+    unsigned int currentBit = (unsigned int)bitStream->currentBit;
+    unsigned int bitOffset = currentBit & 7;
+    unsigned char *ptr = bitStream->data + (currentBit >> 3);
+
+    /* Update bitstream state immediately */
+    bitStream->currentBit += numBit;
+    bitStream->numBit = bitStream->currentBit;
+
+    /* Mask input data to ensure no extra bits are set */
+    data &= (1UL << numBit) - 1;
+
+    /* Fast path: bit write fits within the current byte */
+    if (bitOffset + numBit <= 8) {
+        if (bitOffset == 0) *ptr = 0;
+        *ptr |= (unsigned char)(data << (8 - bitOffset - numBit));
+    } else {
+        /* General case: multi-byte write */
+        /* Handle first partial byte */
+        int firstBits = 8 - bitOffset;
+        if (bitOffset == 0) *ptr = 0;
+        *ptr++ |= (unsigned char)(data >> (numBit - firstBits));
+        numBit -= firstBits;
+
+        /* Handle full bytes */
+        while (numBit >= 8) {
+            *ptr++ = (unsigned char)((data >> (numBit - 8)) & 0xFF);
+            numBit -= 8;
+        }
+
+        /* Handle remaining bits in last byte */
+        if (numBit > 0) {
+            *ptr = (unsigned char)((data & ((1UL << numBit) - 1)) << (8 - numBit));
         }
-        num += curNum;
-        maxNum = BYTE_NUMBIT;
     }
 
     return 0;
@@ -937,465 +869,3 @@
     }
     return j;
 }
-
-#ifdef DRM
-/*
-    ****************************************************************************
-    The following code was written by Volker Fischer (c) 2004
-
-    The GNU Lesser General Public License as published by the
-    Free Software Foundation applies to this code.
-    ****************************************************************************
-*/
-#define LEN_PRESORT_CODEBOOK 22
-static const unsigned short PresortedCodebook_VCB11 = {11, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 9, 7, 5, 3, 1};
-static const int maxCwLen32 = {0, 11, 9, 20, 16, 13, 11, 14, 12, 17, 14, 49,
-    0, 0, 0, 0, 14, 17, 21, 21, 25, 25, 29, 29, 29, 29, 33, 33, 33, 37, 37, 41}; /* 8.5.3.3.3.1 */
-
-typedef struct { /* segment parameters */
-    unsigned int left; /* left start of free space in segment */
-    unsigned int right; /* right position of free space in segment */
-    unsigned int len; /* length of free space in segment */
-} segment_t;
-
-typedef struct { /* codeword parameters */
-    unsigned int   cw_offset; /* offset in actual codeword data vector */
-    unsigned short window; /* which window belongs to this codeword */
-    unsigned short cb; /* codebook */
-    unsigned short num_sl_cw; /* number of spectral lines per codeword */
-    unsigned int   cw_nr; /* codeword number in the window */
-    unsigned short cw_len; /* codeword lenght */
-    unsigned short num_data; /* number of data cells for codeword */
-} cw_info_t;
-
-static int PutBitHcr(BitStream *bitStream,
-                     unsigned long curpos,
-                     unsigned long data,
-                     int numBit)
-{ /* data can be written at an arbitrary position in the bitstream */
-    bitStream->currentBit = curpos;
-    return PutBit(bitStream, data, numBit);
-}
-
-static int rewind_word(int W, int len)
-{ /* rewind len (max. 32) bits so that the MSB becomes LSB */
-    short i;
-    int tmp_W = 0;
-
-    for (i = 0; i < len; i++) {
-        tmp_W <<= 1;
-        if (W & (1<<i)) tmp_W |= 1;
-    }
-    return tmp_W;
-}
-
-static int WriteReorderedSpectralData(CoderInfo *coder,
-                                      BitStream *bitStream,
-                                      int writeFlag)
-{
-    int i, j;
-    int cursegmsize, accsegmsize = 0;
-    int segmcnt = 0;
-    long startbitpos;
-    segment_t segmentFRAME_LEN;
-    int* groups = coder->groups.len;
-    int* sfb_offset = coder->sfb_offset;
-
-    cw_info_t cw_infoFRAME_LEN;
-    cw_info_t cw_info_presoFRAME_LEN;
-
-    int num_cw = coder->cur_cw;
-    int window_cw_cntMAX_SHORT_WINDOWS = {0,0,0,0,0,0,0,0};
-
-    int presort, set, num_sets = 0;
-
-    unsigned short cur_cb, cw_cnt;
-    short is_backwards;
-    int diff, tmp_data, cw_part_cnt, cur_cw_part;
-
-    int cur_cw_len, cur_data;
-    int sfb_cnt, win_cnt, acc_win_cnt, win_grp_cnt;
-    int coeff_cnt, last_sfb, cur_sfb_len;
-
-    /* set up local pointers to data and len */
-    /* data array contains data to be written */
-    /* len array contains lengths of data words */
-    int* num_data = coder->num_data_cw;
-
-    if (writeFlag) {
-        /* build offset table */
-        cur_data = 0;
-        cw_info0.cw_offset = 0;
-        for (i = 0; i < num_cw; i++) {
-            cur_cw_len = 0;
-            for (j = 0; j < num_datai; j++) {
-                cur_cw_len += coder->scur_data++.len;
-            }
-
-            cw_infoi.num_data = num_datai;
-            cw_infoi.cw_len = cur_cw_len;
-            if (i > 0) /* calculate offset (codeword info parameter) */
-                cw_infoi.cw_offset = cw_infoi - 1.cw_offset + num_datai - 1;
-        }
-
-        /* presort codewords ------------------------------------------------ */
-        /* classify codewords first */
-        sfb_cnt = win_cnt = win_grp_cnt = coeff_cnt = last_sfb = acc_win_cnt = 0;
-        cur_sfb_len = sfb_offset1 / groups0;
-        cur_cb = coder->book0;
-        for (i = 0; i < num_cw; i++) {
-            /* Set codeword info parameters */
-            cw_infoi.cb = cur_cb;
-            cw_infoi.num_sl_cw = (cur_cb < FIRST_PAIR_HCB) ? QUAD_LEN : PAIR_LEN;
-
-            cw_infoi.window = acc_win_cnt + win_cnt;
-            cw_infoi.cw_nr = window_cw_cntcw_infoi.window;
-            window_cw_cntcw_infoi.window++;
-
-            coeff_cnt += cw_infoi.num_sl_cw;
-            if (coeff_cnt - last_sfb >= cur_sfb_len) {
-                last_sfb += cur_sfb_len;
-
-                win_cnt++; /* next window */
-                if (win_cnt == groupswin_grp_cnt) {
-                    win_cnt = 0;
-
-                    sfb_cnt++; /* next sfb */
-                    if (sfb_cnt == coder->all_sfb) {
-                        sfb_cnt = 0;
-
-                        acc_win_cnt += groupswin_grp_cnt;
-                        win_grp_cnt++; /* next window group */
-                    }
-
-                    /* new codebook and sfb length */
-                    cur_cb = coder->booksfb_cnt;
-                    if (last_sfb < FRAME_LEN) {
-                        cur_sfb_len = (sfb_offsetsfb_cnt + 1 - sfb_offsetsfb_cnt)
-                            / groupswin_grp_cnt;
-                    }
-                }
-            }
-        }
-
-        /* presorting (first presorting step) */
-        /* only needed for short windows */
-
-/* Somehow the second presorting step does not give expected results. Disabling the
-   following code surprisingly gives good results. TODO: find the bug */
-        if (0) {//coder->block_type == ONLY_SHORT_WINDOW) {
-            for (i = 0; i < MAX_SHORT_WINDOWS; i++)
-                window_cw_cnti = 0; /* reset all counters */
-
-            win_cnt = 0;
-            cw_cnt = 0;
-            for (i = 0; i < num_cw; i++) {
-                for (j = 0; j < num_cw; j++) {
-                    if (cw_infoj.window == win_cnt) {
-                        if (cw_infoj.cw_nr == window_cw_cntwin_cnt) {
-                            cw_info_presocw_cnt++ = cw_infoj;
-                            window_cw_cntwin_cnt++;
-
-                            /* check if two one-dimensional codewords */
-                            if (cw_infoj.num_sl_cw == PAIR_LEN) {
-                                cw_info_presocw_cnt++ = cw_infoj + 1;
-                                window_cw_cntwin_cnt++;
-                            }
-
-                            win_cnt++; /* next window */
-                            if (win_cnt == MAX_SHORT_WINDOWS)
-                                win_cnt = 0;
-                        }
-                    }
-                }
-            }
-        } else {
-            for (i = 0; i < num_cw; i++) {
-                cw_info_presoi = cw_infoi; /* just copy */
-            }
-        }
-
-        /* presorting (second presorting step) */
-        cw_cnt = 0;
-        for (presort = 0; presort < LEN_PRESORT_CODEBOOK; presort++) {
-            /* next codebook that has to be processed according to presorting */
-            unsigned short nextCB = PresortedCodebook_VCB11presort;
-
-            for (i = 0; i < num_cw; i++) {
-                /* process only codewords that are due now */
-                if ((cw_info_presoi.cb == nextCB) ||
-                    ((nextCB < HCB_ESC) && (cw_info_presoi.cb == nextCB + 1)))
-                {
-                    cw_infocw_cnt++ = cw_info_presoi;
-                }
-            }
-        }
-
-        /* init segments */
-        accsegmsize = 0;
-        for (i = 0; i < num_cw; i++) {
-            /* 8.5.3.3.3.2 Derivation of segment width */
-            cursegmsize = min(maxCwLencw_infoi.cb, coder->iLenLongestCW);
-
-            if (accsegmsize + cursegmsize > coder->iLenReordSpData) {
-                /* the last segment is extended until iLenReordSpData */
-                segmentsegmcnt - 1.right = coder->iLenReordSpData - 1;
-                segmentsegmcnt - 1.len = coder->iLenReordSpData - segmentsegmcnt - 1.left;
-                break;
-            }
-
-            segmentsegmcnt.left = accsegmsize;
-            segmentsegmcnt.right = accsegmsize + cursegmsize - 1;
-            segmentsegmcnt++.len = cursegmsize;
-            accsegmsize += cursegmsize;
-        }
-
-        /* store current bit position */
-        startbitpos = bitStream->currentBit;
-
-        /* write write priority codewords (PCWs) and nonPCWs ---------------- */
-        if (segmcnt > 0)
-            num_sets = num_cw / segmcnt; /* number of sets */
-
-        for (set = 0; set <= num_sets; set++) {
-            int trial;
-
-            /* ever second set the bit order is reversed */
-            is_backwards = set % 2;
-
-            for (trial = 0; trial < segmcnt; trial++) {
-                int codewordBase;
-                int set_encoded = segmcnt;
-
-                if (set == num_sets)
-                    set_encoded = num_cw - set * segmcnt; /* last set is shorter than the rest */
-
-                for (codewordBase = 0; codewordBase < segmcnt; codewordBase++) {
-                    int segment_index = (trial + codewordBase) % segmcnt;
-                    int codeword_index = codewordBase + set * segmcnt;
-
-                    if (codeword_index >= num_cw)
-                        break;
-
-                    if ((cw_infocodeword_index.cw_len > 0) && (segmentsegment_index.len > 0)) {
-                        /* codeword is not yet written (completely) */
-                        /* space left in this segment */
-                        short tmplen;
-
-                        /* how many bits can be written? */
-                        if (segmentsegment_index.len >= cw_infocodeword_index.cw_len) {
-                            tmplen = cw_infocodeword_index.cw_len;
-                            set_encoded--; /* CW fits into segment */
-                        } else {
-                            tmplen = segmentsegment_index.len;
-                        }
-
-                        /* Adjust lengths */
-                        cw_infocodeword_index.cw_len -= tmplen;
-                        segmentsegment_index.len -= tmplen;
-
-                        /* write codewords to bitstream */
-                        for (cw_part_cnt = 0; cw_part_cnt < cw_infocodeword_index.num_data; cw_part_cnt++) {
-                            cur_cw_part = cw_infocodeword_index.cw_offset + cw_part_cnt;
-
-                            if (coder->scur_cw_part.len <= tmplen) {
-                                /* write complete data, no partitioning */
-                                if (is_backwards) {
-                                    /* write data in reversed bit-order */
-                                    PutBitHcr(bitStream, startbitpos + segmentsegment_index.right - coder->scur_cw_part.len + 1,
-                                        rewind_word(coder->scur_cw_part.data, coder->scur_cw_part.len), coder->scur_cw_part.len);
-
-                                    segmentsegment_index.right -= coder->scur_cw_part.len;
-                                } else {
-                                    PutBitHcr(bitStream, startbitpos + segmentsegment_index.left,
-                                        coder->scur_cw_part.data, coder->scur_cw_part.len);
-
-                                    segmentsegment_index.left += coder->scur_cw_part.len;
-                                }
-
-                                tmplen -= coder->scur_cw_part.len;
-                                coder->scur_cw_part.len = 0;
-                            } else {
-                                /* codeword part must be partitioned */
-                                /* data must be taken from the left side */
-                                tmp_data = coder->scur_cw_part.data;
-
-                                diff = coder->scur_cw_part.len - tmplen;
-                                tmp_data >>= diff;
-
-                                /* remove bits which are already used */
-                                coder->scur_cw_part.data &= (1 << diff) - 1 /* diff number of ones */;
-                                coder->scur_cw_part.len = diff;
-
-                                if (is_backwards) {
-                                    /* write data in reversed bit-order */
-                                    PutBitHcr(bitStream, startbitpos + segmentsegment_index.right - tmplen + 1,
-                                        rewind_word(tmp_data, tmplen), tmplen);
-
-                                    segmentsegment_index.right -= tmplen;
-                                } else {
-                                    PutBitHcr(bitStream, startbitpos + segmentsegment_index.left,
-                                        tmp_data, tmplen);
-
-                                    segmentsegment_index.left += tmplen;
-                                }
-
-                                tmplen = 0;
-                            }
-                            
-                            if (tmplen == 0)
-                                break; /* all data written for this segment trial */
-                        }
-                    }
-                } /* of codewordBase */
-
-                if (set_encoded == 0)
-                    break; /* no unencoded codewords left in this set */
-            } /* of trial */
-        }
-
-        /* set parameter for bit stream to current correct position */
-        bitStream->currentBit = startbitpos + coder->iLenReordSpData;
-        bitStream->numBit = bitStream->currentBit;
-    }
-
-    return coder->iLenReordSpData;
-}
-
-/*
-    CRC8 x^8 + x^4 + x^3 + x^2 + 1
-*/
-static const unsigned char _crctable256 =
-{
-    0x00, 0x1D, 0x3A, 0x27, 0x74, 0x69, 0x4E, 0x53,
-    0xE8, 0xF5, 0xD2, 0xCF, 0x9C, 0x81, 0xA6, 0xBB,
-    0xCD, 0xD0, 0xF7, 0xEA, 0xB9, 0xA4, 0x83, 0x9E,
-    0x25, 0x38, 0x1F, 0x02, 0x51, 0x4C, 0x6B, 0x76,
-    0x87, 0x9A, 0xBD, 0xA0, 0xF3, 0xEE, 0xC9, 0xD4,
-    0x6F, 0x72, 0x55, 0x48, 0x1B, 0x06, 0x21, 0x3C,
-    0x4A, 0x57, 0x70, 0x6D, 0x3E, 0x23, 0x04, 0x19,
-    0xA2, 0xBF, 0x98, 0x85, 0xD6, 0xCB, 0xEC, 0xF1,
-    0x13, 0x0E, 0x29, 0x34, 0x67, 0x7A, 0x5D, 0x40,
-    0xFB, 0xE6, 0xC1, 0xDC, 0x8F, 0x92, 0xB5, 0xA8,
-    0xDE, 0xC3, 0xE4, 0xF9, 0xAA, 0xB7, 0x90, 0x8D,
-    0x36, 0x2B, 0x0C, 0x11, 0x42, 0x5F, 0x78, 0x65,
-    0x94, 0x89, 0xAE, 0xB3, 0xE0, 0xFD, 0xDA, 0xC7,
-    0x7C, 0x61, 0x46, 0x5B, 0x08, 0x15, 0x32, 0x2F,
-    0x59, 0x44, 0x63, 0x7E, 0x2D, 0x30, 0x17, 0x0A,
-    0xB1, 0xAC, 0x8B, 0x96, 0xC5, 0xD8, 0xFF, 0xE2,
-    0x26, 0x3B, 0x1C, 0x01, 0x52, 0x4F, 0x68, 0x75,
-    0xCE, 0xD3, 0xF4, 0xE9, 0xBA, 0xA7, 0x80, 0x9D,
-    0xEB, 0xF6, 0xD1, 0xCC, 0x9F, 0x82, 0xA5, 0xB8,
-    0x03, 0x1E, 0x39, 0x24, 0x77, 0x6A, 0x4D, 0x50,
-    0xA1, 0xBC, 0x9B, 0x86, 0xD5, 0xC8, 0xEF, 0xF2,
-    0x49, 0x54, 0x73, 0x6E, 0x3D, 0x20, 0x07, 0x1A,
-    0x6C, 0x71, 0x56, 0x4B, 0x18, 0x05, 0x22, 0x3F,
-    0x84, 0x99, 0xBE, 0xA3, 0xF0, 0xED, 0xCA, 0xD7,
-    0x35, 0x28, 0x0F, 0x12, 0x41, 0x5C, 0x7B, 0x66,
-    0xDD, 0xC0, 0xE7, 0xFA, 0xA9, 0xB4, 0x93, 0x8E,
-    0xF8, 0xE5, 0xC2, 0xDF, 0x8C, 0x91, 0xB6, 0xAB,
-    0x10, 0x0D, 0x2A, 0x37, 0x64, 0x79, 0x5E, 0x43,
-    0xB2, 0xAF, 0x88, 0x95, 0xC6, 0xDB, 0xFC, 0xE1,
-    0x5A, 0x47, 0x60, 0x7D, 0x2E, 0x33, 0x14, 0x09,
-    0x7F, 0x62, 0x45, 0x58, 0x0B, 0x16, 0x31, 0x2C,
-    0x97, 0x8A, 0xAD, 0xB0, 0xE3, 0xFE, 0xD9, 0xC4
-};
-
-static void calc_CRC(BitStream *bitStream, int len)
-{
-    //int i;
-    //unsigned char r = ~0;  /* Initialize to all ones */
-    unsigned char crc = ~0;  /* Initialize to all ones */
-    
-    /* CRC polynome used x^8 + x^4 + x^3 + x^2 +1 */
-
-    unsigned int cb         = len / 8;
-    unsigned int taillen    = len & 0x7;
-    unsigned char* pb       = &bitStream->data1;
-    //compatible, but slower unsigned char b         = ( bitStream->datacb + 1 ) >> ( 8 - taillen );
-    unsigned char b         = bitStream->datacb + 1;
-    
-//#define GPOLY 0435
-//
-//    for (i = 8; i < len + 8; i++) {
-//        r = ( (r << 1) ^ (( (
-//            ( bitStream->datai / 8 >> (7 - (i % 8)) )
-//            & 1) ^ ((r >> 7) & 1)) * GPOLY )) & 0xFF;
-//    }
-
-#define GP 0x1d
-
-//fprintf( stderr, "\nfaac:" );
-
-    while ( cb-- )
-    {
-//fprintf( stderr, " %02X", *pb );
-        crc = _crctable crc ^ *pb++ ;
-    }
-    
-    //compatible, but slower switch ( taillen )
-    //{
-    //case 7:
-    //    crc = ( ( crc << 1 ) ^ ( ( ( ( b >> 6 ) & 1 ) ^ ( ( crc >> 7 ) & 1 ) ) * GP ) ) & 0xFF;
-    //    // goto next case
-    //case 6:
-    //    crc = ( ( crc << 1 ) ^ ( ( ( ( b >> 5 ) & 1 ) ^ ( ( crc >> 7 ) & 1 ) ) * GP ) ) & 0xFF;
-    //    // goto next case
-    //case 5:
-    //    crc = ( ( crc << 1 ) ^ ( ( ( ( b >> 4 ) & 1 ) ^ ( ( crc >> 7 ) & 1 ) ) * GP ) ) & 0xFF;
-    //    // goto next case
-    //case 4:
-    //    crc = ( ( crc << 1 ) ^ ( ( ( ( b >> 3 ) & 1 ) ^ ( ( crc >> 7 ) & 1 ) ) * GP ) ) & 0xFF;
-    //    // goto next case
-    //case 3:
-    //    crc = ( ( crc << 1 ) ^ ( ( ( ( b >> 2 ) & 1 ) ^ ( ( crc >> 7 ) & 1 ) ) * GP ) ) & 0xFF;
-    //    // goto next case
-    //case 2:
-    //    crc = ( ( crc << 1 ) ^ ( ( ( ( b >> 1 ) & 1 ) ^ ( ( crc >> 7 ) & 1 ) ) * GP ) ) & 0xFF;
-    //    // goto next case
-    //case 1:
-    //    crc = ( ( crc << 1 ) ^ ( ( ( b & 1 ) ^ ( ( crc >> 7 ) & 1 ) ) * GP ) ) & 0xFF;
-    //    break;
-    //}
-//fprintf( stderr, " %02X", ( b >> ( 8 - taillen ) ) << 7 );
-    switch ( taillen )
-    {
-    case 7:
-        crc = ( ( crc << 1 ) ^ ( ( (signed char)( b ^ crc ) >> 7 ) & GP ) ) & 0xFF;
-        b <<= 1;
-        // goto next case
-    case 6:
-        crc = ( ( crc << 1 ) ^ ( ( (signed char)( b ^ crc ) >> 7 ) & GP ) ) & 0xFF;
-        b <<= 1;
-        // goto next case
-    case 5:
-        crc = ( ( crc << 1 ) ^ ( ( (signed char)( b ^ crc ) >> 7 ) & GP ) ) & 0xFF;
-        b <<= 1;
-        // goto next case
-    case 4:
-        crc = ( ( crc << 1 ) ^ ( ( (signed char)( b ^ crc ) >> 7 ) & GP ) ) & 0xFF;
-        b <<= 1;
-        // goto next case
-    case 3:
-        crc = ( ( crc << 1 ) ^ ( ( (signed char)( b ^ crc ) >> 7 ) & GP ) ) & 0xFF;
-        b <<= 1;
-        // goto next case
-    case 2:
-        crc = ( ( crc << 1 ) ^ ( ( (signed char)( b ^ crc ) >> 7 ) & GP ) ) & 0xFF;
-        b <<= 1;
-        // goto next case
-    case 1:
-        crc = ( ( crc << 1 ) ^ ( ( (signed char)( b ^ crc ) >> 7 ) & GP ) ) & 0xFF;
-        break;
-    }
-
-    //if ( crc != r )
-    //{
-    //    fprintf( stderr, "%08X != %08X\n", crc, r );
-    //}
-//fprintf( stderr, " (%5d bits), CRC is %02X\n", len, ~crc & 0xFF );
-    
-    /* CRC is stored inverted, per definition at first byte in stream */
-    bitStream->data0 = ~crc;
-}
-#endif

_service:obs_scm:faac-1.31.obscpio/libfaac/bitstream.h -> _service:obs_scm:faac-1.40.obscpio/libfaac/bitstream.h Changed

@@ -55,12 +55,7 @@
 #define LEN_WIN_SH 1
 #define LEN_MAX_SFBL 6
 #define LEN_MAX_SFBS 4
-#define LEN_CB 4
-#define LEN_SCL_PCM 8
 #define LEN_PRED_PRES 1
-#define LEN_PRED_RST 1
-#define LEN_PRED_RSTGRP 5
-#define LEN_PRED_ENAB 1
 #define LEN_MASK_PRES 2
 #define LEN_MASK 1
 #define LEN_PULSE_PRES 1
@@ -77,36 +72,9 @@
 #define LEN_TNS_COMPRESS 1
 #define LEN_GAIN_PRES 1
 
-#define LEN_NEC_NPULSE 2
-#define LEN_NEC_ST_SFB 6
-#define LEN_NEC_POFF 5
-#define LEN_NEC_PAMP 4
-#define NUM_NEC_LINES 4
-#define NEC_OFFSET_AMP 4
-
-#define LEN_NCC 3
-#define LEN_IS_CPE 1
-#define LEN_CC_LR 1
-#define LEN_CC_DOM 1
-#define LEN_CC_SGN 1
-#define LEN_CCH_GES 2
-#define LEN_CCH_CGP 1
-#define LEN_D_CNT 4
-#define LEN_D_ESC 12
 #define LEN_F_CNT 4
-#define LEN_F_ESC 8
 #define LEN_BYTE 8
-#define LEN_PAD_DATA 8
 
-#define LEN_PC_COMM 8
-
-#ifdef DRM
-# define LEN_HCR_REORDSD 14
-# define LEN_HCR_LONGCW 6
-# define FIRST_PAIR_HCB 5
-# define QUAD_LEN 4
-# define PAIR_LEN 2
-#endif
 
 #define ID_SCE 0
 #define ID_CPE 1
@@ -117,18 +85,6 @@
 #define ID_FIL 6
 #define ID_END 7
 
-
-/* MPEG ID's */
-#define MPEG2 1
-#define MPEG4 0
-
-/* AAC object types */
-#define MAIN 1
-#define LOW  2
-#define SSR  3
-#define LTP  4
-
-
 #define BYTE_NUMBIT 8       /* bits in byte (char) */
 #define LONG_NUMBIT 32      /* bits in unsigned long */
 #define bit2byte(a) (((a)+BYTE_NUMBIT-1)/BYTE_NUMBIT)

_service:obs_scm:faac-1.31.obscpio/libfaac/blockswitch.c -> _service:obs_scm:faac-1.40.obscpio/libfaac/blockswitch.c Changed

@@ -21,11 +21,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <string.h>
 
 #include "blockswitch.h"
 #include "coder.h"
 #include "fft.h"
 #include "util.h"
+#include "filtbank.h"
 #include <faac.h>
 
 typedef float psyfloat;
@@ -45,7 +47,7 @@
 psydata_t;
 
 
-static void Hann(GlobalPsyInfo * gpsyInfo, double *inSamples, int size)
+static void Hann(GlobalPsyInfo * gpsyInfo, faac_real *inSamples, int size)
 {
   int i;
 
@@ -70,7 +72,7 @@
 } frames;
 #endif
 
-static void PsyCheckShort(PsyInfo * psyInfo, double quality)
+static void PsyCheckShort(PsyInfo * psyInfo, faac_real quality)
 {
   enum {PREVS = 2, NEXTS = 2};
   psydata_t *psydata = psyInfo->data;
@@ -95,13 +97,13 @@
 
       if (lasteng)
       {
-          double toteng = 0.0;
-          double volchg = 0.0;
+          faac_real toteng = 0.0;
+          faac_real volchg = 0.0;
 
           for (sfb = firstband; sfb < lastband; sfb++)
           {
               toteng += (engsfb < lastengsfb) ? engsfb : lastengsfb;
-              volchg += fabs(engsfb - lastengsfb);
+              volchg += FAAC_FABS(engsfb - lastengsfb);
           }
 
           if ((volchg / toteng * quality) > 3.0)
@@ -128,17 +130,17 @@
   int i, j, size;
 
   gpsyInfo->hannWindow =
-    (double *) AllocMemory(2 * BLOCK_LEN_LONG * sizeof(double));
+    (faac_real *) AllocMemory(2 * BLOCK_LEN_LONG * sizeof(faac_real));
   gpsyInfo->hannWindowS =
-    (double *) AllocMemory(2 * BLOCK_LEN_SHORT * sizeof(double));
+    (faac_real *) AllocMemory(2 * BLOCK_LEN_SHORT * sizeof(faac_real));
 
   for (i = 0; i < BLOCK_LEN_LONG * 2; i++)
-    gpsyInfo->hannWindowi = 0.5 * (1 - cos(2.0 * M_PI * (i + 0.5) /
+    gpsyInfo->hannWindowi = 0.5 * (1 - FAAC_COS(2.0 * M_PI * (i + 0.5) /
 					     (BLOCK_LEN_LONG * 2)));
   for (i = 0; i < BLOCK_LEN_SHORT * 2; i++)
-    gpsyInfo->hannWindowSi = 0.5 * (1 - cos(2.0 * M_PI * (i + 0.5) /
+    gpsyInfo->hannWindowSi = 0.5 * (1 - FAAC_COS(2.0 * M_PI * (i + 0.5) /
 					      (BLOCK_LEN_SHORT * 2)));
-  gpsyInfo->sampleRate = (double) sampleRate;
+  gpsyInfo->sampleRate = (faac_real) sampleRate;
 
   for (channel = 0; channel < numChannels; channel++)
   {
@@ -152,8 +154,8 @@
     psyInfochannel.size = size;
 
     psyInfochannel.prevSamples =
-      (double *) AllocMemory(size * sizeof(double));
-    memset(psyInfochannel.prevSamples, 0, size * sizeof(double));
+      (faac_real *) AllocMemory(size * sizeof(faac_real));
+    memset(psyInfochannel.prevSamples, 0, size * sizeof(faac_real));
   }
 
   size = BLOCK_LEN_SHORT;
@@ -230,7 +232,7 @@
 			 PsyInfo * psyInfo, int *cb_width_long, int
 			 num_cb_long, int *cb_width_short,
 			 int num_cb_short, unsigned int numChannels,
-			 double quality
+			 faac_real quality
 			)
 {
   unsigned int channel;
@@ -268,97 +270,21 @@
   }
 }
 
-// imported from filtbank.c
-static void mdct( FFT_Tables *fft_tables, double *data, int N )
-{
-    double tempr, tempi, c, s, cold, cfreq, sfreq; /* temps for pre and post twiddle */
-    double freq = 2.0 * M_PI / N;
-    double cosfreq8, sinfreq8;
-    int i, n;
-
-    double xiBLOCK_LEN_LONG / 2;
-    double xrBLOCK_LEN_LONG / 2;
-
-    /* prepare for recurrence relation in pre-twiddle */
-    cfreq = cos (freq);
-    sfreq = sin (freq);
-    cosfreq8 = cos (freq * 0.125);
-    sinfreq8 = sin (freq * 0.125);
-    c = cosfreq8;
-    s = sinfreq8;
-
-    for (i = 0; i < (N >> 2); i++) {
-        /* calculate real and imaginary parts of g(n) or G(p) */
-        n = 2 * i;
-
-        if (n < (N >> 2))
-            tempr = data (N>>2) + (N>>1) - 1 - n + data N - (N>>2) + n;
-        else
-            tempr = data (N>>2) + (N>>1) - 1 - n - data -(N>>2) + n;
-
-        if (n < (N >> 2))
-            tempi = data (N>>2) + n - data (N>>2) - 1 - n;
-        else
-            tempi = data (N>>2) + n + data N + (N>>2) - 1 - n;
-
-        /* calculate pre-twiddled FFT input */
-        xri = tempr * c + tempi * s;
-        xii = tempi * c - tempr * s;
-
-        /* use recurrence to prepare cosine and sine for next value of i */
-        cold = c;
-        c = c * cfreq - s * sfreq;
-        s = s * cfreq + cold * sfreq;
-    }
-
-    /* Perform in-place complex FFT of length N/4 */
-    switch (N) {
-    case BLOCK_LEN_SHORT * 2:
-        fft( fft_tables, xr, xi, 6);
-        break;
-    case BLOCK_LEN_LONG * 2:
-        fft( fft_tables, xr, xi, 9);
-    }
-
-    /* prepare for recurrence relations in post-twiddle */
-    c = cosfreq8;
-    s = sinfreq8;
-
-    /* post-twiddle FFT output and then get output data */
-    for (i = 0; i < (N >> 2); i++) {
-        /* get post-twiddled FFT output  */
-        tempr = 2. * (xri * c + xii * s);
-        tempi = 2. * (xii * c - xri * s);
-
-        /* fill in output values */
-        data 2 * i = -tempr;   /* first half even */
-        data (N >> 1) - 1 - 2 * i = tempi;  /* first half odd */
-        data (N >> 1) + 2 * i = -tempi;  /* second half even */
-        data N - 1 - 2 * i = tempr;  /* second half odd */
-
-        /* use recurrence to prepare cosine and sine for next value of i */
-        cold = c;
-        c = c * cfreq - s * sfreq;
-        s = s * cfreq + cold * sfreq;
-    }
-}
-
-
 static void PsyBufferUpdate( FFT_Tables *fft_tables, GlobalPsyInfo * gpsyInfo, PsyInfo * psyInfo,
-			    double *newSamples, unsigned int bandwidth,
+			    faac_real *newSamples, unsigned int bandwidth,
 			    int *cb_width_short, int num_cb_short)
 {
   int win;
-  double transBuff2 * BLOCK_LEN_LONG;
-  double transBuffS2 * BLOCK_LEN_SHORT;
+  faac_real *transBuff = gpsyInfo->sharedWorkBuffLong;
+  faac_real *transBuffS = gpsyInfo->sharedWorkBuffShort;
   psydata_t *psydata = psyInfo->data;
   psyfloat *tmp;
   int sfb;
 
   psydata->bandS = psyInfo->sizeS * bandwidth * 2 / gpsyInfo->sampleRate;
 
-  memcpy(transBuff, psyInfo->prevSamples, psyInfo->size * sizeof(double));
-  memcpy(transBuff + psyInfo->size, newSamples, psyInfo->size * sizeof(double));
+  memcpy(transBuff, psyInfo->prevSamples, psyInfo->size * sizeof(faac_real));
+  memcpy(transBuff + psyInfo->size, newSamples, psyInfo->size * sizeof(faac_real));
 
   for (win = 0; win < 8; win++)
   {
@@ -366,10 +292,10 @@
     int last = 0;
 
     memcpy(transBuffS, transBuff + (win * BLOCK_LEN_SHORT) + (BLOCK_LEN_LONG - BLOCK_LEN_SHORT) / 2,
-	   2 * psyInfo->sizeS * sizeof(double));
+	   2 * psyInfo->sizeS * sizeof(faac_real));
 
     Hann(gpsyInfo, transBuffS, 2 * psyInfo->sizeS);
-    mdct( fft_tables, transBuffS, 2 * psyInfo->sizeS);
+    MDCT( fft_tables, transBuffS, 2 * psyInfo->sizeS, gpsyInfo->mdctXr, gpsyInfo->mdctXi);
 
     // shift bufs
     tmp = psydata->engPrevwin;
@@ -380,7 +306,7 @@
 
     for (sfb = 0; sfb < num_cb_short; sfb++)
     {
-      double e;
+      faac_real e;
       int l;
 
       first = last;
@@ -405,7 +331,7 @@
     }
   }
 
-  memcpy(psyInfo->prevSamples, newSamples, psyInfo->size * sizeof(double));
+  memcpy(psyInfo->prevSamples, newSamples, psyInfo->size * sizeof(faac_real));
 }
 
 static void BlockSwitch(CoderInfo * coderInfo, PsyInfo * psyInfo, unsigned int numChannels)

_service:obs_scm:faac-1.31.obscpio/libfaac/blockswitch.h -> _service:obs_scm:faac-1.40.obscpio/libfaac/blockswitch.h Changed

@@ -22,6 +22,8 @@
 #ifndef PSYCH_H
 #define PSYCH_H
 
+#include "faac_real.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -39,7 +41,7 @@
 	int sizeS;
 
 	/* Previous input samples */
-	double *prevSamples;
+	faac_real *prevSamples;
 
 	int block_type;
 
@@ -47,11 +49,17 @@
 } PsyInfo;
 
 typedef struct {
-	double sampleRate;
+	faac_real sampleRate;
 
 	/* Hann window */
-	double *hannWindow;
-	double *hannWindowS;
+	faac_real *hannWindow;
+	faac_real *hannWindowS;
+
+	/* shared work buffers */
+	faac_real *sharedWorkBuffLong;  /* Used for 2048-sample windows (filtbank, psy, tns) */
+	faac_real *sharedWorkBuffShort; /* Used for 256-sample windows (psy) */
+	faac_real *mdctXr;              /* MDCT pre-twiddle work buffer (xr) */
+	faac_real *mdctXi;              /* MDCT pre-twiddle work buffer (xi) */
 
         void *data;
 } GlobalPsyInfo;
@@ -67,9 +75,9 @@
 void (*PsyCalculate) (ChannelInfo *channelInfo, GlobalPsyInfo *gpsyInfo,
 		PsyInfo *psyInfo, int *cb_width_long, int num_cb_long,
 		int *cb_width_short, int num_cb_short,
-		unsigned int numChannels, double quality);
+		unsigned int numChannels, faac_real quality);
 void (*PsyBufferUpdate) ( FFT_Tables *fft_tables, GlobalPsyInfo * gpsyInfo, PsyInfo * psyInfo,
-		double *newSamples, unsigned int bandwidth,
+		faac_real *newSamples, unsigned int bandwidth,
 		int *cb_width_short, int num_cb_short);
 void (*BlockSwitch) (CoderInfo *coderInfo, PsyInfo *psyInfo,
 		unsigned int numChannels);

_service:obs_scm:faac-1.31.obscpio/libfaac/coder.h -> _service:obs_scm:faac-1.40.obscpio/libfaac/coder.h Changed

@@ -22,33 +22,17 @@
 #ifndef CODER_H
 #define CODER_H
 
+#include "faac_real.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-/* Allow encoding of Digital Radio Mondiale (DRM) */
-//#define DRM
-
-/* Allow encoding of Digital Radio Mondiale (DRM) with transform length 1024 */
-//#define DRM_1024
-
 #define MAX_CHANNELS 64
 
-#ifdef DRM
-#ifdef DRM_1024
-# define FRAME_LEN 1024
-# define BLOCK_LEN_LONG 1024
-# define BLOCK_LEN_SHORT 128
-#else
-# define FRAME_LEN 960
-# define BLOCK_LEN_LONG 960
-# define BLOCK_LEN_SHORT 120
-#endif /* DRM_1024 */
-#else
-# define FRAME_LEN 1024
-# define BLOCK_LEN_LONG 1024
-# define BLOCK_LEN_SHORT 128
-#endif
+#define FRAME_LEN 1024
+#define BLOCK_LEN_LONG 1024
+#define BLOCK_LEN_SHORT 128
 
 #define NSFB_LONG  51
 #define NSFB_SHORT 15
@@ -70,15 +54,13 @@
 #define LEN_TNS_NFILTL 2
 #define LEN_TNS_NFILTS 1
 
-#define LPC 2
-
 typedef struct {
     int order;                           /* Filter order */
     int direction;                       /* Filtering direction */
     int coefCompress;                    /* Are coeffs compressed? */
     int length;                          /* Length, in bands */
-    double aCoeffsTNS_MAX_ORDER+1;     /* AR Coefficients */
-    double kCoeffsTNS_MAX_ORDER+1;     /* Reflection Coefficients */
+    faac_real aCoeffsTNS_MAX_ORDER+1;     /* AR Coefficients */
+    faac_real kCoeffsTNS_MAX_ORDER+1;     /* Reflection Coefficients */
     int indexTNS_MAX_ORDER+1;          /* Coefficient indices */
 } TnsFilterData;
 
@@ -126,14 +108,6 @@
     } sDATASIZE;
     int datacnt;
 
-#ifdef DRM
-    int num_data_cwFRAME_LEN;
-    int cur_cw;
-    int all_sfb;
-
-    int iLenLongestCW;
-    int iLenReordSpData;
-#endif
 
     TnsInfo tnsInfo;
 } CoderInfo;

_service:obs_scm:faac-1.40.obscpio/libfaac/cpu_compute.c Added

@@ -0,0 +1,66 @@
+/*
+ * FAAC - Freeware Advanced Audio Coder
+ * Copyright (C) 2026 Nils Schimmelmann
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "cpu_compute.h"
+
+#if defined(SSE2_ARCH)
+# ifdef _MSC_VER
+#  include <intrin.h>
+# elif defined(__GNUC__) || defined(__clang__)
+#  include <cpuid.h>
+# endif
+#endif
+
+CPUCaps get_cpu_caps(void)
+{
+    CPUCaps caps = CPU_CAP_NONE;
+
+#if defined(SSE2_ARCH)
+    unsigned int eax = 0, ebx = 0, ecx = 0, edx = 0;
+    unsigned int max_leaf = 0;
+
+# ifdef _MSC_VER
+    int cpu_info4 = {0};
+    __cpuid(cpu_info, 0);
+    max_leaf = (unsigned int)cpu_info0;
+# elif defined(__GNUC__) || defined(__clang__)
+    __cpuid(0, max_leaf, ebx, ecx, edx);
+# endif
+
+    if (max_leaf >= 1) {
+# ifdef _MSC_VER
+        __cpuid(cpu_info, 1);
+        eax = (unsigned int)cpu_info0;
+        ebx = (unsigned int)cpu_info1;
+        ecx = (unsigned int)cpu_info2;
+        edx = (unsigned int)cpu_info3;
+# elif defined(__GNUC__) || defined(__clang__)
+        __get_cpuid(1, &eax, &ebx, &ecx, &edx);
+# endif
+        if (edx & (1 << 26)) // SSE2
+            caps |= CPU_CAP_SSE2;
+    }
+#endif
+
+    return caps;
+}

_service:obs_scm:faac-1.40.obscpio/libfaac/cpu_compute.h Added

@@ -0,0 +1,34 @@
+/*
+ * FAAC - Freeware Advanced Audio Coder
+ * Copyright (C) 2026 Nils Schimmelmann
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef CPU_COMPUTE_H
+#define CPU_COMPUTE_H
+
+#if defined(_M_X64) || defined(__x86_64__) || defined(_M_IX86) || defined(__i386__)
+# define SSE2_ARCH
+#endif
+
+typedef enum {
+    CPU_CAP_NONE = 0,
+    CPU_CAP_SSE2 = (1 << 0)
+} CPUCaps;
+
+CPUCaps get_cpu_caps(void);
+
+#endif

_service:obs_scm:faac-1.40.obscpio/libfaac/faac_real.h Added

@@ -0,0 +1,53 @@
+/*
+ * FAAC - Freeware Advanced Audio Coder
+ * Copyright (C) 2026 Nils Schimmelmann
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef FAAC_REAL_H
+#define FAAC_REAL_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <math.h>
+
+#ifdef FAAC_PRECISION_SINGLE
+typedef float faac_real;
+#define FAAC_SIN sinf
+#define FAAC_COS cosf
+#define FAAC_SQRT sqrtf
+#define FAAC_FABS fabsf
+#define FAAC_LOG10 log10f
+#define FAAC_POW powf
+#define FAAC_ASIN asinf
+#define FAAC_LRINT lrintf
+#define FAAC_FLOOR floorf
+#else
+typedef double faac_real;
+#define FAAC_SIN sin
+#define FAAC_COS cos
+#define FAAC_SQRT sqrt
+#define FAAC_FABS fabs
+#define FAAC_LOG10 log10
+#define FAAC_POW pow
+#define FAAC_ASIN asin
+#define FAAC_LRINT lrint
+#define FAAC_FLOOR floor
+#endif
+
+#endif /* FAAC_REAL_H */

_service:obs_scm:faac-1.31.obscpio/libfaac/fft.c -> _service:obs_scm:faac-1.40.obscpio/libfaac/fft.c Changed

@@ -22,6 +22,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "fft.h"
 #include "util.h"
@@ -29,206 +30,6 @@
 #define MAXLOGM 9
 #define MAXLOGR 8
 
-#if defined DRM && !defined DRM_1024
-
-#include "kiss_fft/kiss_fft.h"
-#include "kiss_fft/kiss_fftr.h"
-
-static const int logm_to_nfft = 
-{
-/*  0       1       2       3       */
-    0,      0,      0,      0,
-/*  4       5       6       7       */
-    0,      0,      60,     0,
-/*  8       9                       */
-    240,    480
-};
-
-void fft_initialize( FFT_Tables *fft_tables )
-{
-    memset( fft_tables->cfg, 0, sizeof( fft_tables->cfg ) );
-}
-void fft_terminate( FFT_Tables *fft_tables )
-{
-    unsigned int i;
-    for ( i = 0; i < sizeof( fft_tables->cfg ) / sizeof( fft_tables->cfg0 ); i++ )
-    {
-        if ( fft_tables->cfgi0 )
-        {
-            free( fft_tables->cfgi0 );
-            fft_tables->cfgi0 = NULL;
-        }
-        if ( fft_tables->cfgi1 )
-        {
-            free( fft_tables->cfgi1 );
-            fft_tables->cfgi1 = NULL;
-        }
-    }
-}
-
-void rfft( FFT_Tables *fft_tables, double *x, int logm )
-{
-/* sur: use real-only optimized FFT */
-
-    int nfft = 0;
-
-    kiss_fft_scalar fin1 << MAXLOGR;
-    kiss_fft_cpx    fout1 << MAXLOGR;
-
-    if ( logm > MAXLOGR )
-	{
-		fprintf(stderr, "fft size too big\n");
-		exit(1);
-	}
-
-    nfft = logm_to_nfftlogm;
-
-    if ( fft_tables->cfglogm0 == NULL )
-    {
-        if ( nfft )
-        {
-            fft_tables->cfglogm0 = kiss_fftr_alloc( nfft, 0, NULL, NULL );
-        }
-        else
-        {
-	    	fprintf(stderr, "bad logm = %d\n", logm);
-            exit( 1 );
-        }
-    }
-
-    if ( fft_tables->cfglogm0 )
-    {
-        unsigned int i;
-        
-        for ( i = 0; i < nfft; i++ )
-        {
-            fini = xi;    
-        }
-        
-        kiss_fftr( (kiss_fftr_cfg)fft_tables->cfglogm0, fin, fout );
-
-        for ( i = 0; i < nfft / 2; i++ )
-        {
-            xi            = fouti.r;
-            xi + nfft / 2 = fouti.i;
-        }
-    }
-    else
-    {
-        fprintf( stderr, "bad config for logm = %d\n", logm);
-        exit( 1 );
-    }
-}
-
-void fft( FFT_Tables *fft_tables, double *xr, double *xi, int logm )
-{
-    int nfft = 0;
-
-    kiss_fft_cpx    fin1 << MAXLOGM;
-    kiss_fft_cpx    fout1 << MAXLOGM;
-
-    if ( logm > MAXLOGM )
-	{
-		fprintf(stderr, "fft size too big\n");
-		exit(1);
-	}
-
-    nfft = logm_to_nfftlogm;
-
-    if ( fft_tables->cfglogm0 == NULL )
-    {
-        if ( nfft )
-        {
-            fft_tables->cfglogm0 = kiss_fft_alloc( nfft, 0, NULL, NULL );
-        }
-        else
-        {
-	    	fprintf(stderr, "bad logm = %d\n", logm);
-            exit( 1 );
-        }
-    }
-
-    if ( fft_tables->cfglogm0 )
-    {
-        unsigned int i;
-        
-        for ( i = 0; i < nfft; i++ )
-        {
-            fini.r = xri;    
-            fini.i = xii;
-        }
-        
-        kiss_fft( (kiss_fft_cfg)fft_tables->cfglogm0, fin, fout );
-
-        for ( i = 0; i < nfft; i++ )
-        {
-            xri   = fouti.r;
-            xii   = fouti.i;
-        }
-    }
-    else
-    {
-        fprintf( stderr, "bad config for logm = %d\n", logm);
-        exit( 1 );
-    }
-}
-
-void ffti( FFT_Tables *fft_tables, double *xr, double *xi, int logm )
-{
-    int nfft = 0;
-
-    kiss_fft_cpx    fin1 << MAXLOGM;
-    kiss_fft_cpx    fout1 << MAXLOGM;
-
-    if ( logm > MAXLOGM )
-	{
-		fprintf(stderr, "fft size too big\n");
-		exit(1);
-	}
-
-    nfft = logm_to_nfftlogm;
-
-    if ( fft_tables->cfglogm1 == NULL )
-    {
-        if ( nfft )
-        {
-            fft_tables->cfglogm1 = kiss_fft_alloc( nfft, 1, NULL, NULL );
-        }
-        else
-        {
-	    	fprintf(stderr, "bad logm = %d\n", logm);
-            exit( 1 );
-        }
-    }
-    
-    if ( fft_tables->cfglogm1 )
-    {
-        unsigned int i;
-        double fac = 1.0 / (double)nfft;
-        
-        for ( i = 0; i < nfft; i++ )
-        {
-            fini.r = xri;    
-            fini.i = xii;
-        }
-        
-        kiss_fft( (kiss_fft_cfg)fft_tables->cfglogm1, fin, fout );
-
-        for ( i = 0; i < nfft; i++ )
-        {
-            xri   = fouti.r * fac;
-            xii   = fouti.i * fac;
-        }
-    }
-    else
-    {
-        fprintf( stderr, "bad config for logm = %d\n", logm);
-        exit( 1 );
-    }
-}
-
-#else /* !defined DRM || defined DRM_1024 */
-
 void fft_initialize( FFT_Tables *fft_tables )
 {
 	int i;
@@ -269,11 +70,11 @@
 	fft_tables->reordertbl	= NULL;
 }
 
-static void reorder( FFT_Tables *fft_tables, double *x, int logm)
+static void reorder2( FFT_Tables *fft_tables, faac_real *xr, faac_real *xi, int logm)
 {
 	int i;
 	int size = 1 << logm;
-	unsigned short *r;	//size
+	const unsigned short *r;
 
 
 	if ( fft_tables->reordertbllogm == NULL ) // create bit reversing table
@@ -300,20 +101,24 @@
 	for (i = 0; i < size; i++)
 	{
 		int j = ri;
-		double tmp;
+		faac_real tmp;
 
 		if (j <= i)
 			continue;
 
-		tmp = xi;
-		xi = xj;
-		xj = tmp;
+		tmp = xri;
+		xri = xrj;
+		xrj = tmp;
+
+		tmp = xii;
+		xii = xij;
+		xij = tmp;
 	}
 }
 
 static void fft_proc(
-		double *xr, 
-		double *xi,
+		faac_real *xr,
+		faac_real *xi,
 		fftfloat *refac, 
 		fftfloat *imfac, 
 		int size)	
@@ -321,8 +126,67 @@
 	int step, shift, pos;
 	int exp, estep;
 
-	estep = size;
-	for (step = 1; step < size; step *= 2)
+	estep = size >> 1;
+	/* First stage: step = 1
+	   Twiddle factor W_N^0 is always (1, 0).
+	   Eliminate all multiplications and table lookups.
+	*/
+	for (pos = 0; pos < size; pos += 2)
+	{
+		faac_real v2r, v2i;
+		int x1 = pos;
+		int x2 = pos + 1;
+
+		v2r = xrx2;
+		v2i = xix2;
+
+		xrx2 = xrx1 - v2r;
+		xrx1 += v2r;
+
+		xix2 = xix1 - v2i;
+		xix1 += v2i;
+	}
+
+	/* Second stage: step = 2
+	   shift = 0: Twiddle is (1, 0).
+	   shift = 1: Twiddle is (0, -1).
+	   Eliminate multiplications and avoid trig/table calls entirely.
+	*/
+	if (size >= 4) {
+		for (pos = 0; pos < size; pos += 4)
+		{
+			faac_real v2r, v2i;
+			int x1 = pos;
+			int x2 = pos + 2;
+
+			/* shift = 0: Rotation by 0 degrees */
+			v2r = xrx2;
+			v2i = xix2;
+
+			xrx2 = xrx1 - v2r;
+			xrx1 += v2r;
+
+			xix2 = xix1 - v2i;
+			xix1 += v2i;
+
+			/* shift = 1: Rotation by -90 degrees */
+			x1++;
+			x2++;
+
+			v2r = xix2;
+			v2i = -xrx2;
+
+			xrx2 = xrx1 - v2r;
+			xrx1 += v2r;
+
+			xix2 = xix1 - v2i;
+			xix1 += v2i;
+		}
+	}
+
+	/* Resume standard Radix-2 loop from stage 3 (step = 4) */
+	estep = size >> 2;
+	for (step = 4; step < size; step *= 2)
 	{
 		int x1;
 		int x2 = 0;
@@ -334,7 +198,7 @@
 			exp = 0;
 			for (shift = 0; shift < step; shift++)
 			{
-				double v2r, v2i;
+				faac_real v2r, v2i;
 
 				v2r = xrx2 * refacexp - xix2 * imfacexp;
 				v2i = xrx2 * imfacexp + xix2 * refacexp;
@@ -370,14 +234,14 @@
 
 		for (i = 0; i < (size >> 1); i++)
 		{
-			double theta = 2.0 * M_PI * ((double) i) / (double) size;
-			fft_tables->costbllogmi		= cos(theta);
-			fft_tables->negsintbllogmi	= -sin(theta);
+			faac_real theta = 2.0 * M_PI * ((faac_real) i) / (faac_real) size;
+			fft_tables->costbllogmi		= FAAC_COS(theta);
+			fft_tables->negsintbllogmi	= -FAAC_SIN(theta);
 		}
 	}
 }
 
-void fft( FFT_Tables *fft_tables, double *xr, double *xi, int logm)
+void fft( FFT_Tables *fft_tables, faac_real *xr, faac_real *xi, int logm)
 {
 	if (logm > MAXLOGM)
 	{
@@ -393,15 +257,14 @@
 
 	check_tables( fft_tables, logm);
 
-	reorder( fft_tables, xr, logm);
-	reorder( fft_tables, xi, logm);
+	reorder2( fft_tables, xr, xi, logm);
 
 	fft_proc( xr, xi, fft_tables->costbllogm, fft_tables->negsintbllogm, 1 << logm );
 }
 
-void rfft( FFT_Tables *fft_tables, double *x, int logm)
+void rfft( FFT_Tables *fft_tables, faac_real *x, int logm)
 {
-	double xi1 << MAXLOGR;
+	faac_real xi1 << MAXLOGR;
 
 	if (logm > MAXLOGR)
 	{
@@ -415,25 +278,3 @@
 
 	memcpy(x + (1 << (logm - 1)), xi, (1 << (logm - 1)) * sizeof(*x));
 }
-
-void ffti( FFT_Tables *fft_tables, double *xr, double *xi, int logm)
-{
-	int i, size;
-	double fac;
-	double *xrp, *xip;
-
-	fft( fft_tables, xi, xr, logm);
-
-	size = 1 << logm;
-	fac = 1.0 / size;
-	xrp = xr;
-	xip = xi;
-
-	for (i = 0; i < size; i++)
-	{
-		*xrp++ *= fac;
-		*xip++ *= fac;
-	}
-}
-
-#endif /* defined DRM && !defined DRM_1024 */

_service:obs_scm:faac-1.31.obscpio/libfaac/fft.h -> _service:obs_scm:faac-1.40.obscpio/libfaac/fft.h Changed

_service:obs_scm:faac-1.31.obscpio/libfaac/filtbank.c -> _service:obs_scm:faac-1.40.obscpio/libfaac/filtbank.c Changed

@@ -34,6 +34,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "coder.h"
 #include "filtbank.h"
@@ -44,11 +45,8 @@
 #define  TWOPI       2*M_PI
 
 
-static void		CalculateKBDWindow	( double* win, double alpha, int length );
-static double	Izero				( double x);
-static void		MDCT				( FFT_Tables *fft_tables, double *data, int N );
-static void		IMDCT				( FFT_Tables *fft_tables, double *data, int N );
-
+static void		CalculateKBDWindow	( faac_real* win, faac_real alpha, int length );
+static faac_real	Izero				( faac_real x);
 
 
 void FilterBankInit(faacEncStruct* hEncoder)
@@ -56,23 +54,28 @@
     unsigned int i, channel;
 
     for (channel = 0; channel < hEncoder->numChannels; channel++) {
-        hEncoder->freqBuffchannel = (double*)AllocMemory(2*FRAME_LEN*sizeof(double));
-        hEncoder->overlapBuffchannel = (double*)AllocMemory(FRAME_LEN*sizeof(double));
-        SetMemory(hEncoder->overlapBuffchannel, 0, FRAME_LEN*sizeof(double));
+        hEncoder->freqBuffchannel = (faac_real*)AllocMemory(2*FRAME_LEN*sizeof(faac_real));
+        hEncoder->overlapBuffchannel = (faac_real*)AllocMemory(FRAME_LEN*sizeof(faac_real));
+        SetMemory(hEncoder->overlapBuffchannel, 0, FRAME_LEN*sizeof(faac_real));
     }
 
-    hEncoder->sin_window_long = (double*)AllocMemory(BLOCK_LEN_LONG*sizeof(double));
-    hEncoder->sin_window_short = (double*)AllocMemory(BLOCK_LEN_SHORT*sizeof(double));
-    hEncoder->kbd_window_long = (double*)AllocMemory(BLOCK_LEN_LONG*sizeof(double));
-    hEncoder->kbd_window_short = (double*)AllocMemory(BLOCK_LEN_SHORT*sizeof(double));
+    hEncoder->sin_window_long = (faac_real*)AllocMemory(BLOCK_LEN_LONG*sizeof(faac_real));
+    hEncoder->sin_window_short = (faac_real*)AllocMemory(BLOCK_LEN_SHORT*sizeof(faac_real));
+    hEncoder->kbd_window_long = (faac_real*)AllocMemory(BLOCK_LEN_LONG*sizeof(faac_real));
+    hEncoder->kbd_window_short = (faac_real*)AllocMemory(BLOCK_LEN_SHORT*sizeof(faac_real));
 
     for( i=0; i<BLOCK_LEN_LONG; i++ )
-        hEncoder->sin_window_longi = sin((M_PI/(2*BLOCK_LEN_LONG)) * (i + 0.5));
+        hEncoder->sin_window_longi = FAAC_SIN((M_PI/(2*BLOCK_LEN_LONG)) * (i + 0.5));
     for( i=0; i<BLOCK_LEN_SHORT; i++ )
-        hEncoder->sin_window_shorti = sin((M_PI/(2*BLOCK_LEN_SHORT)) * (i + 0.5));
+        hEncoder->sin_window_shorti = FAAC_SIN((M_PI/(2*BLOCK_LEN_SHORT)) * (i + 0.5));
 
     CalculateKBDWindow(hEncoder->kbd_window_long, 4, BLOCK_LEN_LONG*2);
     CalculateKBDWindow(hEncoder->kbd_window_short, 6, BLOCK_LEN_SHORT*2);
+
+    hEncoder->gpsyInfo.sharedWorkBuffLong = (faac_real*)AllocMemory(2*BLOCK_LEN_LONG*sizeof(faac_real));
+    hEncoder->gpsyInfo.sharedWorkBuffShort = (faac_real*)AllocMemory(2*BLOCK_LEN_SHORT*sizeof(faac_real));
+    hEncoder->gpsyInfo.mdctXr = (faac_real*)AllocMemory((BLOCK_LEN_LONG / 2)*sizeof(faac_real));
+    hEncoder->gpsyInfo.mdctXi = (faac_real*)AllocMemory((BLOCK_LEN_LONG / 2)*sizeof(faac_real));
 }
 
 void FilterBankEnd(faacEncStruct* hEncoder)
@@ -88,30 +91,35 @@
     if (hEncoder->sin_window_short) FreeMemory(hEncoder->sin_window_short);
     if (hEncoder->kbd_window_long) FreeMemory(hEncoder->kbd_window_long);
     if (hEncoder->kbd_window_short) FreeMemory(hEncoder->kbd_window_short);
+
+    if (hEncoder->gpsyInfo.sharedWorkBuffLong) FreeMemory(hEncoder->gpsyInfo.sharedWorkBuffLong);
+    if (hEncoder->gpsyInfo.sharedWorkBuffShort) FreeMemory(hEncoder->gpsyInfo.sharedWorkBuffShort);
+    if (hEncoder->gpsyInfo.mdctXr) FreeMemory(hEncoder->gpsyInfo.mdctXr);
+    if (hEncoder->gpsyInfo.mdctXi) FreeMemory(hEncoder->gpsyInfo.mdctXi);
 }
 
 void FilterBank(faacEncStruct* hEncoder,
                 CoderInfo *coderInfo,
-                double *p_in_data,
-                double *p_out_mdct,
-                double *p_overlap,
+                faac_real *p_in_data,
+                faac_real *p_out_mdct,
+                faac_real *p_overlap,
                 int overlap_select)
 {
-    double *p_o_buf, *first_window, *second_window;
-    double *transf_buf;
+    faac_real *p_o_buf, *first_window, *second_window;
+    faac_real *transf_buf;
     int k, i;
     int block_type = coderInfo->block_type;
 
-    transf_buf = (double*)AllocMemory(2*BLOCK_LEN_LONG*sizeof(double));
+    transf_buf = hEncoder->gpsyInfo.sharedWorkBuffLong;
 
     /* create / shift old values */
     /* We use p_overlap here as buffer holding the last frame time signal*/
     if(overlap_select != MNON_OVERLAPPED) {
-        memcpy(transf_buf, p_overlap, FRAME_LEN*sizeof(double));
-        memcpy(transf_buf+BLOCK_LEN_LONG, p_in_data, FRAME_LEN*sizeof(double));
-        memcpy(p_overlap, p_in_data, FRAME_LEN*sizeof(double));
+        memcpy(transf_buf, p_overlap, FRAME_LEN*sizeof(faac_real));
+        memcpy(transf_buf+BLOCK_LEN_LONG, p_in_data, FRAME_LEN*sizeof(faac_real));
+        memcpy(p_overlap, p_in_data, FRAME_LEN*sizeof(faac_real));
     } else {
-        memcpy(transf_buf, p_in_data, 2*FRAME_LEN*sizeof(double));
+        memcpy(transf_buf, p_in_data, 2*FRAME_LEN*sizeof(faac_real));
     }
 
     /*  Window shape processing */
@@ -163,27 +171,27 @@
             p_out_mdcti = p_o_bufi * first_windowi;
             p_out_mdcti+BLOCK_LEN_LONG = p_o_bufi+BLOCK_LEN_LONG * second_windowBLOCK_LEN_LONG-i-1;
         }
-        MDCT( &hEncoder->fft_tables, p_out_mdct, 2*BLOCK_LEN_LONG );
+        MDCT( &hEncoder->fft_tables, p_out_mdct, 2*BLOCK_LEN_LONG, hEncoder->gpsyInfo.mdctXr, hEncoder->gpsyInfo.mdctXi );
         break;
 
     case LONG_SHORT_WINDOW :
         for ( i = 0 ; i < BLOCK_LEN_LONG ; i++)
             p_out_mdcti = p_o_bufi * first_windowi;
-        memcpy(p_out_mdct+BLOCK_LEN_LONG,p_o_buf+BLOCK_LEN_LONG,NFLAT_LS*sizeof(double));
+        memcpy(p_out_mdct+BLOCK_LEN_LONG,p_o_buf+BLOCK_LEN_LONG,NFLAT_LS*sizeof(faac_real));
         for ( i = 0 ; i < BLOCK_LEN_SHORT ; i++)
             p_out_mdcti+BLOCK_LEN_LONG+NFLAT_LS = p_o_bufi+BLOCK_LEN_LONG+NFLAT_LS * second_windowBLOCK_LEN_SHORT-i-1;
-        SetMemory(p_out_mdct+BLOCK_LEN_LONG+NFLAT_LS+BLOCK_LEN_SHORT,0,NFLAT_LS*sizeof(double));
-        MDCT( &hEncoder->fft_tables, p_out_mdct, 2*BLOCK_LEN_LONG );
+        SetMemory(p_out_mdct+BLOCK_LEN_LONG+NFLAT_LS+BLOCK_LEN_SHORT,0,NFLAT_LS*sizeof(faac_real));
+        MDCT( &hEncoder->fft_tables, p_out_mdct, 2*BLOCK_LEN_LONG, hEncoder->gpsyInfo.mdctXr, hEncoder->gpsyInfo.mdctXi );
         break;
 
     case SHORT_LONG_WINDOW :
-        SetMemory(p_out_mdct,0,NFLAT_LS*sizeof(double));
+        SetMemory(p_out_mdct,0,NFLAT_LS*sizeof(faac_real));
         for ( i = 0 ; i < BLOCK_LEN_SHORT ; i++)
             p_out_mdcti+NFLAT_LS = p_o_bufi+NFLAT_LS * first_windowi;
-        memcpy(p_out_mdct+NFLAT_LS+BLOCK_LEN_SHORT,p_o_buf+NFLAT_LS+BLOCK_LEN_SHORT,NFLAT_LS*sizeof(double));
+        memcpy(p_out_mdct+NFLAT_LS+BLOCK_LEN_SHORT,p_o_buf+NFLAT_LS+BLOCK_LEN_SHORT,NFLAT_LS*sizeof(faac_real));
         for ( i = 0 ; i < BLOCK_LEN_LONG ; i++)
             p_out_mdcti+BLOCK_LEN_LONG = p_o_bufi+BLOCK_LEN_LONG * second_windowBLOCK_LEN_LONG-i-1;
-        MDCT( &hEncoder->fft_tables, p_out_mdct, 2*BLOCK_LEN_LONG );
+        MDCT( &hEncoder->fft_tables, p_out_mdct, 2*BLOCK_LEN_LONG, hEncoder->gpsyInfo.mdctXr, hEncoder->gpsyInfo.mdctXi );
         break;
 
     case ONLY_SHORT_WINDOW :
@@ -193,197 +201,26 @@
                 p_out_mdcti = p_o_bufi * first_windowi;
                 p_out_mdcti+BLOCK_LEN_SHORT = p_o_bufi+BLOCK_LEN_SHORT * second_windowBLOCK_LEN_SHORT-i-1;
             }
-            MDCT( &hEncoder->fft_tables, p_out_mdct, 2*BLOCK_LEN_SHORT );
+            MDCT( &hEncoder->fft_tables, p_out_mdct, 2*BLOCK_LEN_SHORT, hEncoder->gpsyInfo.mdctXr, hEncoder->gpsyInfo.mdctXi );
             p_out_mdct += BLOCK_LEN_SHORT;
             p_o_buf += BLOCK_LEN_SHORT;
             first_window = second_window;
         }
         break;
     }
-
-    if (transf_buf) FreeMemory(transf_buf);
 }
 
-void IFilterBank(faacEncStruct* hEncoder,
-                 CoderInfo *coderInfo,
-                 double *p_in_data,
-                 double *p_out_data,
-                 double *p_overlap,
-                 int overlap_select)
-{
-    double *o_buf, *transf_buf, *overlap_buf;
-    double *first_window, *second_window;
-
-    double  *fp;
-    int k, i;
-    int block_type = coderInfo->block_type;
-
-    transf_buf = (double*)AllocMemory(2*BLOCK_LEN_LONG*sizeof(double));
-    overlap_buf = (double*)AllocMemory(2*BLOCK_LEN_LONG*sizeof(double));
-
-    /*  Window shape processing */
-    if (overlap_select != MNON_OVERLAPPED) {
-//      switch (coderInfo->prev_window_shape){
-//      case SINE_WINDOW:
-            if ( (block_type == ONLY_LONG_WINDOW) || (block_type == LONG_SHORT_WINDOW))
-                first_window = hEncoder->sin_window_long;
-            else
-                first_window = hEncoder->sin_window_short;
-//          break;
-//      case KBD_WINDOW:
-//          if ( (block_type == ONLY_LONG_WINDOW) || (block_type == LONG_SHORT_WINDOW))
-//              first_window = hEncoder->kbd_window_long;
-//          else
-//              first_window = hEncoder->kbd_window_short;
-//          break;
-//      }
-
-//      switch (coderInfo->window_shape){
-//      case SINE_WINDOW:
-            if ( (block_type == ONLY_LONG_WINDOW) || (block_type == SHORT_LONG_WINDOW))
-                second_window = hEncoder->sin_window_long;
-            else
-                second_window = hEncoder->sin_window_short;
-//          break;
-//      case KBD_WINDOW:
-//          if ( (block_type == ONLY_LONG_WINDOW) || (block_type == SHORT_LONG_WINDOW))
-//              second_window = hEncoder->kbd_window_long;
-//          else
-//              second_window = hEncoder->kbd_window_short;
-//          break;
-//      }
-    } else {
-        /* Always long block and sine window for LTP */
-        first_window  = hEncoder->sin_window_long;
-        second_window = hEncoder->sin_window_long;
-    }
-
-    /* Assemble overlap buffer */
-    memcpy(overlap_buf,p_overlap,BLOCK_LEN_LONG*sizeof(double));
-    o_buf = overlap_buf;
-
-    /* Separate action for each Block Type */
-    switch( block_type ) {
-    case ONLY_LONG_WINDOW :
-        memcpy(transf_buf, p_in_data,BLOCK_LEN_LONG*sizeof(double));
-        IMDCT( &hEncoder->fft_tables, transf_buf, 2*BLOCK_LEN_LONG );
-        for ( i = 0 ; i < BLOCK_LEN_LONG ; i++)
-            transf_bufi *= first_windowi;
-        if (overlap_select != MNON_OVERLAPPED) {
-            for ( i = 0 ; i < BLOCK_LEN_LONG; i++ ){
-                o_bufi += transf_bufi;
-                o_bufi+BLOCK_LEN_LONG = transf_bufi+BLOCK_LEN_LONG * second_windowBLOCK_LEN_LONG-i-1;
-            }
-        } else { /* overlap_select == NON_OVERLAPPED */
-            for ( i = 0 ; i < BLOCK_LEN_LONG; i++ )
-                transf_bufi+BLOCK_LEN_LONG *= second_windowBLOCK_LEN_LONG-i-1;
-        }
-        break;
-
-    case LONG_SHORT_WINDOW :
-        memcpy(transf_buf, p_in_data,BLOCK_LEN_LONG*sizeof(double));
-        IMDCT( &hEncoder->fft_tables, transf_buf, 2*BLOCK_LEN_LONG );
-        for ( i = 0 ; i < BLOCK_LEN_LONG ; i++)
-            transf_bufi *= first_windowi;
-        if (overlap_select != MNON_OVERLAPPED) {
-            for ( i = 0 ; i < BLOCK_LEN_LONG; i++ )
-                o_bufi += transf_bufi;
-            memcpy(o_buf+BLOCK_LEN_LONG,transf_buf+BLOCK_LEN_LONG,NFLAT_LS*sizeof(double));
-            for ( i = 0 ; i < BLOCK_LEN_SHORT ; i++)
-                o_bufi+BLOCK_LEN_LONG+NFLAT_LS = transf_bufi+BLOCK_LEN_LONG+NFLAT_LS * second_windowBLOCK_LEN_SHORT-i-1;
-            SetMemory(o_buf+BLOCK_LEN_LONG+NFLAT_LS+BLOCK_LEN_SHORT,0,NFLAT_LS*sizeof(double));
-        } else { /* overlap_select == NON_OVERLAPPED */
-            for ( i = 0 ; i < BLOCK_LEN_SHORT ; i++)
-                transf_bufi+BLOCK_LEN_LONG+NFLAT_LS *= second_windowBLOCK_LEN_SHORT-i-1;
-            SetMemory(transf_buf+BLOCK_LEN_LONG+NFLAT_LS+BLOCK_LEN_SHORT,0,NFLAT_LS*sizeof(double));
-        }
-        break;
-
-    case SHORT_LONG_WINDOW :
-        memcpy(transf_buf, p_in_data,BLOCK_LEN_LONG*sizeof(double));
-        IMDCT( &hEncoder->fft_tables, transf_buf, 2*BLOCK_LEN_LONG );
-        for ( i = 0 ; i < BLOCK_LEN_SHORT ; i++)
-            transf_bufi+NFLAT_LS *= first_windowi;
-        if (overlap_select != MNON_OVERLAPPED) {
-            for ( i = 0 ; i < BLOCK_LEN_SHORT; i++ )
-                o_bufi+NFLAT_LS += transf_bufi+NFLAT_LS;
-            memcpy(o_buf+BLOCK_LEN_SHORT+NFLAT_LS,transf_buf+BLOCK_LEN_SHORT+NFLAT_LS,NFLAT_LS*sizeof(double));
-            for ( i = 0 ; i < BLOCK_LEN_LONG ; i++)
-                o_bufi+BLOCK_LEN_LONG = transf_bufi+BLOCK_LEN_LONG * second_windowBLOCK_LEN_LONG-i-1;
-        } else { /* overlap_select == NON_OVERLAPPED */
-            SetMemory(transf_buf,0,NFLAT_LS*sizeof(double));
-            for ( i = 0 ; i < BLOCK_LEN_LONG ; i++)
-                transf_bufi+BLOCK_LEN_LONG *= second_windowBLOCK_LEN_LONG-i-1;
-        }
-        break;
-
-    case ONLY_SHORT_WINDOW :
-        if (overlap_select != MNON_OVERLAPPED) {
-            fp = o_buf + NFLAT_LS;
-        } else { /* overlap_select == NON_OVERLAPPED */
-            fp = transf_buf;
-        }
-        for ( k=0; k < MAX_SHORT_WINDOWS; k++ ) {
-            memcpy(transf_buf,p_in_data,BLOCK_LEN_SHORT*sizeof(double));
-            IMDCT( &hEncoder->fft_tables, transf_buf, 2*BLOCK_LEN_SHORT );
-            p_in_data += BLOCK_LEN_SHORT;
-            if (overlap_select != MNON_OVERLAPPED) {
-                for ( i = 0 ; i < BLOCK_LEN_SHORT ; i++){
-                    transf_bufi *= first_windowi;
-                    fpi += transf_bufi;
-                    fpi+BLOCK_LEN_SHORT = transf_bufi+BLOCK_LEN_SHORT * second_windowBLOCK_LEN_SHORT-i-1;
-                }
-                fp += BLOCK_LEN_SHORT;
-            } else { /* overlap_select == NON_OVERLAPPED */
-                for ( i = 0 ; i < BLOCK_LEN_SHORT ; i++){
-                    fpi *= first_windowi;
-                    fpi+BLOCK_LEN_SHORT *= second_windowBLOCK_LEN_SHORT-i-1;
-                }
-                fp += 2*BLOCK_LEN_SHORT;
-            }
-            first_window = second_window;
-        }
-        SetMemory(o_buf+BLOCK_LEN_LONG+NFLAT_LS+BLOCK_LEN_SHORT,0,NFLAT_LS*sizeof(double));
-        break;
-    }
-
-    if (overlap_select != MNON_OVERLAPPED)
-        memcpy(p_out_data,o_buf,BLOCK_LEN_LONG*sizeof(double));
-    else  /* overlap_select == NON_OVERLAPPED */
-        memcpy(p_out_data,transf_buf,2*BLOCK_LEN_LONG*sizeof(double));
-
-    /* save unused output data */
-    memcpy(p_overlap,o_buf+BLOCK_LEN_LONG,BLOCK_LEN_LONG*sizeof(double));
-
-    if (overlap_buf) FreeMemory(overlap_buf);
-    if (transf_buf) FreeMemory(transf_buf);
-}
 
-void specFilter(double *freqBuff,
-                int sampleRate,
-                int lowpassFreq,
-                int specLen
-                )
+static faac_real Izero(faac_real x)
 {
-    int lowpass,xlowpass;
-
-    /* calculate the last line which is not zero */
-    lowpass = (lowpassFreq * specLen) / (sampleRate>>1) + 1;
-    xlowpass = (lowpass < specLen) ? lowpass : specLen ;
-
-    SetMemory(freqBuff+xlowpass,0,(specLen-xlowpass)*sizeof(double));
-}
-
-static double Izero(double x)
-{
-    const double IzeroEPSILON = 1E-41;  /* Max error acceptable in Izero */
-    double sum, u, halfx, temp;
+    const faac_real IzeroEPSILON = 1E-41;  /* Max error acceptable in Izero */
+    faac_real sum, u, halfx, temp;
     int n;
 
     sum = u = n = 1;
     halfx = x/2.0;
     do {
-        temp = halfx/(double)n;
+        temp = halfx/(faac_real)n;
         n += 1;
         temp *= temp;
         u *= temp;
@@ -393,20 +230,20 @@
     return(sum);
 }
 
-static void CalculateKBDWindow(double* win, double alpha, int length)
+static void CalculateKBDWindow(faac_real* win, faac_real alpha, int length)
 {
     int i;
-    double IBeta;
-    double tmp;
-    double sum = 0.0;
+    faac_real IBeta;
+    faac_real tmp;
+    faac_real sum = 0.0;
 
     alpha *= M_PI;
     IBeta = 1.0/Izero(alpha);
 
     /* calculate lower half of Kaiser Bessel window */
     for(i=0; i<(length>>1); i++) {
-        tmp = 4.0*(double)i/(double)length - 1.0;
-        wini = Izero(alpha*sqrt(1.0-tmp*tmp))*IBeta;
+        tmp = 4.0*(faac_real)i/(faac_real)length - 1.0;
+        wini = Izero(alpha*FAAC_SQRT(1.0-tmp*tmp))*IBeta;
         sum += wini;
     }
 
@@ -416,43 +253,47 @@
     /* calculate lower half of window */
     for(i=0; i<(length>>1); i++) {
         tmp += wini;
-        wini = sqrt(tmp*sum);
+        wini = FAAC_SQRT(tmp*sum);
     }
 }
 
-static void MDCT( FFT_Tables *fft_tables, double *data, int N )
+void MDCT( FFT_Tables *fft_tables, faac_real *data, int N, faac_real *xr, faac_real *xi )
 {
-    double *xi, *xr;
-    double tempr, tempi, c, s, cold, cfreq, sfreq; /* temps for pre and post twiddle */
-    double freq = TWOPI / N;
-    double cosfreq8, sinfreq8;
-    int i, n;
+    faac_real tempr, tempi, c, s, cold, cfreq, sfreq; /* temps for pre and post twiddle */
+    faac_real freq = TWOPI / N;
+    int i;
+
+    /* Hoisted constants */
+    const int N2 = N >> 1;
+    const int N4 = N >> 2;
+    const int N8 = N >> 3;
 
-    xi = (double*)AllocMemory((N >> 2)*sizeof(double));
-    xr = (double*)AllocMemory((N >> 2)*sizeof(double));
+    /* Base pointers for address simplification */
+    faac_real *base0 = data + N4;
+    faac_real *base1 = data + (N4 - 1);
+    faac_real *base2 = data + (N + N4 - 1);
 
     /* prepare for recurrence relation in pre-twiddle */
-    cfreq = cos (freq);
-    sfreq = sin (freq);
-    cosfreq8 = cos (freq * 0.125);
-    sinfreq8 = sin (freq * 0.125);
-    c = cosfreq8;
-    s = sinfreq8;
-
-    for (i = 0; i < (N >> 2); i++) {
+    cfreq = FAAC_COS(freq);
+    sfreq = FAAC_SIN(freq);
+
+    c = FAAC_COS(freq * 0.125);
+    s = FAAC_SIN(freq * 0.125);
+
+    /* Induction variables */
+    int n1 = N2 - 1;  /* descending: N/2 - 1 - 2i */
+    int n2 = 0;       /* ascending: 2i */
+
+    /* Phase 1: i < N/8 */
+    for (i = 0; i < N8; i++) {
+
         /* calculate real and imaginary parts of g(n) or G(p) */
-        n = (N >> 1) - 1 - 2 * i;
 
-        if (i < (N >> 3))
-            tempr = data (N >> 2) + n + data N + (N >> 2) - 1 - n; /* use second form of e(n) for n = N / 2 - 1 - 2i */
-        else
-            tempr = data (N >> 2) + n - data (N >> 2) - 1 - n; /* use first form of e(n) for n = N / 2 - 1 - 2i */
+        /* use second form of e(n) for n = N / 2 - 1 - 2i */
+        tempr = base0n1 + base2-n1;
 
-        n = 2 * i;
-        if (i < (N >> 3))
-            tempi = data (N >> 2) + n - data (N >> 2) - 1 - n; /* use first form of e(n) for n=2i */
-        else
-            tempi = data (N >> 2) + n + data N + (N >> 2) - 1 - n; /* use second form of e(n) for n=2i*/
+        /* use first form of e(n) for n = 2i */
+        tempi = base0n2 - base1-n2;
 
         /* calculate pre-twiddled FFT input */
         xri = tempr * c + tempi * s;
@@ -462,119 +303,75 @@
         cold = c;
         c = c * cfreq - s * sfreq;
         s = s * cfreq + cold * sfreq;
-    }
 
-    /* Perform in-place complex FFT of length N/4 */
-    switch (N) {
-    case BLOCK_LEN_SHORT * 2:
-        fft( fft_tables, xr, xi, 6);
-        break;
-    case BLOCK_LEN_LONG * 2:
-        fft( fft_tables, xr, xi, 9);
+        n1 -= 2;
+        n2 += 2;
     }
 
-    /* prepare for recurrence relations in post-twiddle */
-    c = cosfreq8;
-    s = sinfreq8;
+    /* Phase 2: i >= N/8 */
+    for (; i < N4; i++) {
 
-    /* post-twiddle FFT output and then get output data */
-    for (i = 0; i < (N >> 2); i++) {
-        /* get post-twiddled FFT output  */
-        tempr = 2. * (xri * c + xii * s);
-        tempi = 2. * (xii * c - xri * s);
-
-        /* fill in output values */
-        data 2 * i = -tempr;   /* first half even */
-        data (N >> 1) - 1 - 2 * i = tempi;  /* first half odd */
-        data (N >> 1) + 2 * i = -tempi;  /* second half even */
-        data N - 1 - 2 * i = tempr;  /* second half odd */
-
-        /* use recurrence to prepare cosine and sine for next value of i */
-        cold = c;
-        c = c * cfreq - s * sfreq;
-        s = s * cfreq + cold * sfreq;
-    }
-
-    if (xr) FreeMemory(xr);
-    if (xi) FreeMemory(xi);
-}
-
-static void IMDCT( FFT_Tables *fft_tables, double *data, int N)
-{
-    double *xi, *xr;
-    double tempr, tempi, c, s, cold, cfreq, sfreq; /* temps for pre and post twiddle */
-    double freq = 2.0 * M_PI / N;
-    double fac, cosfreq8, sinfreq8;
-    int i;
-
-    xi = (double*)AllocMemory((N >> 2)*sizeof(double));
-    xr = (double*)AllocMemory((N >> 2)*sizeof(double));
+        /* calculate real and imaginary parts of g(n) or G(p) */
 
-    /* Choosing to allocate 2/N factor to Inverse Xform! */
-    fac = 2. / N; /* remaining 2/N from 4/N IFFT factor */
+        /* use first form of e(n) for n = N / 2 - 1 - 2i */
+        tempr = base0n1 - base1-n1;
 
-    /* prepare for recurrence relation in pre-twiddle */
-    cfreq = cos (freq);
-    sfreq = sin (freq);
-    cosfreq8 = cos (freq * 0.125);
-    sinfreq8 = sin (freq * 0.125);
-    c = cosfreq8;
-    s = sinfreq8;
-
-    for (i = 0; i < (N >> 2); i++) {
-        /* calculate real and imaginary parts of g(n) or G(p) */
-        tempr = -data2 * i;
-        tempi = data(N >> 1) - 1 - 2 * i;
+        /* use second form of e(n) for n = 2i */
+        tempi = base0n2 + base2-n2;
 
         /* calculate pre-twiddled FFT input */
-        xri = tempr * c - tempi * s;
-        xii = tempi * c + tempr * s;
+        xri = tempr * c + tempi * s;
+        xii = tempi * c - tempr * s;
 
         /* use recurrence to prepare cosine and sine for next value of i */
         cold = c;
         c = c * cfreq - s * sfreq;
         s = s * cfreq + cold * sfreq;
+
+        n1 -= 2;
+        n2 += 2;
     }
 
-    /* Perform in-place complex IFFT of length N/4 */
+    /* Perform in-place complex FFT of length N/4 */
     switch (N) {
     case BLOCK_LEN_SHORT * 2:
-        ffti( fft_tables, xr, xi, 6);
+        fft( fft_tables, xr, xi, 6);
         break;
     case BLOCK_LEN_LONG * 2:
-        ffti( fft_tables, xr, xi, 9);
+        fft( fft_tables, xr, xi, 9);
+        break;
     }
 
     /* prepare for recurrence relations in post-twiddle */
-    c = cosfreq8;
-    s = sinfreq8;
+    c = FAAC_COS(freq * 0.125);
+    s = FAAC_SIN(freq * 0.125);
+
+    /* Base pointers for output mapping */
+    faac_real *base_even0 = data;
+    faac_real *base_odd0  = data + (N2 - 1);
+    faac_real *base_even1 = data + N2;
+    faac_real *base_odd1  = data + (N - 1);
+
+    n2 = 0;
 
     /* post-twiddle FFT output and then get output data */
-    for (i = 0; i < (N >> 2); i++) {
+    for (i = 0; i < N4; i++) {
 
-        /* get post-twiddled FFT output  */
-        tempr = fac * (xri * c - xii * s);
-        tempi = fac * (xii * c + xri * s);
+        /* get post-twiddled FFT output */
+        tempr = 2. * (xri * c + xii * s);
+        tempi = 2. * (xii * c - xri * s);
 
         /* fill in output values */
-        data (N >> 1) + (N >> 2) - 1 - 2 * i = tempr;
-        if (i < (N >> 3))
-            data (N >> 1) + (N >> 2) + 2 * i = tempr;
-        else
-            data 2 * i - (N >> 2) = -tempr;
-
-        data (N >> 2) + 2 * i = tempi;
-        if (i < (N >> 3))
-            data (N >> 2) - 1 - 2 * i = -tempi;
-        else
-            data (N >> 2) + N - 1 - 2*i = tempi;
+        base_even0n2 = -tempr;  /* first half even */
+        base_odd0-n2 =  tempi;  /* first half odd */
+        base_even1n2 = -tempi;  /* second half even */
+        base_odd1-n2 =  tempr;  /* second half odd */
 
         /* use recurrence to prepare cosine and sine for next value of i */
         cold = c;
         c = c * cfreq - s * sfreq;
         s = s * cfreq + cold * sfreq;
-    }
 
-    if (xr) FreeMemory(xr);
-    if (xi) FreeMemory(xi);
+        n2 += 2;
+    }
 }

_service:obs_scm:faac-1.31.obscpio/libfaac/filtbank.h -> _service:obs_scm:faac-1.40.obscpio/libfaac/filtbank.h Changed

@@ -28,11 +28,7 @@
 
 #include "frame.h"
 
-#ifdef DRM
-#define NFLAT_LS (( BLOCK_LEN_LONG - BLOCK_LEN_SHORT ) / 2)
-#else
 #define NFLAT_LS 448
-#endif
 
 #define MOVERLAPPED     0
 #define MNON_OVERLAPPED 1
@@ -45,24 +41,15 @@
 
 void			FilterBankEnd		( faacEncStruct* hEncoder );
 
-void			FilterBank( faacEncStruct* hEncoder,
-						CoderInfo *coderInfo,
-						double *p_in_data,
-						double *p_out_mdct,
-						double *p_overlap,
-						int overlap_select );
+void			MDCT				( FFT_Tables *fft_tables, faac_real *data, int N, faac_real *xr, faac_real *xi );
 
-void			IFilterBank( faacEncStruct* hEncoder,
+void			FilterBank( faacEncStruct* hEncoder,
 						CoderInfo *coderInfo,
-						double *p_in_data,
-						double *p_out_mdct,
-						double *p_overlap,
+						faac_real *p_in_data,
+						faac_real *p_out_mdct,
+						faac_real *p_overlap,
 						int overlap_select );
 
-void			specFilter(	double *freqBuff,
-						int sampleRate,
-						int lowpassFreq,
-						int specLen );
 
 #ifdef __cplusplus
 }

_service:obs_scm:faac-1.31.obscpio/libfaac/frame.c -> _service:obs_scm:faac-1.40.obscpio/libfaac/frame.c Changed

@@ -52,8 +52,8 @@
 
 // default bandwidth/samplerate ratio
 static const struct {
-    double fac;
-    double freq;
+    faac_real fac;
+    faac_real freq;
 } g_bw = {0.42, 18000};
 
 int FAACAPI faacEncGetVersion( char **faac_id_string,
@@ -143,10 +143,6 @@
     if (hEncoder->config.aacObjectType != LOW)
         return 0;
 
-#ifdef DRM
-    config->pnslevel = 0;
-#endif
-
     /* Re-init TNS for new profile */
     TnsInit(hEncoder);
 
@@ -162,13 +158,13 @@
 
     if (config->bitRate && !config->bandWidth)
     {
-        config->bandWidth = (double)config->bitRate * hEncoder->sampleRate * g_bw.fac / 50000.0;
+        config->bandWidth = (faac_real)config->bitRate * hEncoder->sampleRate * g_bw.fac / 50000.0;
         if (config->bandWidth > g_bw.freq)
             config->bandWidth = g_bw.freq;
 
         if (!config->quantqual)
         {
-            config->quantqual = (double)config->bitRate * hEncoder->numChannels / 1280;
+            config->quantqual = (faac_real)config->bitRate * hEncoder->numChannels / 1280;
             if (config->quantqual > 100)
                 config->quantqual = (config->quantqual - 100) * 3.0 + 100;
         }
@@ -247,10 +243,6 @@
     *inputSamples = FRAME_LEN*numChannels;
     *maxOutputBytes = ADTS_FRAMESIZE;
 
-#ifdef DRM
-    *maxOutputBytes += 1; /* for CRC */
-#endif
-
     hEncoder = (faacEncStruct*)AllocMemory(sizeof(faacEncStruct));
     SetMemory(hEncoder, 0, sizeof(faacEncStruct));
 
@@ -318,6 +310,8 @@
 
     TnsInit(hEncoder);
 
+    QuantizeInit();
+
     /* Return handle */
     return hEncoder;
 }
@@ -364,10 +358,6 @@
     int sb, frameBytes;
     unsigned int offset;
     BitStream *bitStream; /* bitstream used for writing the frame to */
-#ifdef DRM
-    int desbits, diff;
-    double fix;
-#endif
 
     /* local copy's of parameters */
     ChannelInfo *channelInfo = hEncoder->channelInfo;
@@ -397,11 +387,11 @@
     /* Update current sample buffers */
     for (channel = 0; channel < numChannels; channel++)
 	{
-		double *tmp;
+		faac_real *tmp;
 
 
 		if (!hEncoder->sampleBuffchannel)
-			hEncoder->sampleBuffchannel = (double*)AllocMemory(FRAME_LEN*sizeof(double));
+			hEncoder->sampleBuffchannel = (faac_real*)AllocMemory(FRAME_LEN*sizeof(faac_real));
 
 		tmp = hEncoder->sampleBuffchannel;
 
@@ -427,7 +417,7 @@
 
 						for (i = 0; i < samples_per_channel; i++)
 						{
-							hEncoder->next3SampleBuffchanneli = (double)*input_channel;
+							hEncoder->next3SampleBuffchanneli = (faac_real)*input_channel;
 							input_channel += numChannels;
 						}
 					}
@@ -439,7 +429,7 @@
 
 						for (i = 0; i < samples_per_channel; i++)
 						{
-							hEncoder->next3SampleBuffchanneli = (1.0/256) * (double)*input_channel;
+							hEncoder->next3SampleBuffchanneli = (1.0/256) * (faac_real)*input_channel;
 							input_channel += numChannels;
 						}
 					}
@@ -451,7 +441,7 @@
 
 						for (i = 0; i < samples_per_channel; i++)
 						{
-							hEncoder->next3SampleBuffchanneli = (double)*input_channel;
+							hEncoder->next3SampleBuffchanneli = (faac_real)*input_channel;
 							input_channel += numChannels;
 						}
 					}
@@ -489,7 +479,7 @@
     hEncoder->psymodel->PsyCalculate(channelInfo, &hEncoder->gpsyInfo, hEncoder->psyInfo,
         hEncoder->srInfo->cb_width_long, hEncoder->srInfo->num_cb_long,
         hEncoder->srInfo->cb_width_short,
-        hEncoder->srInfo->num_cb_short, numChannels, (double)hEncoder->aacquantCfg.quality / DEFQUAL);
+        hEncoder->srInfo->num_cb_short, numChannels, (faac_real)hEncoder->aacquantCfg.quality / DEFQUAL);
 
     hEncoder->psymodel->BlockSwitch(coderInfo, hEncoder->psyInfo, numChannels);
 
@@ -555,7 +545,7 @@
                       coderInfochannel.sfbn,
                       coderInfochannel.block_type,
                       coderInfochannel.sfb_offset,
-                      hEncoder->freqBuffchannel);
+                      hEncoder->freqBuffchannel, hEncoder->gpsyInfo.sharedWorkBuffLong);
         } else {
             coderInfochannel.tnsInfo.tnsDataPresent = 0;      /* TNS not used for LFE */
         }
@@ -570,48 +560,13 @@
 	}
 
     AACstereo(coderInfo, channelInfo, hEncoder->freqBuff, numChannels,
-              (double)hEncoder->aacquantCfg.quality/DEFQUAL, jointmode);
+              (faac_real)hEncoder->aacquantCfg.quality/DEFQUAL, jointmode);
 
-#ifdef DRM
-    /* loop the quantization until the desired bit-rate is reached */
-    diff = 1; /* to enter while loop */
-    hEncoder->aacquantCfg.quality = 120; /* init quality setting */
-    while (diff > 0) { /* if too many bits, do it again */
-#endif
     for (channel = 0; channel < numChannels; channel++) {
         BlocQuant(&coderInfochannel, hEncoder->freqBuffchannel,
                   &(hEncoder->aacquantCfg));
     }
 
-#ifdef DRM
-    /* Write the AAC bitstream */
-    bitStream = OpenBitStream(bufferSize, outputBuffer);
-    WriteBitstream(hEncoder, coderInfo, channelInfo, bitStream, numChannels);
-
-    /* Close the bitstream and return the number of bytes written */
-    frameBytes = CloseBitStream(bitStream);
-
-    /* now calculate desired bits and compare with actual encoded bits */
-    desbits = (int) ((double) numChannels * (hEncoder->config.bitRate * FRAME_LEN)
-            / hEncoder->sampleRate);
-
-    diff = ((frameBytes - 1 /* CRC */) * 8) - desbits;
-
-    /* do linear correction according to relative difference */
-    fix = (double) desbits / ((frameBytes - 1 /* CRC */) * 8);
-
-    /* speed up convergence. A value of 0.92 gives approx up to 10 iterations */
-    if (fix > 0.92)
-        fix = 0.92;
-
-    hEncoder->aacquantCfg.quality *= fix;
-
-    /* quality should not go lower than 1, set diff to exit loop */
-    if (hEncoder->aacquantCfg.quality <= 1)
-        diff = -1;
-    }
-#endif
-
     // fix max_sfb in CPE mode
     for (channel = 0; channel < numChannels; channel++)
     {
@@ -627,7 +582,6 @@
                         cil->sfbn = cir->sfbn = max(cil->sfbn, cir->sfbn);
 		}
     }
-#ifndef DRM
     /* Write the AAC bitstream */
     bitStream = OpenBitStream(bufferSize, outputBuffer);
 
@@ -642,7 +596,7 @@
     {
         int desbits = numChannels * (hEncoder->config.bitRate * FRAME_LEN)
             / hEncoder->sampleRate;
-        double fix = (double)desbits / (double)(frameBytes * 8);
+        faac_real fix = (faac_real)desbits / (faac_real)(frameBytes * 8);
 
         if (fix < 0.9)
             fix += 0.1;
@@ -661,120 +615,11 @@
         if (hEncoder->aacquantCfg.quality < 10)
             hEncoder->aacquantCfg.quality = 10;
     }
-#endif
 
     return frameBytes;
 }
 
 
-#ifdef DRM
-/* Scalefactorband data table for 960 transform length */
-/* all parameters which are different from the 1024 transform length table are
-   marked with an "x" */
-static SR_INFO srInfo12+1 =
-{
-    { 96000, 40/*x*/, 12,
-        {
-            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-            8, 8, 8, 8, 8, 12, 12, 12, 12, 12, 16, 16, 24, 28,
-            36, 44, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0/*x*/
-        },{
-            4, 4, 4, 4, 4, 4, 8, 8, 8, 16, 28, 28/*x*/
-        }
-    }, { 88200, 40/*x*/, 12,
-        {
-            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-            8, 8, 8, 8, 8, 12, 12, 12, 12, 12, 16, 16, 24, 28,
-            36, 44, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0/*x*/
-        },{
-            4, 4, 4, 4, 4, 4, 8, 8, 8, 16, 28, 28/*x*/
-        }
-    }, { 64000, 45/*x*/, 12,
-        {
-            4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-            8, 8, 8, 8, 12, 12, 12, 16, 16, 16, 20, 24, 24, 28,
-            36, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-            40, 40, 40, 16/*x*/, 0/*x*/
-        },{
-            4, 4, 4, 4, 4, 4, 8, 8, 8, 16, 28, 28/*x*/
-        }
-    }, { 48000, 49, 14,
-        {
-            4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  8,  8,  8,  8,  8,  8,  8,
-            12, 12, 12, 12, 16, 16, 20, 20, 24, 24, 28, 28, 32, 32, 32, 32, 32, 32,
-            32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32/*x*/
-        }, {
-            4,  4,  4,  4,  4,  8,  8,  8, 12, 12, 12, 16, 16, 8/*x*/
-        }
-    }, { 44100, 49, 14,
-        {
-            4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  8,  8,  8,  8,  8,  8,  8,
-            12, 12, 12, 12, 16, 16, 20, 20, 24, 24, 28, 28, 32, 32, 32, 32, 32, 32,
-            32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32/*x*/
-        }, {
-            4,  4,  4,  4,  4,  8,  8,  8, 12, 12, 12, 16, 16, 8/*x*/
-        }
-    }, { 32000, 49/*x*/, 14,
-        {
-            4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  8,  8,  8,  8,
-            8,  8,  8,  12, 12, 12, 12, 16, 16, 20, 20, 24, 24, 28,
-            28, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-            32, 32, 32, 32, 32, 32, 32, 0/*x*/, 0/*x*/
-        },{
-            4,  4,  4,  4,  4,  8,  8,  8,  12, 12, 12, 16, 16, 16
-        }
-    }, { 24000, 46/*x*/, 15,
-        {
-            4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  8,  8,  8,  8,  8,  8,  8,
-            8,  8,  8,  12, 12, 12, 12, 16, 16, 16, 20, 20, 24, 24, 28, 28, 32,
-            36, 36, 40, 44, 48, 52, 52, 64, 64, 64, 64, 0/*x*/
-        }, {
-            4,  4,  4,  4,  4,  4,  4,  8,  8,  8, 12, 12, 16, 16, 12/*x*/
-        }
-    }, { 22050, 46/*x*/, 15,
-        {
-            4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  8,  8,  8,  8,  8,  8,  8,
-            8,  8,  8,  12, 12, 12, 12, 16, 16, 16, 20, 20, 24, 24, 28, 28, 32,
-            36, 36, 40, 44, 48, 52, 52, 64, 64, 64, 64, 0/*x*/
-        }, {
-            4,  4,  4,  4,  4,  4,  4,  8,  8,  8, 12, 12, 16, 16, 12/*x*/
-        }
-    }, { 16000, 42/*x*/, 15,
-        {
-            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 12, 12, 12,
-            12, 12, 12, 12, 12, 12, 16, 16, 16, 16, 20, 20, 20, 24,
-            24, 28, 28, 32, 36, 40, 40, 44, 48, 52, 56, 60, 64, 64, 0/*x*/
-        }, {
-            4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 12, 12, 16, 20, 12/*x*/
-        }
-    }, { 12000, 42/*x*/, 15,
-        {
-            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 12, 12, 12,
-            12, 12, 12, 12, 12, 12, 16, 16, 16, 16, 20, 20, 20, 24,
-            24, 28, 28, 32, 36, 40, 40, 44, 48, 52, 56, 60, 64, 64, 0/*x*/
-        }, {
-            4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 12, 12, 16, 20, 12/*x*/
-        }
-    }, { 11025, 42/*x*/, 15,
-        {
-            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 12, 12, 12,
-            12, 12, 12, 12, 12, 12, 16, 16, 16, 16, 20, 20, 20, 24,
-            24, 28, 28, 32, 36, 40, 40, 44, 48, 52, 56, 60, 64, 64, 0/*x*/
-        }, {
-            4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 12, 12, 16, 20, 12/*x*/
-        }
-    }, { 8000, 40, 15,
-        {
-            12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 16,
-            16, 16, 16, 16, 16, 16, 20, 20, 20, 20, 24, 24, 24, 28,
-            28, 32, 36, 36, 40, 44, 48, 52, 56, 60, 64, 16/*x*/
-        }, {
-            4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 12, 16, 20, 12/*x*/
-        }
-    },
-    { -1 }
-};
-#else
 /* Scalefactorband data table for 1024 transform length */
 static SR_INFO srInfo12+1 =
 {
@@ -879,4 +724,3 @@
     },
     { -1 }
 };
-#endif

_service:obs_scm:faac-1.31.obscpio/libfaac/frame.h -> _service:obs_scm:faac-1.40.obscpio/libfaac/frame.h Changed

_service:obs_scm:faac-1.31.obscpio/libfaac/huff2.c -> _service:obs_scm:faac-1.40.obscpio/libfaac/huff2.c Changed

@@ -24,10 +24,6 @@
 #include "huff2.h"
 #include "bitstream.h"
 
-#ifdef DRM
-static int vcb11;
-#endif
-
 static int escape(int x, int *code)
 {
     int preflen = 0;
@@ -58,14 +54,6 @@
     return (preflen << 1) + 5;
 }
 
-#ifdef DRM
-# define DRMDATA if(coder){coder->num_data_cwcoder->cur_cw++=1;\
-    coder->iLenReordSpData+=blen;if(coder->iLenLongestCW<blen)\
-    coder->iLenLongestCW=blen;}
-#else
-# define DRMDATA
-#endif
-
 #define arrlen(array) (sizeof(array) / sizeof(*array))
 
 static int huffcode(int *qs /* quantized spectrum */,
@@ -82,10 +70,6 @@
     int data;
     int idx;
     int datacnt;
-#ifdef DRM
-    int drmbits = 0;
-    int maxesc = 0;
-#endif
 
     if (coder)
         datacnt = coder->datacnt;
@@ -95,18 +79,6 @@
     book = hmapbnum;
     switch (bnum)
     {
-#ifdef DRM
-    case HCB_ZERO:
-    case HCB_INTENSITY:
-    case HCB_INTENSITY2:
-        for(ofs = 0; ofs < len; ofs += 4)
-        {
-            coder->sdatacnt.data = 0;
-            coder->sdatacnt++.len = 0;
-            coder->num_data_cwcoder->cur_cw++ = 1;
-        }
-        break;
-#endif
     case 1:
     case 2:
         for(ofs = 0; ofs < len; ofs += 4)
@@ -123,7 +95,6 @@
                 data = bookidx.data;
                 coder->sdatacnt.data = data;
                 coder->sdatacnt++.len = blen;
-                DRMDATA;
             }
             bits += blen;
         }
@@ -162,7 +133,6 @@
                 }
                 coder->sdatacnt.data = data;
                 coder->sdatacnt++.len = blen;
-                DRMDATA;
             }
             bits += blen;
         }
@@ -183,7 +153,6 @@
                 data = bookidx.data;
                 coder->sdatacnt.data = data;
                 coder->sdatacnt++.len = blen;
-                DRMDATA;
             }
             bits += blen;
         }
@@ -220,7 +189,6 @@
                 }
                 coder->sdatacnt.data = data;
                 coder->sdatacnt++.len = blen;
-                DRMDATA;
             }
             bits += blen;
         }
@@ -257,7 +225,6 @@
                 }
                 coder->sdatacnt.data = data;
                 coder->sdatacnt++.len = blen;
-                DRMDATA;
             }
             bits += blen;
         }
@@ -303,10 +270,6 @@
                 }
                 coder->sdatacnt.data = data;
                 coder->sdatacnt++.len = blen;
-#ifdef DRM
-                coder->num_data_cwcoder->cur_cw = 1;
-                drmbits = blen;
-#endif
             }
             bits += blen;
 
@@ -317,13 +280,6 @@
                 {
                     coder->sdatacnt.data = data;
                     coder->sdatacnt++.len = blen;
-#ifdef DRM
-                    coder->num_data_cwcoder->cur_cw++;
-                    drmbits += blen;
-
-                    if (maxesc < data)
-                        maxesc = data;
-#endif
                 }
                 bits += blen;
             }
@@ -335,61 +291,10 @@
                 {
                     coder->sdatacnt.data = data;
                     coder->sdatacnt++.len = blen;
-#ifdef DRM
-                    coder->num_data_cwcoder->cur_cw++;
-                    drmbits += blen;
-
-                    if (maxesc < data)
-                        maxesc = data;
-#endif
                 }
                 bits += blen;
             }
-#ifdef DRM
-            coder->iLenReordSpData += drmbits;
-            if (coder->iLenLongestCW < drmbits)
-                coder->iLenLongestCW = drmbits;
-
-            coder->cur_cw++;
-#endif
         }
-#ifdef DRM
-        /* VCB11: check which codebook should be used using max escape sequence */
-        /* 8.5.3.1.3, table 157 */
-        if (maxesc <= 15)
-            vcb11 = 16;
-        else if (maxesc <= 31)
-            vcb11 = 17;
-        else if (maxesc <= 47)
-            vcb11 = 18;
-        else if (maxesc <= 63)
-            vcb11 = 19;
-        else if (maxesc <= 95)
-            vcb11 = 20;
-        else if (maxesc <= 127)
-            vcb11 = 21;
-        else if (maxesc <= 159)
-            vcb11 = 22;
-        else if (maxesc <= 191)
-            vcb11 = 23;
-        else if (maxesc <= 223)
-            vcb11 = 24;
-        else if (maxesc <= 255)
-            vcb11 = 25;
-        else if (maxesc <= 319)
-            vcb11 = 26;
-        else if (maxesc <= 383)
-            vcb11 = 27;
-        else if (maxesc <= 511)
-            vcb11 = 28;
-        else if (maxesc <= 767)
-            vcb11 = 29;
-        else if (maxesc <= 1023)
-            vcb11 = 30;
-        else if (maxesc <= 2047)
-            vcb11 = 31;
-        /* else: codebook 11 -> it is already 11 */
-#endif
         break;
     default:
         fprintf(stderr, "%s(%d) book %d out of range\n", __FILE__, __LINE__, bnum);
@@ -450,15 +355,8 @@
         bookmin = HCB_ESC;
     }
 
-#ifdef DRM
-    vcb11 = 0;
-    huffcode(qs, len, bookmin, coder);
-    if (vcb11)
-        bookmin = vcb11;
-#else
     if (bookmin > HCB_ZERO)
         huffcode(qs, len, bookmin, coder);
-#endif
     coder->bookcoder->bandcnt = bookmin;
 
     return 0;
@@ -471,10 +369,6 @@
     int group;
     int bookbits = 4;
 
-#ifdef DRM
-    bookbits = 5; /* 5 bits in case of VCB11 */
-#endif
-
     if (coder->block_type == ONLY_SHORT_WINDOW){
         maxcnt = 7;
         cntbits = 3;
@@ -497,13 +391,6 @@
             }
             bits += bookbits;
 
-#ifdef DRM
-            /* sect_len is not transmitted in case the codebook for a */
-            /* section is 11 or in the range of 16 and 31 */
-            if ((book == 11) || ((book >= 16) && (book <= 32)))
-                continue;
-#endif
-
             if (band < maxband)
             {
                 while (book == coder->bookband)

_service:obs_scm:faac-1.40.obscpio/libfaac/libfaac.def Changed

_service:obs_scm:faac-1.40.obscpio/libfaac/meson.build Added

@@ -0,0 +1,69 @@
+link_args = 
+if host_machine.system() == 'windows' and meson.get_compiler('c').get_id() == 'gcc'
+    # identifies mingw
+    link_args += '-Wl,--add-stdcall-alias'
+endif
+
+
+quantize_simd_libs = 
+
+if config_h.get('HAVE_SSE2')
+    sse2_flag = (cc.get_argument_syntax() == 'msvc') ? '/arch:SSE2' : '-msse2'
+    quantize_sse = static_library('quantize_sse', 'quantize_sse.c',
+        include_directories: '..', '../include',
+        c_args: c_args + sse2_flag
+    )
+    quantize_simd_libs += quantize_sse
+endif
+
+common_src = 
+    'bitstream.c',
+    'bitstream.h',
+    'blockswitch.c',
+    'blockswitch.h',
+    'channels.c',
+    'channels.h',
+    'coder.h',
+    'cpu_compute.c',
+    'cpu_compute.h',
+    'filtbank.c',
+    'filtbank.h',
+    'fft.c',
+    'fft.h',
+    'frame.c',
+    'frame.h',
+    'huff2.c',
+    'huff2.h',
+    'huffdata.c',
+    'huffdata.h',
+    'quantize.c',
+    'quantize.h',
+    'stereo.c',
+    'stereo.h',
+    'tns.c',
+    'tns.h',
+    'util.c',
+    'util.h',
+
+
+libfaac = library('faac', common_src,
+    include_directories: '..', '../include',
+    c_args: c_args,
+    link_args: link_args,
+    dependencies:  libm ,
+    link_with: quantize_simd_libs,
+    vs_module_defs: 'libfaac.def',
+    install: true,
+    version: '0.0.0',
+    gnu_symbol_visibility: 'hidden'
+)
+
+
+pkgconfig = import('pkgconfig')
+pkgconfig.generate(
+    libfaac,
+    name: 'FAAC',
+    description: 'Freeware Advanced Audio Coder',
+    version: meson.project_version(),
+    filebase: 'faac'
+)

_service:obs_scm:faac-1.31.obscpio/libfaac/quantize.c -> _service:obs_scm:faac-1.40.obscpio/libfaac/quantize.c Changed

@@ -20,25 +20,11 @@
 
 #include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "quantize.h"
 #include "huff2.h"
-
-#ifdef HAVE_IMMINTRIN_H
-# include <immintrin.h>
-#endif
-
-#ifdef __SSE2__
-# ifdef __GNUC__
-#  include <cpuid.h>
-# endif
-#endif
-
-#ifdef _MSC_VER
-# include <immintrin.h>
-# include <intrin.h>
-# define __SSE2__
-# define bit_SSE2 (1 << 26)
-#endif
+#include "cpu_compute.h"
 
 #ifdef __GNUC__
 #define GCC_VERSION (__GNUC__ * 10000 \
@@ -46,73 +32,104 @@
                      + __GNUC_PATCHLEVEL__)
 #endif
 
-#define MAGIC_NUMBER  0.4054
+typedef void (*QuantizeFunc)(const faac_real * __restrict xr, int * __restrict xi, int n, faac_real sfacfix);
+
+#if defined(HAVE_SSE2)
+extern void quantize_sse2(const faac_real * __restrict xr, int * __restrict xi, int n, faac_real sfacfix);
+#endif
+
+static void quantize_scalar(const faac_real * __restrict xr, int * __restrict xi, int n, faac_real sfacfix)
+{
+    const faac_real magic = MAGIC_NUMBER;
+    int cnt;
+    for (cnt = 0; cnt < n; cnt++)
+    {
+        faac_real val = xrcnt;
+        faac_real tmp = FAAC_FABS(val);
+
+        tmp *= sfacfix;
+        tmp = FAAC_SQRT(tmp * FAAC_SQRT(tmp));
+
+        int q = (int)(tmp + magic);
+        xicnt = (val < 0) ? -q : q;
+    }
+}
+
+static QuantizeFunc qfunc = quantize_scalar;
+
+void QuantizeInit(void)
+{
+#if defined(HAVE_SSE2)
+    CPUCaps caps = get_cpu_caps();
+    if (caps & CPU_CAP_SSE2)
+        qfunc = quantize_sse2;
+    else
+#endif
+        qfunc = quantize_scalar;
+}
 #define NOISEFLOOR 0.4
 
 // band sound masking
-static void bmask(CoderInfo *coderInfo, double *xr0, double *bandqual,
-                  int gnum, double quality)
+static void bmask(CoderInfo * __restrict coderInfo, faac_real * __restrict xr0, faac_real * __restrict bandqual,
+                  faac_real * __restrict bandenrg, int gnum, faac_real quality)
 {
   int sfb, start, end, cnt;
   int *cb_offset = coderInfo->sfb_offset;
   int last;
-  double avgenrg;
-  double powm = 0.4;
-  double totenrg = 0.0;
+  faac_real avgenrg;
+  faac_real powm = 0.4;
+  faac_real totenrg = 0.0;
   int gsize = coderInfo->groups.lengnum;
-  double *xr;
+  const faac_real *xr;
   int win;
   int enrgcnt = 0;
+  int total_len = coderInfo->sfb_offsetcoderInfo->sfbn;
 
-
-  for (sfb = 0; sfb < coderInfo->sfbn; sfb++)
+  for (win = 0; win < gsize; win++)
   {
-      start = coderInfo->sfb_offsetsfb;
-      end = coderInfo->sfb_offsetsfb + 1;
-
-      xr = xr0;
-      for (win = 0; win < gsize; win++)
+      xr = xr0 + win * BLOCK_LEN_SHORT;
+      for (cnt = 0; cnt < total_len; cnt++)
       {
-          for (cnt = start; cnt < end; cnt++)
-          {
-              totenrg += xrcnt * xrcnt;
-              enrgcnt++;
-          }
-
-          xr += BLOCK_LEN_SHORT;
+          totenrg += xrcnt * xrcnt;
       }
   }
+  enrgcnt = gsize * total_len;
 
-  if (totenrg < ((NOISEFLOOR * NOISEFLOOR) * (double)enrgcnt))
+  if (totenrg < ((NOISEFLOOR * NOISEFLOOR) * (faac_real)enrgcnt))
   {
       for (sfb = 0; sfb < coderInfo->sfbn; sfb++)
+      {
           bandqualsfb = 0.0;
+          bandenrgsfb = 0.0;
+      }
 
       return;
   }
 
   for (sfb = 0; sfb < coderInfo->sfbn; sfb++)
   {
-    double avge, maxe;
-    double target;
+    faac_real avge, maxe;
+    faac_real target;
 
     start = cb_offsetsfb;
     end = cb_offsetsfb + 1;
 
     avge = 0.0;
     maxe = 0.0;
-    xr = xr0;
     for (win = 0; win < gsize; win++)
     {
-        for (cnt = start; cnt < end; cnt++)
+        xr = xr0 + win * BLOCK_LEN_SHORT + start;
+        int n = end - start;
+        for (cnt = 0; cnt < n; cnt++)
         {
-            double e = xrcnt*xrcnt;
+            faac_real val = xrcnt;
+            faac_real e = val * val;
             avge += e;
             if (maxe < e)
                 maxe = e;
         }
-        xr += BLOCK_LEN_SHORT;
     }
+    bandenrgsfb = avge;
     maxe *= gsize;
 
 #define NOISETONE 0.2
@@ -122,8 +139,8 @@
         avgenrg = totenrg / last;
         avgenrg *= end - start;
 
-        target = NOISETONE * pow(avge/avgenrg, powm);
-        target += (1.0 - NOISETONE) * 0.45 * pow(maxe/avgenrg, powm);
+        target = NOISETONE * FAAC_POW(avge/avgenrg, powm);
+        target += (1.0 - NOISETONE) * 0.45 * FAAC_POW(maxe/avgenrg, powm);
 
         target *= 1.5;
     }
@@ -133,11 +150,11 @@
         avgenrg = totenrg / last;
         avgenrg *= end - start;
 
-        target = NOISETONE * pow(avge/avgenrg, powm);
-        target += (1.0 - NOISETONE) * 0.45 * pow(maxe/avgenrg, powm);
+        target = NOISETONE * FAAC_POW(avge/avgenrg, powm);
+        target += (1.0 - NOISETONE) * 0.45 * FAAC_POW(maxe/avgenrg, powm);
     }
 
-    target *= 10.0 / (1.0 + ((double)(start+end)/last));
+    target *= 10.0 / (1.0 + ((faac_real)(start+end)/last));
 
     bandqualsfb = target * quality;
   }
@@ -145,47 +162,34 @@
 
 enum {MAXSHORTBAND = 36};
 // use band quality levels to quantize a group of windows
-static void qlevel(CoderInfo *coderInfo,
-                   const double *xr0,
-                   const double *bandqual,
+static void qlevel(CoderInfo * __restrict coderInfo,
+                   const faac_real * __restrict xr0,
+                   const faac_real * __restrict bandqual,
+                   const faac_real * __restrict bandenrg,
                    int gnum,
                    int pnslevel
                   )
 {
-    int sb, cnt;
+    int sb;
 #if !defined(__clang__) && defined(__GNUC__) && (GCC_VERSION >= 40600)
     /* 2^0.25 (1.50515 dB) step from AAC specs */
-    static const double sfstep = 1.0 / log10(sqrt(sqrt(2.0)));
+    static const faac_real sfstep = 1.0 / FAAC_LOG10(FAAC_SQRT(FAAC_SQRT(2.0)));
 #else
-    static const double sfstep = 20 / 1.50515;
+    static const faac_real sfstep = 20 / 1.50515;
 #endif
     int gsize = coderInfo->groups.lengnum;
-    double pnsthr = 0.1 * pnslevel;
-#ifdef __SSE2__
-    int cpuid4;
-    int sse2 = 0;
-
-    cpuid3 = 0;
-# ifdef __GNUC__
-    __cpuid(1, cpuid0, cpuid1, cpuid2, cpuid3);
-# endif
-# ifdef _MSC_VER
-    __cpuid(cpuid, 1);
-# endif
-    if (cpuid3 & bit_SSE2)
-        sse2 = 1;
-#endif
+    faac_real pnsthr = 0.1 * pnslevel;
 
     for (sb = 0; sb < coderInfo->sfbn; sb++)
     {
-      double sfacfix;
+      faac_real sfacfix;
       int sfac;
-      double rmsx;
-      double etot;
+      faac_real rmsx;
+      faac_real etot;
       int xitab8 * MAXSHORTBAND;
       int *xi;
       int start, end;
-      const double *xr;
+      const faac_real *xr;
       int win;
 
       if (coderInfo->bookcoderInfo->bandcnt != HCB_NONE)
@@ -197,19 +201,8 @@
       start = coderInfo->sfb_offsetsb;
       end = coderInfo->sfb_offsetsb+1;
 
-      etot = 0.0;
-      xr = xr0;
-      for (win = 0; win < gsize; win++)
-      {
-          for (cnt = start; cnt < end; cnt++)
-          {
-              double e = xrcnt * xrcnt;
-              etot += e;
-          }
-          xr += BLOCK_LEN_SHORT;
-      }
-      etot /= (double)gsize;
-      rmsx = sqrt(etot / (end - start));
+      etot = bandenrgsb / (faac_real)gsize;
+      rmsx = FAAC_SQRT(etot / (end - start));
 
       if ((rmsx < NOISEFLOOR) || (!bandqualsb))
       {
@@ -217,88 +210,52 @@
           continue;
       }
 
-#ifndef DRM
       if (bandqualsb < pnsthr)
       {
           coderInfo->bookcoderInfo->bandcnt = HCB_PNS;
           coderInfo->sfcoderInfo->bandcnt +=
-              lrint(log10(etot) * (0.5 * sfstep));
+              FAAC_LRINT(FAAC_LOG10(etot) * (0.5 * sfstep));
           coderInfo->bandcnt++;
           continue;
       }
-#endif
 
-      sfac = lrint(log10(bandqualsb / rmsx) * sfstep);
+      sfac = FAAC_LRINT(FAAC_LOG10(bandqualsb / rmsx) * sfstep);
       if ((SF_OFFSET - sfac) < 10)
           sfacfix = 0.0;
       else
-          sfacfix = pow(10, sfac / sfstep);
+          sfacfix = FAAC_POW(10, sfac / sfstep);
 
-      xr = xr0 + start;
       end -= start;
       xi = xitab;
-      for (win = 0; win < gsize; win++)
+      if (sfacfix <= 0.0)
       {
-#ifdef __SSE2__
-          if (sse2)
-          {
-              for (cnt = 0; cnt < end; cnt += 4)
-              {
-                  __m128 x = {xrcnt, xrcnt + 1, xrcnt + 2, xrcnt + 3};
-
-                  x = _mm_max_ps(x, _mm_sub_ps((__m128){0, 0, 0, 0}, x));
-                  x = _mm_mul_ps(x, (__m128){sfacfix, sfacfix, sfacfix, sfacfix});
-                  x = _mm_mul_ps(x, _mm_sqrt_ps(x));
-                  x = _mm_sqrt_ps(x);
-                  x = _mm_add_ps(x, (__m128){MAGIC_NUMBER, MAGIC_NUMBER, MAGIC_NUMBER, MAGIC_NUMBER});
-
-                  *(__m128i*)(xi + cnt) = _mm_cvttps_epi32(x);
-              }
-              for (cnt = 0; cnt < end; cnt++)
-              {
-                  if (xrcnt < 0)
-                      xicnt = -xicnt;
-              }
-              xi += cnt;
-              xr += BLOCK_LEN_SHORT;
-              continue;
-          }
-#endif
-
-          for (cnt = 0; cnt < end; cnt++)
+          memset(xi, 0, gsize * end * sizeof(int));
+      }
+      else
+      {
+          for (win = 0; win < gsize; win++)
           {
-              double tmp = fabs(xrcnt);
-
-              tmp *= sfacfix;
-              tmp = sqrt(tmp * sqrt(tmp));
-
-              xicnt = (int)(tmp + MAGIC_NUMBER);
-              if (xrcnt < 0)
-                  xicnt = -xicnt;
+              xr = xr0 + win * BLOCK_LEN_SHORT + start;
+              qfunc(xr, xi, end, sfacfix);
+              xi += end;
           }
-          xi += cnt;
-          xr += BLOCK_LEN_SHORT;
       }
       huffbook(coderInfo, xitab, gsize * end);
       coderInfo->sfcoderInfo->bandcnt++ += SF_OFFSET - sfac;
     }
 }
 
-int BlocQuant(CoderInfo *coder, double *xr, AACQuantCfg *aacquantCfg)
+int BlocQuant(CoderInfo * __restrict coder, faac_real * __restrict xr, AACQuantCfg *aacquantCfg)
 {
-    double bandlvlMAX_SCFAC_BANDS;
+    faac_real bandlvlMAX_SCFAC_BANDS;
+    faac_real bandenrgMAX_SCFAC_BANDS;
     int cnt;
-    double *gxr;
+    faac_real *gxr;
 
     coder->global_gain = 0;
 
     coder->bandcnt = 0;
     coder->datacnt = 0;
-#ifdef DRM
-    coder->iLenReordSpData = 0; /* init length of reordered spectral data */
-    coder->iLenLongestCW = 0; /* init length of longest codeword */
-    coder->cur_cw = 0; /* init codeword counter */
-#endif
 
     {
         int lastis;
@@ -307,9 +264,9 @@
         gxr = xr;
         for (cnt = 0; cnt < coder->groups.n; cnt++)
         {
-            bmask(coder, gxr, bandlvl, cnt,
-                  (double)aacquantCfg->quality/DEFQUAL);
-            qlevel(coder, gxr, bandlvl, cnt, aacquantCfg->pnslevel);
+            bmask(coder, gxr, bandlvl, bandenrg, cnt,
+                  (faac_real)aacquantCfg->quality/DEFQUAL);
+            qlevel(coder, gxr, bandlvl, bandenrg, cnt, aacquantCfg->pnslevel);
             gxr += coder->groups.lencnt * BLOCK_LEN_SHORT;
         }
 
@@ -378,7 +335,7 @@
     }
     aacquantCfg->max_cbs = cnt;
     if (aacquantCfg->pnslevel)
-        *bw = (double)l * rate / (BLOCK_LEN_SHORT << 1);
+        *bw = (faac_real)l * rate / (BLOCK_LEN_SHORT << 1);
 
     // find max long frame band
     max = *bw * (BLOCK_LEN_LONG << 1) / rate;
@@ -392,12 +349,12 @@
     aacquantCfg->max_cbl = cnt;
     aacquantCfg->max_l = l;
 
-    *bw = (double)l * rate / (BLOCK_LEN_LONG << 1);
+    *bw = (faac_real)l * rate / (BLOCK_LEN_LONG << 1);
 }
 
 enum {MINSFB = 2};
 
-static void calce(double *xr, int *bands, double eNSFB_SHORT, int maxsfb,
+static void calce(faac_real * __restrict xr, const int * __restrict bands, faac_real eNSFB_SHORT, int maxsfb,
                   int maxl)
 {
     int sfb;
@@ -415,8 +372,8 @@
     }
 }
 
-static void resete(double minNSFB_SHORT, double maxNSFB_SHORT,
-                   double eNSFB_SHORT, int maxsfb)
+static void resete(faac_real minNSFB_SHORT, faac_real maxNSFB_SHORT,
+                   faac_real eNSFB_SHORT, int maxsfb)
 {
     int sfb;
     for (sfb = MINSFB; sfb < maxsfb; sfb++)
@@ -428,13 +385,13 @@
 static int groups = 0;
 static int frames = 0;
 #endif
-void BlocGroup(double *xr, CoderInfo *coderInfo, AACQuantCfg *cfg)
+void BlocGroup(faac_real *xr, CoderInfo *coderInfo, AACQuantCfg *cfg)
 {
     int win, sfb;
-    double eNSFB_SHORT;
-    double minNSFB_SHORT;
-    double maxNSFB_SHORT;
-    const double thr = 3.0;
+    faac_real eNSFB_SHORT;
+    faac_real minNSFB_SHORT;
+    faac_real maxNSFB_SHORT;
+    const faac_real thr = 3.0;
     int win0;
     int fastmin;
     int maxsfb, maxl;
@@ -450,12 +407,6 @@
     maxsfb = cfg->max_cbs;
     fastmin = ((maxsfb - MINSFB) * 3) >> 2;
 
-#ifdef DRM
-    coderInfo->groups.n = 1;
-    coderInfo->groups.len0 = 8;
-    return;
-#endif
-
 #if PRINTSTAT
     frames++;
 #endif
@@ -494,6 +445,6 @@
 void BlocStat(void)
 {
 #if PRINTSTAT
-    printf("frames:%d; groups:%d; g/f:%f\n", frames, groups, (double)groups/frames);
+    printf("frames:%d; groups:%d; g/f:%f\n", frames, groups, (faac_real)groups/frames);
 #endif
 }

_service:obs_scm:faac-1.31.obscpio/libfaac/quantize.h -> _service:obs_scm:faac-1.40.obscpio/libfaac/quantize.h Changed

_service:obs_scm:faac-1.40.obscpio/libfaac/quantize_sse.c Added

@@ -0,0 +1,79 @@
+/*
+ * FAAC - Freeware Advanced Audio Coder
+ * Copyright (C) 2026 Nils Schimmelmann
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <immintrin.h>
+#include "faac_real.h"
+#include "quantize.h"
+
+void quantize_sse2(const faac_real * __restrict xr, int * __restrict xi, int n, faac_real sfacfix)
+{
+    const __m128 zero = _mm_setzero_ps();
+    const __m128 sfac = _mm_set1_ps(sfacfix);
+    const __m128 magic = _mm_set1_ps(MAGIC_NUMBER);
+    // Mask to strip the sign bit (0x7FFFFFFF)
+    const __m128 abs_mask = _mm_castsi128_ps(_mm_set1_epi32(0x7FFFFFFF));
+    int cnt = 0;
+
+    // Process 4 elements per iteration
+    for (; cnt <= n - 4; cnt += 4)
+    {
+#ifdef FAAC_PRECISION_SINGLE
+        __m128 x_orig = _mm_loadu_ps((const float*)&xrcnt);
+#else
+        // Convert 4 doubles to 4 floats via two 128-bit loads
+        __m128 low  = _mm_cvtpd_ps(_mm_loadu_pd(&xrcnt));
+        __m128 high = _mm_cvtpd_ps(_mm_loadu_pd(&xrcnt + 2));
+        __m128 x_orig = _mm_movelh_ps(low, high);
+#endif
+        // Capture sign and Absolute value
+        __m128 sign_mask = _mm_cmplt_ps(x_orig, zero);
+        __m128 x = _mm_and_ps(x_orig, abs_mask);
+
+        // Math: (x * sfac)^0.75 + magic
+        // Logic: sqrt( (x*sfac) * sqrt(x*sfac) )
+        x = _mm_mul_ps(x, sfac);
+        x = _mm_mul_ps(x, _mm_sqrt_ps(x));
+        x = _mm_sqrt_ps(x);
+        x = _mm_add_ps(x, magic);
+
+        // Convert to integer
+        __m128i xi_vec = _mm_cvttps_epi32(x);
+
+        // Bitwise Sign Fix: (val ^ mask) - mask
+        __m128i m_int = _mm_castps_si128(sign_mask);
+        xi_vec = _mm_sub_epi32(_mm_xor_si128(xi_vec, m_int), m_int);
+
+        _mm_storeu_si128((__m128i*)&xicnt, xi_vec);
+    }
+
+    // Safe scalar remainder loop for widths not multiple of 4
+    for (; cnt < n; cnt++)
+    {
+	faac_real val = xrcnt;
+        faac_real tmp = FAAC_FABS(val);
+        tmp *= sfacfix;
+        tmp = FAAC_SQRT(tmp * FAAC_SQRT(tmp));
+        int q = (int)(tmp + (faac_real)MAGIC_NUMBER);
+        xicnt = (val < 0) ? -q : q;
+    }
+}

_service:obs_scm:faac-1.31.obscpio/libfaac/stereo.c -> _service:obs_scm:faac-1.40.obscpio/libfaac/stereo.c Changed

@@ -25,8 +25,8 @@
 
 
 static void stereo(CoderInfo *cl, CoderInfo *cr,
-                   double *sl0, double *sr0, int *sfcnt,
-                   int wstart, int wend, double phthr
+                   faac_real *sl0, faac_real *sr0, int *sfcnt,
+                   int wstart, int wend, faac_real phthr
                   )
 {
     int sfb;
@@ -48,12 +48,12 @@
     for (sfb = sfmin; sfb < cl->sfbn; sfb++)
     {
         int l, start, end;
-        double sum, diff;
-        double enrgs, enrgd, enrgl, enrgr;
+        faac_real sum, diff;
+        faac_real enrgs, enrgd, enrgl, enrgr;
         int hcb = HCB_NONE;
-        const double step = 10/1.50515;
-        double ethr;
-        double vfix, efix;
+        const faac_real step = 10/1.50515;
+        faac_real ethr;
+        faac_real vfix, efix;
 
         start = cl->sfb_offsetsfb;
         end = cl->sfb_offsetsfb + 1;
@@ -61,13 +61,13 @@
         enrgs = enrgd = enrgl = enrgr = 0.0;
         for (win = wstart; win < wend; win++)
         {
-            double *sl = sl0 + win * BLOCK_LEN_SHORT;
-            double *sr = sr0 + win * BLOCK_LEN_SHORT;
+            faac_real *sl = sl0 + win * BLOCK_LEN_SHORT;
+            faac_real *sr = sr0 + win * BLOCK_LEN_SHORT;
 
             for (l = start; l < end; l++)
             {
-                double lx = sll;
-                double rx = srl;
+                faac_real lx = sll;
+                faac_real rx = srl;
 
                 sum = lx + rx;
                 diff = lx - rx;
@@ -79,25 +79,25 @@
             }
         }
 
-        ethr = sqrt(enrgl) + sqrt(enrgr);
+        ethr = FAAC_SQRT(enrgl) + FAAC_SQRT(enrgr);
         ethr *= ethr;
         ethr *= phthr;
         efix = enrgl + enrgr;
         if (enrgs >= ethr)
         {
             hcb = HCB_INTENSITY;
-            vfix = sqrt(efix / enrgs);
+            vfix = FAAC_SQRT(efix / enrgs);
         }
         else if (enrgd >= ethr)
         {
             hcb = HCB_INTENSITY2;
-            vfix = sqrt(efix / enrgd);
+            vfix = FAAC_SQRT(efix / enrgd);
         }
 
         if (hcb != HCB_NONE)
         {
-            int sf = lrint(log10(enrgl / efix) * step);
-            int pan = lrint(log10(enrgr/efix) * step) - sf;
+            int sf = FAAC_LRINT(FAAC_LOG10(enrgl / efix) * step);
+            int pan = FAAC_LRINT(FAAC_LOG10(enrgr/efix) * step) - sf;
 
             if (pan > 30)
             {
@@ -117,8 +117,8 @@
 
             for (win = wstart; win < wend; win++)
             {
-                double *sl = sl0 + win * BLOCK_LEN_SHORT;
-                double *sr = sr0 + win * BLOCK_LEN_SHORT;
+                faac_real *sl = sl0 + win * BLOCK_LEN_SHORT;
+                faac_real *sr = sr0 + win * BLOCK_LEN_SHORT;
                 for (l = start; l < end; l++)
                 {
                     if (hcb == HCB_INTENSITY)
@@ -135,9 +135,9 @@
 }
 
 static void midside(CoderInfo *coder, ChannelInfo *channel,
-                    double *sl0, double *sr0, int *sfcnt,
+                    faac_real *sl0, faac_real *sr0, int *sfcnt,
                     int wstart, int wend,
-                    double thrmid, double thrside
+                    faac_real thrmid, faac_real thrside
                    )
 {
     int sfb;
@@ -158,8 +158,8 @@
     {
         int ms = 0;
         int l, start, end;
-        double sum, diff;
-        double enrgs, enrgd, enrgl, enrgr;
+        faac_real sum, diff;
+        faac_real enrgs, enrgd, enrgl, enrgr;
 
         start = coder->sfb_offsetsfb;
         end = coder->sfb_offsetsfb + 1;
@@ -167,13 +167,13 @@
         enrgs = enrgd = enrgl = enrgr = 0.0;
         for (win = wstart; win < wend; win++)
         {
-            double *sl = sl0 + win * BLOCK_LEN_SHORT;
-            double *sr = sr0 + win * BLOCK_LEN_SHORT;
+            faac_real *sl = sl0 + win * BLOCK_LEN_SHORT;
+            faac_real *sr = sr0 + win * BLOCK_LEN_SHORT;
 
             for (l = start; l < end; l++)
             {
-                double lx = sll;
-                double rx = srl;
+                faac_real lx = sll;
+                faac_real rx = srl;
 
                 sum = 0.5 * (lx + rx);
                 diff = 0.5 * (lx - rx);
@@ -205,8 +205,8 @@
             {
                 for (win = wstart; win < wend; win++)
                 {
-                    double *sl = sl0 + win * BLOCK_LEN_SHORT;
-                    double *sr = sr0 + win * BLOCK_LEN_SHORT;
+                    faac_real *sl = sl0 + win * BLOCK_LEN_SHORT;
+                    faac_real *sr = sr0 + win * BLOCK_LEN_SHORT;
                     for (l = start; l < end; l++)
                     {
                         if (phase == PH_IN)
@@ -231,8 +231,8 @@
         {
             for (win = wstart; win < wend; win++)
             {
-                double *sl = sl0 + win * BLOCK_LEN_SHORT;
-                double *sr = sr0 + win * BLOCK_LEN_SHORT;
+                faac_real *sl = sl0 + win * BLOCK_LEN_SHORT;
+                faac_real *sr = sr0 + win * BLOCK_LEN_SHORT;
                 for (l = start; l < end; l++)
                 {
                     if (enrgl < enrgr)
@@ -251,20 +251,20 @@
 
 void AACstereo(CoderInfo *coder,
                ChannelInfo *channel,
-               double *sMAX_CHANNELS,
+               faac_real *sMAX_CHANNELS,
                int maxchan,
-               double quality,
+               faac_real quality,
                int mode
               )
 {
     int chn;
-    static const double thr075 = 1.09 /* ~0.75dB */ - 1.0;
-    static const double thrmax = 1.25 /* ~2dB */ - 1.0;
-    static const double sidemin = 0.1; /* -20dB */
-    static const double sidemax = 0.3; /* ~-10.5dB */
-    static const double isthrmax = M_SQRT2 - 1.0;
-    double thrmid, thrside;
-    double isthr;
+    static const faac_real thr075 = 1.09 /* ~0.75dB */ - 1.0;
+    static const faac_real thrmax = 1.25 /* ~2dB */ - 1.0;
+    static const faac_real sidemin = 0.1; /* -20dB */
+    static const faac_real sidemax = 0.3; /* ~-10.5dB */
+    static const faac_real isthrmax = M_SQRT2 - 1.0;
+    faac_real thrmid, thrside;
+    faac_real isthr;
 
     thrmid = 1.0;
     thrside = 0.0;

_service:obs_scm:faac-1.31.obscpio/libfaac/stereo.h -> _service:obs_scm:faac-1.40.obscpio/libfaac/stereo.h Changed

_service:obs_scm:faac-1.31.obscpio/libfaac/tns.c -> _service:obs_scm:faac-1.40.obscpio/libfaac/tns.c Changed

@@ -62,20 +62,19 @@
 /*************************/
 static void Autocorrelation(int maxOrder,        /* Maximum autocorr order */
                      int dataSize,        /* Size of the data array */
-                     double* data,        /* Data array */
-                     double* rArray);     /* Autocorrelation array */
+                     faac_real* data,        /* Data array */
+                     faac_real* rArray);     /* Autocorrelation array */
 
-static double LevinsonDurbin(int maxOrder,        /* Maximum filter order */
+static faac_real LevinsonDurbin(int maxOrder,        /* Maximum filter order */
                       int dataSize,        /* Size of the data array */
-                      double* data,        /* Data array */
-                      double* kArray);     /* Reflection coeff array */
+                      faac_real* data,        /* Data array */
+                      faac_real* kArray);     /* Reflection coeff array */
 
-static void StepUp(int fOrder, double* kArray, double* aArray);
+static void StepUp(int fOrder, faac_real* kArray, faac_real* aArray);
 
-static void QuantizeReflectionCoeffs(int fOrder,int coeffRes,double* rArray,int* indexArray);
-static int TruncateCoeffs(int fOrder,double threshold,double* kArray);
-static void TnsFilter(int length,double* spec,TnsFilterData* filter);
-static void TnsInvFilter(int length,double* spec,TnsFilterData* filter);
+static void QuantizeReflectionCoeffs(int fOrder,int coeffRes,faac_real* rArray,int* indexArray);
+static int TruncateCoeffs(int fOrder,faac_real threshold,faac_real* kArray);
+static void TnsInvFilter(int length,faac_real* spec,TnsFilterData* filter, faac_real *temp);
 
 
 /*****************************************************/
@@ -133,14 +132,15 @@
                int maxSfb,              /* max_sfb */
                enum WINDOW_TYPE blockType,   /* block type */
                int* sfbOffsetTable,     /* Scalefactor band offset table */
-               double* spec)            /* Spectral data array */
+               faac_real* spec,            /* Spectral data array */
+               faac_real* temp)
 {
     int numberOfWindows,windowSize;
     int startBand,stopBand,order;    /* Bands over which to apply TNS */
     int lengthInBands;               /* Length to filter, in bands */
     int w;
     int startIndex,length;
-    double gain;
+    faac_real gain;
 
     switch( blockType ) {
     case ONLY_SHORT_WINDOW :
@@ -185,8 +185,8 @@
 
         TnsWindowData* windowData = &tnsInfo->windowDataw;
         TnsFilterData* tnsFilter = windowData->tnsFilter;
-        double* k = tnsFilter->kCoeffs;    /* reflection coeffs */
-        double* a = tnsFilter->aCoeffs;    /* prediction coeffs */
+        faac_real* k = tnsFilter->kCoeffs;    /* reflection coeffs */
+        faac_real* a = tnsFilter->aCoeffs;    /* prediction coeffs */
 
         windowData->numFilters=0;
         windowData->coefResolution = DEF_TNS_COEFF_RES;
@@ -205,7 +205,7 @@
             truncatedOrder = TruncateCoeffs(order,DEF_TNS_COEFF_THRESH,k);
             tnsFilter->order = truncatedOrder;
             StepUp(truncatedOrder,k,a);    /* Compute predictor coefficients */
-            TnsInvFilter(length,&specstartIndex,tnsFilter);      /* Filter */
+            TnsInvFilter(length,&specstartIndex,tnsFilter,temp);      /* Filter */
         }
     }
 }
@@ -221,7 +221,8 @@
                          int maxSfb,                 /* max_sfb */
                          enum WINDOW_TYPE blockType, /* block type */
                          int* sfbOffsetTable,        /* Scalefactor band offset table */
-                         double* spec)               /* Spectral data array */
+                         faac_real* spec,               /* Spectral data array */
+                         faac_real* temp)
 {
     int numberOfWindows,windowSize;
     int startBand,stopBand;    /* Bands over which to apply TNS */
@@ -266,122 +267,12 @@
         length = sfbOffsetTablestopBand - sfbOffsetTablestartBand;
 
         if (tnsInfo->tnsDataPresent  &&  windowData->numFilters) {  /* Use TNS */
-            TnsInvFilter(length,&specstartIndex,tnsFilter);
+            TnsInvFilter(length,&specstartIndex,tnsFilter,temp);
         }
     }
 }
 
 
-/*****************************************************/
-/* TnsDecodeFilterOnly:                              */
-/* This is a stripped-down version of TnsEncode()    */
-/* which performs TNS synthesis filtering only       */
-/*****************************************************/
-void TnsDecodeFilterOnly(TnsInfo* tnsInfo,           /* TNS info */
-                         int numberOfBands,          /* Number of bands per window */
-                         int maxSfb,                 /* max_sfb */
-                         enum WINDOW_TYPE blockType, /* block type */
-                         int* sfbOffsetTable,        /* Scalefactor band offset table */
-                         double* spec)               /* Spectral data array */
-{
-    int numberOfWindows,windowSize;
-    int startBand,stopBand;    /* Bands over which to apply TNS */
-    int w;
-    int startIndex,length;
-
-    switch( blockType ) {
-    case ONLY_SHORT_WINDOW :
-        numberOfWindows = MAX_SHORT_WINDOWS;
-        windowSize = BLOCK_LEN_SHORT;
-        startBand = tnsInfo->tnsMinBandNumberShort;
-        stopBand = numberOfBands;
-        startBand = min(startBand,tnsInfo->tnsMaxBandsShort);
-        stopBand = min(stopBand,tnsInfo->tnsMaxBandsShort);
-        break;
-
-    default:
-        numberOfWindows = 1;
-        windowSize = BLOCK_LEN_LONG;
-        startBand = tnsInfo->tnsMinBandNumberLong;
-        stopBand = numberOfBands;
-        startBand = min(startBand,tnsInfo->tnsMaxBandsLong);
-        stopBand = min(stopBand,tnsInfo->tnsMaxBandsLong);
-        break;
-    }
-
-    /* Make sure that start and stop bands < maxSfb */
-    /* Make sure that start and stop bands >= 0 */
-    startBand = min(startBand,maxSfb);
-    stopBand = min(stopBand,maxSfb);
-    startBand = max(startBand,0);
-    stopBand = max(stopBand,0);
-
-
-    /* Perform filtering for each window */
-    for(w=0;w<numberOfWindows;w++)
-    {
-        TnsWindowData* windowData = &tnsInfo->windowDataw;
-        TnsFilterData* tnsFilter = windowData->tnsFilter;
-
-        startIndex = w * windowSize + sfbOffsetTablestartBand;
-        length = sfbOffsetTablestopBand - sfbOffsetTablestartBand;
-
-        if (tnsInfo->tnsDataPresent  &&  windowData->numFilters) {  /* Use TNS */
-            TnsFilter(length,&specstartIndex,tnsFilter);
-        }
-    }
-}
-
-
-/*****************************************************/
-/* TnsFilter:                                        */
-/*   Filter the given spec with specified length     */
-/*   using the coefficients specified in filter.     */
-/*   Not that the order and direction are specified  */
-/*   withing the TNS_FILTER_DATA structure.          */
-/*****************************************************/
-static void TnsFilter(int length,double* spec,TnsFilterData* filter)
-{
-    int i,j,k=0;
-    int order=filter->order;
-    double* a=filter->aCoeffs;
-
-    /* Determine loop parameters for given direction */
-    if (filter->direction) {
-
-        /* Startup, initial state is zero */
-        for (i=length-2;i>(length-1-order);i--) {
-            k++;
-            for (j=1;j<=k;j++) {
-                speci-=speci+j*aj;
-            }
-        }
-
-        /* Now filter completely inplace */
-        for (i=length-1-order;i>=0;i--) {
-            for (j=1;j<=order;j++) {
-                speci-=speci+j*aj;
-            }
-        }
-
-
-    } else {
-
-        /* Startup, initial state is zero */
-        for (i=1;i<order;i++) {
-            for (j=1;j<=i;j++) {
-                speci-=speci-j*aj;
-            }
-        }
-
-        /* Now filter completely inplace */
-        for (i=order;i<length;i++) {
-            for (j=1;j<=order;j++) {
-                speci-=speci-j*aj;
-            }
-        }
-    }
-}
 
 
 /********************************************************/
@@ -391,14 +282,11 @@
 /*   Not that the order and direction are specified     */
 /*   withing the TNS_FILTER_DATA structure.             */
 /********************************************************/
-static void TnsInvFilter(int length,double* spec,TnsFilterData* filter)
+static void TnsInvFilter(int length,faac_real* spec,TnsFilterData* filter, faac_real *temp)
 {
     int i,j,k=0;
     int order=filter->order;
-    double* a=filter->aCoeffs;
-    double* temp;
-
-    temp = (double *)AllocMemory(length * sizeof (double));
+    faac_real* a=filter->aCoeffs;
 
     /* Determine loop parameters for given direction */
     if (filter->direction) {
@@ -441,7 +329,6 @@
             }
         }
     }
-    if (temp) FreeMemory(temp);
 }
 
 
@@ -455,12 +342,12 @@
 /*   less than the specified threshold.  Return the  */
 /*   truncated filter order.                         */
 /*****************************************************/
-static int TruncateCoeffs(int fOrder,double threshold,double* kArray)
+static int TruncateCoeffs(int fOrder,faac_real threshold,faac_real* kArray)
 {
     int i;
 
     for (i = fOrder; i >= 0; i--) {
-        kArrayi = (fabs(kArrayi)>threshold) ? kArrayi : 0.0;
+        kArrayi = (FAAC_FABS(kArrayi)>threshold) ? kArrayi : 0.0;
         if (kArrayi!=0.0) return i;
     }
 
@@ -474,10 +361,10 @@
 /*****************************************************/
 static void QuantizeReflectionCoeffs(int fOrder,
                               int coeffRes,
-                              double* kArray,
+                              faac_real* kArray,
                               int* indexArray)
 {
-    double iqfac,iqfac_m;
+    faac_real iqfac,iqfac_m;
     int i;
 
     iqfac = ((1<<(coeffRes-1))-0.5)/(M_PI/2);
@@ -485,8 +372,8 @@
 
     /* Quantize and inverse quantize */
     for (i=1;i<=fOrder;i++) {
-        indexArrayi = (kArrayi>=0)?(int)(0.5+(asin(kArrayi)*iqfac)):(int)(-0.5+(asin(kArrayi)*iqfac_m));
-        kArrayi = sin((double)indexArrayi/((indexArrayi>=0)?iqfac:iqfac_m));
+        indexArrayi = (kArrayi>=0)?(int)(0.5+(FAAC_ASIN(kArrayi)*iqfac)):(int)(-0.5+(FAAC_ASIN(kArrayi)*iqfac_m));
+        kArrayi = FAAC_SIN((faac_real)indexArrayi/((indexArrayi>=0)?iqfac:iqfac_m));
     }
 }
 
@@ -497,8 +384,8 @@
 /*****************************************************/
 static void Autocorrelation(int maxOrder,        /* Maximum autocorr order */
                      int dataSize,        /* Size of the data array */
-                     double* data,        /* Data array */
-                     double* rArray)      /* Autocorrelation array */
+                     faac_real* data,        /* Data array */
+                     faac_real* rArray)      /* Autocorrelation array */
 {
     int order,index;
 
@@ -519,20 +406,20 @@
 /*   given data using LevinsonDurbin recursion.      */
 /*   Return the prediction gain.                     */
 /*****************************************************/
-static double LevinsonDurbin(int fOrder,          /* Filter order */
+static faac_real LevinsonDurbin(int fOrder,          /* Filter order */
                       int dataSize,        /* Size of the data array */
-                      double* data,        /* Data array */
-                      double* kArray)      /* Reflection coeff array */
+                      faac_real* data,        /* Data array */
+                      faac_real* kArray)      /* Reflection coeff array */
 {
     int order,i;
-    double signal;
-    double error, kTemp;                /* Prediction error */
-    double aArray1TNS_MAX_ORDER+1;    /* Predictor coeff array */
-    double aArray2TNS_MAX_ORDER+1;    /* Predictor coeff array 2 */
-    double rArrayTNS_MAX_ORDER+1 = {0}; /* Autocorrelation coeffs */
-    double* aPtr = aArray1;             /* Ptr to aArray1 */
-    double* aLastPtr = aArray2;         /* Ptr to aArray2 */
-    double* aTemp;
+    faac_real signal;
+    faac_real error, kTemp;                /* Prediction error */
+    faac_real aArray1TNS_MAX_ORDER+1;    /* Predictor coeff array */
+    faac_real aArray2TNS_MAX_ORDER+1;    /* Predictor coeff array 2 */
+    faac_real rArrayTNS_MAX_ORDER+1 = {0}; /* Autocorrelation coeffs */
+    faac_real* aPtr = aArray1;             /* Ptr to aArray1 */
+    faac_real* aLastPtr = aArray2;         /* Ptr to aArray2 */
+    faac_real* aTemp;
 
     /* Compute autocorrelation coefficients */
     Autocorrelation(fOrder,dataSize,data,rArray);
@@ -587,9 +474,9 @@
 /*   Convert reflection coefficients into            */
 /*   predictor coefficients.                         */
 /*****************************************************/
-static void StepUp(int fOrder,double* kArray,double* aArray)
+static void StepUp(int fOrder,faac_real* kArray,faac_real* aArray)
 {
-    double aTempTNS_MAX_ORDER+2;
+    faac_real aTempTNS_MAX_ORDER+2;
     int i,order;
 
     aArray0=1.0;

_service:obs_scm:faac-1.31.obscpio/libfaac/tns.h -> _service:obs_scm:faac-1.40.obscpio/libfaac/tns.h Changed

_service:obs_scm:faac-1.31.obscpio/libfaac/util.c -> _service:obs_scm:faac-1.40.obscpio/libfaac/util.c Changed

@@ -45,7 +45,7 @@
 unsigned int MaxBitrate(unsigned long sampleRate)
 {
     /* max ADTS frame size 8k */
-    return 0x2000 * 8 * (double)sampleRate/(double)FRAME_LEN;
+    return 0x2000 * 8 * (faac_real)sampleRate/(faac_real)FRAME_LEN;
 }
 
 /* Returns the minimum bitrate per channel for that sampling frequency */
@@ -55,11 +55,11 @@
 }
 
 /* Calculate bit_allocation based on PE */
-unsigned int BitAllocation(double pe, int short_block)
+unsigned int BitAllocation(faac_real pe, int short_block)
 {
-    double pew1;
-    double pew2;
-    double bit_allocation;
+    faac_real pew1;
+    faac_real pew2;
+    faac_real bit_allocation;
 
     if (short_block) {
         pew1 = 0.6;
@@ -68,7 +68,7 @@
         pew1 = 0.3;
         pew2 = 6.0;
     }
-    bit_allocation = pew1 * pe + pew2 * sqrt(pe);
+    bit_allocation = pew1 * pe + pew2 * FAAC_SQRT(pe);
     bit_allocation = min(max(0.0, bit_allocation), 6144.0);
 
     return (unsigned int)(bit_allocation+0.5);
@@ -77,5 +77,5 @@
 /* Returns the maximum bit reservoir size */
 unsigned int MaxBitresSize(unsigned long bitRate, unsigned long sampleRate)
 {
-    return 6144 - (unsigned int)((double)bitRate/(double)sampleRate*(double)FRAME_LEN);
+    return 6144 - (unsigned int)((faac_real)bitRate/(faac_real)sampleRate*(faac_real)FRAME_LEN);
 }

_service:obs_scm:faac-1.31.obscpio/libfaac/util.h -> _service:obs_scm:faac-1.40.obscpio/libfaac/util.h Changed

_service:obs_scm:faac-1.40.obscpio/meson.build Added

@@ -0,0 +1,47 @@
+project('faac', 'c', version: '1.40.0', default_options: 'default_library=both')
+
+add_global_arguments('-DHAVE_CONFIG_H', language: 'c')
+
+config_h = configuration_data()
+config_h.set_quoted('PACKAGE', meson.project_name())
+config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
+
+cc = meson.get_compiler('c')
+foreach h: 'getopt.h', 'immintrin.h', 'stdint.h', 'sys/time.h', 'sys/types.h'
+    config_h.set('HAVE_' + h.underscorify().to_upper(), cc.has_header(h))
+endforeach
+
+
+config_h.set('HAVE_STRCASECMP', cc.has_function('strcasestr'))
+
+
+libm = cc.find_library('m', required: false)
+
+cpu_family = target_machine.cpu_family()
+
+config_h.set('HAVE_SSE2', (cpu_family in 'x86', 'x86_64') and config_h.get('HAVE_IMMINTRIN_H'))
+
+if get_option('floating-point') == 'double'
+    config_h.set('FAAC_PRECISION_DOUBLE', 1)
+else
+    config_h.set('FAAC_PRECISION_SINGLE', 1)
+endif
+
+c_args = 
+if cc.get_argument_syntax() == 'msvc'
+    c_args += '-DWIN32', '-DNDEBUG', '-D_WINDOWS', '-D_USRDLL', '-DLIBFAAC_DLL_EXPORTS'
+endif
+
+configure_file(
+    output: 'config.h',
+    configuration: config_h
+)
+
+
+subdir('docs')
+subdir('include')
+subdir('libfaac')
+
+if get_option('frontend')
+    subdir('frontend')
+endif

_service:obs_scm:faac-1.40.obscpio/meson_options.txt Added

_service:obs_scm:faac.obsinfo Changed

Build Results
RPM Lint

Refresh

Comments for request 6390 0

Request History

zaitor created request about 7 hours ago

Something went wrong on the last checkin - branch and "refresh" seems to have worked at least :-) -- subbing without any changes apart from actually getting the pmbs to fetch the correct tarball