ref: 729fda91ea43acd9d8c7d26808d3c9c65114740a
parent: fabe417fd214e21c7b12db661be16c6c0e24a1de
author: menno <menno>
date: Mon May 17 16:51:41 EDT 2004
Removed CoreAAC because it has distribution restriction as outlined in GPL section 8. Note: I never saw this, sorry. To CoreAAC developers: AAC source code can be distributed without violating the patents. Only distribution of binaries is prohibited.
--- a/CoreAAC/.cvsignore
+++ /dev/null
@@ -1,6 +1,0 @@
-*.ncb
-*.opt
-*.plg
-*.aps
-Debug
-Release
--- a/CoreAAC/AACProfilesName.h
+++ /dev/null
@@ -1,35 +1,0 @@
-static char* ObjectTypesNameTable[32] = {- "NULL",
- "AAC Main",
- "AAC LC",
- "AAC SSR",
- "AAC LTP",
- "Reserved",
- "AAC Scalable",
- "TwinVQ",
- "CELP",
- "HVXC",
- "Reserved",
- "Reserved",
- "TTSI",
- "Main synthetic",
- "Wavetable synthesis",
- "General MIDI",
- "Algorithmic Synthesis and Audio FX",
- /* MPEG-4 Version 2 */
- "ER AAC LC",
- "(Reserved)",
- "ER AAC LTP",
- "ER AAC scalable",
- "ER TwinVQ",
- "ER BSAC",
- "ER AAC LD",
- "ER CELP",
- "ER HVXC",
- "ER HILN",
- "ER Parametric",
- "(Reserved)",
- "(Reserved)",
- "(Reserved)",
- "(Reserved)"
-};
\ No newline at end of file
--- a/CoreAAC/COPYING
+++ /dev/null
@@ -1,340 +1,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 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.
-
- 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.)
-
-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.
-
- 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.
-
- 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
-
- 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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.
--- a/CoreAAC/CoreAAC.cpp
+++ /dev/null
@@ -1,638 +1,0 @@
-/*
- * CoreAAC - AAC DirectShow Decoder Filter
- *
- * Modification to decode AAC without ADTS and multichannel support
- * (c) 2003 christophe.paris@free.fr
- *
- * Under section 8 of the GNU General Public License, the copyright
- * holders of CoreAAC explicitly forbid distribution in the following
- * countries:
- * - Japan
- * - United States of America
- *
- *
- * AAC DirectShow Decoder Filter
- * Copyright (C) 2003 Robert Cioch
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <windows.h>
-#include <streams.h>
-#include <initguid.h>
-#include <olectl.h>
-#include <transfrm.h>
-
-#include <mmreg.h>
-#include <ks.h>
-#include <ksmedia.h>
-
-#include <stdio.h>
-
-#include "AACProfilesName.h"
-#include "ICoreAAC.h"
-#include "CoreAACGUID.h"
-#include "CoreAACInfoProp.h"
-#include "CoreAACAboutProp.h"
-#include "CoreAAC.h"
-
-// ============================================================================
-// Registration setup stuff
-
-AMOVIESETUP_MEDIATYPE sudInputType[] =
-{- { &MEDIATYPE_Audio, &MEDIASUBTYPE_AAC }-};
-
-AMOVIESETUP_MEDIATYPE sudOutputType[] =
-{- { &MEDIATYPE_Audio, &MEDIASUBTYPE_PCM }-};
-
-AMOVIESETUP_PIN sudPins[] =
-{- { L"Input",- FALSE, // bRendered
- FALSE, // bOutput
- FALSE, // bZero
- FALSE, // bMany
- &CLSID_NULL, // clsConnectsToFilter
- NULL, // ConnectsToPin
- NUMELMS(sudInputType), // Number of media types
- sudInputType
- },
- { L"Output",- FALSE, // bRendered
- TRUE, // bOutput
- FALSE, // bZero
- FALSE, // bMany
- &CLSID_NULL, // clsConnectsToFilter
- NULL, // ConnectsToPin
- NUMELMS(sudOutputType), // Number of media types
- sudOutputType
- }
-};
-
-AMOVIESETUP_FILTER sudDecoder =
-{- &CLSID_DECODER,
- L"CoreAAC Audio Decoder",
- MERIT_PREFERRED,
- NUMELMS(sudPins),
- sudPins
-};
-
-// ============================================================================
-// COM Global table of objects in this dll
-
-CFactoryTemplate g_Templates[] =
-{- { L"CoreAAC Audio Decoder", &CLSID_DECODER, CCoreAACDecoder::CreateInstance, NULL, &sudDecoder },- { L"CoreAAC Audio Decoder Info", &CLSID_CoreAACInfoProp, CCoreAACInfoProp::CreateInstance, NULL, NULL},- { L"CoreAAC Audio Decoder About", &CLSID_CoreAACAboutProp, CCoreAACAboutProp::CreateInstance, NULL, NULL},-};
-
-// Count of objects listed in g_cTemplates
-int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]);
-
-// ============================================================================
-
-STDAPI DllRegisterServer()
-{- return AMovieDllRegisterServer2(TRUE);
-}
-
-// ----------------------------------------------------------------------------
-
-STDAPI DllUnregisterServer()
-{- return AMovieDllRegisterServer2(FALSE);
-}
-
-// ----------------------------------------------------------------------------
-
-// The streams.h DLL entrypoint.
-extern "C" BOOL WINAPI DllEntryPoint(HINSTANCE, ULONG, LPVOID);
-
-// The entrypoint required by the MSVC runtimes. This is used instead
-// of DllEntryPoint directly to ensure global C++ classes get initialised.
-BOOL WINAPI DllMain(HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) {-
- return DllEntryPoint(reinterpret_cast<HINSTANCE>(hDllHandle), dwReason, lpreserved);
-}
-
-// ----------------------------------------------------------------------------
-
-CUnknown *WINAPI CCoreAACDecoder::CreateInstance(LPUNKNOWN punk, HRESULT *phr)
-{- CCoreAACDecoder *pNewObject = new CCoreAACDecoder(punk, phr);
- if (!pNewObject)
- *phr = E_OUTOFMEMORY;
- return pNewObject;
-}
-
-// ----------------------------------------------------------------------------
-
-void SaveInt(char* keyname, int value)
-{- HKEY hKey;
- DWORD dwDisp;
- if (ERROR_SUCCESS == RegCreateKeyEx(HKEY_CURRENT_USER,
- "Software\\CoreAAC", 0, "REG_SZ",
- REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwDisp))
- {- DWORD dwSize = sizeof(DWORD);
- RegSetValueEx(hKey, keyname, 0, REG_DWORD, (CONST BYTE*)&value, dwSize);
- RegCloseKey(hKey);
- }
-}
-
-int LoadInt(char* keyname, int default_value)
-{- HKEY hKey;
- int result = default_value;
-
- if (ERROR_SUCCESS == RegOpenKeyEx(HKEY_CURRENT_USER,
- "Software\\CoreAAC", 0, KEY_READ, &hKey))
- {- DWORD dwTmp = 0;
- DWORD dwcbData = sizeof(DWORD);
- if(RegQueryValueEx(hKey, keyname, NULL, NULL, (LPBYTE) &dwTmp, &dwcbData) == ERROR_SUCCESS)
- {- result = dwTmp;
- }
- RegCloseKey(hKey);
- }
- return result;
-}
-
-// ----------------------------------------------------------------------------
-
-CCoreAACDecoder::CCoreAACDecoder(LPUNKNOWN lpunk, HRESULT *phr) :
- CTransformFilter(NAME("CoreAAC Audio Decoder"), lpunk, CLSID_DECODER),- m_decHandle(NULL),
- m_decoderSpecificLen(0),
- m_decoderSpecific(NULL),
- m_Channels(0),
- m_SamplesPerSec(0),
- m_BitsPerSample(0),
- m_Bitrate(0),
- m_brCalcFrames(0),
- m_brBytesConsumed(0),
- m_DecodedFrames(0),
- m_OutputBuffLen(0),
- m_DownMatrix(false)
-{- NOTE("CCoreAACDecoder::CCoreAACDecoder");-
- m_ProfileName[0] = '\0';
- m_DownMatrix = LoadInt("DownMatrix", TRUE) ? true : false; -}
-
-// ----------------------------------------------------------------------------
-
-CCoreAACDecoder::~CCoreAACDecoder()
-{- NOTE("CCoreAACDecoder::~CCoreAACDecoder");-
- SaveInt("DownMatrix",m_DownMatrix);-
- if(m_decHandle)
- {- faacDecClose(m_decHandle);
- m_decHandle = NULL;
- }
- if(m_decoderSpecific)
- {- delete m_decoderSpecific;
- m_decoderSpecific = NULL;
- }
-}
-
-// ----------------------------------------------------------------------------
-
-STDMETHODIMP CCoreAACDecoder::NonDelegatingQueryInterface(REFIID riid, void **ppv)
-{- if(riid == IID_ICoreAACDec)
- return GetInterface((ICoreAACDec *)this, ppv);
- else if (riid == IID_ISpecifyPropertyPages)
- return GetInterface((ISpecifyPropertyPages *)this, ppv);
- else
- return CTransformFilter::NonDelegatingQueryInterface(riid, ppv);
-}
-
-// ----------------------------------------------------------------------------
-// property pages
-
-STDMETHODIMP CCoreAACDecoder::GetPages(CAUUID *pPages)
-{- pPages->cElems = 2;
- pPages->pElems = (GUID *)CoTaskMemAlloc(pPages->cElems * sizeof(GUID));
- if (!pPages->pElems)
- return E_OUTOFMEMORY;
-
- pPages->pElems[0] = CLSID_CoreAACInfoProp;
- pPages->pElems[1] = CLSID_CoreAACAboutProp;
-
- return S_OK;
-}
-
-// ============================================================================
-// accept only aac audio wrapped in waveformat
-
-HRESULT CCoreAACDecoder::CheckInputType(const CMediaType *mtIn)
-{- if (*mtIn->Type() != MEDIATYPE_Audio || *mtIn->Subtype() != MEDIASUBTYPE_AAC)
- return VFW_E_TYPE_NOT_ACCEPTED;
-
- if (*mtIn->FormatType() != FORMAT_WaveFormatEx)
- return VFW_E_TYPE_NOT_ACCEPTED;
-
- WAVEFORMATEX *wfex = (WAVEFORMATEX *)mtIn->Format();
- if (wfex->wFormatTag != WAVE_FORMAT_AAC)
- return VFW_E_TYPE_NOT_ACCEPTED;
-
- if(wfex->cbSize < 2)
- return VFW_E_TYPE_NOT_ACCEPTED;
-
- m_decoderSpecificLen = wfex->cbSize;
- if(m_decoderSpecific)
- {- delete m_decoderSpecific;
- m_decoderSpecific = NULL;
- }
- m_decoderSpecific = new unsigned char[m_decoderSpecificLen];
-
- // Keep decoderSpecific initialization data (appended to the WAVEFORMATEX struct)
- memcpy(m_decoderSpecific,(char*)wfex+sizeof(WAVEFORMATEX), m_decoderSpecificLen);
-
- return S_OK;
-}
-
-// ============================================================================
-// propose proper waveformat
-
-HRESULT CCoreAACDecoder::GetMediaType(int iPosition, CMediaType *mtOut)
-{- if (!m_pInput->IsConnected())
- {- return E_UNEXPECTED;
- }
-
- if (iPosition < 0)
- {- return E_INVALIDARG;
- }
-
- if (iPosition > 0)
- {- return VFW_S_NO_MORE_ITEMS;
- }
-
- // Some drivers don't like WAVEFORMATEXTENSIBLE when channels are <= 2 so
- // we fall back to a classic WAVEFORMATEX struct in this case
-
- WAVEFORMATEXTENSIBLE wfex;
- ZeroMemory(&wfex, sizeof(WAVEFORMATEXTENSIBLE));
-
- wfex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
- wfex.Format.wFormatTag = (m_Channels <= 2) ? WAVE_FORMAT_PCM : WAVE_FORMAT_EXTENSIBLE;
- wfex.Format.cbSize = (m_Channels <= 2) ? 0 : sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);
- wfex.Format.nChannels = (unsigned short)m_Channels;
- wfex.Format.nSamplesPerSec = (unsigned short)m_SamplesPerSec;
- wfex.Format.wBitsPerSample = m_BitsPerSample;
- wfex.Format.nBlockAlign = (unsigned short)((wfex.Format.nChannels * wfex.Format.wBitsPerSample) / 8);
- wfex.Format.nAvgBytesPerSec = wfex.Format.nSamplesPerSec * wfex.Format.nBlockAlign;
- switch(m_Channels)
- {- case 1:
- wfex.dwChannelMask = KSAUDIO_SPEAKER_MONO;
- break;
- case 2:
- wfex.dwChannelMask = KSAUDIO_SPEAKER_STEREO;
- break;
- case 3:
- wfex.dwChannelMask = KSAUDIO_SPEAKER_STEREO | SPEAKER_FRONT_CENTER;
- break;
- case 4:
- //wfex.dwChannelMask = KSAUDIO_SPEAKER_QUAD;
- wfex.dwChannelMask = (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER);
- break;
- case 5:
- wfex.dwChannelMask = KSAUDIO_SPEAKER_QUAD | SPEAKER_FRONT_CENTER;
- break;
- case 6:
- wfex.dwChannelMask = KSAUDIO_SPEAKER_5POINT1;
- break;
- default:
- wfex.dwChannelMask = KSAUDIO_SPEAKER_DIRECTOUT; // XXX : or SPEAKER_ALL ??
- break;
- }
- wfex.Samples.wValidBitsPerSample = wfex.Format.wBitsPerSample;
-
- mtOut->SetType(&MEDIATYPE_Audio);
- mtOut->SetSubtype(&MEDIASUBTYPE_PCM);
- mtOut->SetFormatType(&FORMAT_WaveFormatEx);
- mtOut->SetFormat( (BYTE*) &wfex, sizeof(WAVEFORMATEX)+wfex.Format.cbSize);
- mtOut->SetTemporalCompression(FALSE);
-
- return S_OK;
-}
-
-// ----------------------------------------------------------------------------
-
-HRESULT CCoreAACDecoder::CheckTransform(const CMediaType *mtIn, const CMediaType *mtOut)
-{- if (*mtOut->Type() != MEDIATYPE_Audio ||
- *mtOut->Subtype() != MEDIASUBTYPE_PCM ||
- *mtOut->FormatType() != FORMAT_WaveFormatEx)
- {- return VFW_E_TYPE_NOT_ACCEPTED;
- }
-
- return S_OK;
-}
-
-// ----------------------------------------------------------------------------
-
-// 960 for LD or else 1024 (expanded to 2048 for HE-AAC)
-#define MAXFRAMELEN 2048
-
-HRESULT CCoreAACDecoder::DecideBufferSize(IMemAllocator *pAllocator, ALLOCATOR_PROPERTIES *pProperties)
-{- pProperties->cBuffers = 8;
- m_OutputBuffLen = m_Channels * MAXFRAMELEN * sizeof(short);
- pProperties->cbBuffer = m_OutputBuffLen;
-
- NOTE1("CCoreAACDecoder::DecideBufferSize %d", pProperties->cbBuffer);-
- ALLOCATOR_PROPERTIES Actual;
- HRESULT hr = pAllocator->SetProperties(pProperties, &Actual);
- if(FAILED(hr))
- return hr;
-
- if (Actual.cbBuffer < pProperties->cbBuffer || Actual.cBuffers < pProperties->cBuffers)
- return E_INVALIDARG;
-
- return S_OK;
-}
-
-// ----------------------------------------------------------------------------
-
-HRESULT CCoreAACDecoder::CompleteConnect(PIN_DIRECTION direction, IPin *pReceivePin)
-{- HRESULT hr = CTransformFilter::CompleteConnect(direction, pReceivePin);
-
- if(direction == PINDIR_INPUT)
- {- if(m_decHandle)
- {- faacDecClose(m_decHandle);
- m_decHandle = NULL;
- }
- m_decHandle = faacDecOpen();
-
- faacDecConfigurationPtr config;
- config = faacDecGetCurrentConfiguration(m_decHandle);
- config->downMatrix = m_DownMatrix;
- faacDecSetConfiguration(m_decHandle, config);
-
- // Initialize the decoder
- unsigned long SamplesPerSec = 0;
- unsigned char Channels = 0;
- if(faacDecInit2(m_decHandle, m_decoderSpecific, m_decoderSpecificLen,
- &SamplesPerSec, &Channels) < 0)
- {- return E_FAIL;
- }
-
- if(m_DownMatrix)
- {- Channels = 2; // TODO : check with mono
- }
-
- mp4AudioSpecificConfig info;
- AudioSpecificConfig(m_decoderSpecific,m_decoderSpecificLen,&info);
-
- wsprintf(m_ProfileName,"%s%s",
- ObjectTypesNameTable[info.objectTypeIndex],
-#if 0
- info.sbr_present_flag ?
-#else
- false ?
-#endif
- "+SBR" :
- ""
- );
-
- m_Channels = Channels;
- m_SamplesPerSec = SamplesPerSec;
- m_BitsPerSample = 16; // we always decode to the default 16 bits (we could add 24,32,float)
-
- m_brCalcFrames = 0;
- m_brBytesConsumed = 0;
- m_DecodedFrames = 0;
- }
-
- return hr;
-}
-
-// ----------------------------------------------------------------------------
-
-HRESULT CCoreAACDecoder::StartStreaming(void)
-{- m_brCalcFrames = 0;
- m_brBytesConsumed = 0;
- m_DecodedFrames = 0;
- return CTransformFilter::StartStreaming();
-}
-
-// ----------------------------------------------------------------------------
-
-HRESULT CCoreAACDecoder::Transform(IMediaSample *pIn, IMediaSample *pOut)
-{- if (m_State == State_Stopped)
- { - pOut->SetActualDataLength(0);
- return S_OK;
- }
-
- if(pIn->IsPreroll() == S_OK)
- {- return S_FALSE;
- }
-
- // Decode the sample data
- DWORD ActualDstLength;
- BYTE *pSrc, *pDst;
- DWORD SrcLength = pIn->GetActualDataLength();
- DWORD DstLength = pOut->GetSize();
- HRESULT hr;
- hr = pIn->GetPointer(&pSrc);
- if(hr != S_OK)
- return hr;
- hr = pOut->GetPointer(&pDst);
- if(hr != S_OK)
- return hr;
-
- if(!pSrc || !pDst || (DstLength < m_OutputBuffLen))
- return S_FALSE;
-
- // Decode data
- // (use our buffer calculated len, as the Waveout renderer seems to report wrongly a bigger size)
- if(!Decode(pSrc, SrcLength, pDst, m_OutputBuffLen, &ActualDstLength))
- return S_FALSE;
-
- NOTE3("Transform: %u->%u (%u)\n", SrcLength, ActualDstLength, m_OutputBuffLen);-
- // Copy the actual data length
- pOut->SetActualDataLength(ActualDstLength);
- return S_OK;
-}
-
-// ----------------------------------------------------------------------------
-
-// AAC order : C, L, R, L", R", LFE
-// DShow order : L, R, C, LFE, L", R"
-
-const int MAXCHANNELS = 6;
-const int chmap[MAXCHANNELS][MAXCHANNELS+1] = {- // first column tell us if we need to remap
- { 0, }, // mono- { 0, }, // l, r- { 1, 1, 2, 0, }, // c ,l, r -> l, r, c- { 1, 1, 2, 0, 3, }, // c, l, r, bc -> l, r, c, bc- { 1, 1, 2, 0, 3, 4, }, // c, l, r, bl, br -> l, r, c, bl, br- { 1, 1, 2, 0, 5, 3, 4 } // c, l, r, bl, br, lfe -> l, r, c, lfe, bl, br-};
-
-// ----------------------------------------------------------------------------
-
-bool CCoreAACDecoder::Decode(BYTE *pSrc, DWORD SrcLength, BYTE *pDst, DWORD DstLength, DWORD *ActualDstLength)
-{- faacDecFrameInfo frameInfo;
- short *outsamples = (short *)faacDecDecode(m_decHandle, &frameInfo, pSrc, DstLength);
-
- if (frameInfo.error)
- {- NOTE2("CCoreAACDecoder::Decode Error %d [%s]\n", - frameInfo.error, faacDecGetErrorMessage(frameInfo.error));
- return false;
- }
-
- m_brCalcFrames++;
- m_DecodedFrames++;
- m_brBytesConsumed += SrcLength;
-
- if(m_brCalcFrames == 43)
- {- m_Bitrate = (int)((m_brBytesConsumed * 8) / (m_DecodedFrames / 43.07));
- m_brCalcFrames = 0;
- }
-
- if (!frameInfo.error && outsamples)
- {- int channelidx = frameInfo.channels-1;
- if(chmap[channelidx][0])
- {- // dshow remapping
- short *dstBuffer = (short*)pDst;
- for(unsigned int i = 0;
- i < frameInfo.samples;
- i += frameInfo.channels, outsamples += frameInfo.channels)
- {- for(unsigned int j=1; j <= frameInfo.channels; j++)
- {- *dstBuffer++ = outsamples[chmap[channelidx][j]];
- }
- }
- }
- else
- {- memcpy(pDst, outsamples, frameInfo.samples * sizeof(short));
- }
- }
- else
- return false;
-
- *ActualDstLength = frameInfo.samples * sizeof(short);
- return true;
-}
-
-// ============================================================================
-// ICoreAAC
-// ============================================================================
-
-STDMETHODIMP CCoreAACDecoder::get_ProfileName(char** name)
-{- CheckPointer(name,E_POINTER);
- *name = m_ProfileName;
- return S_OK;
-}
-
-STDMETHODIMP CCoreAACDecoder::get_SampleRate(int* sample_rate)
-{- CheckPointer(sample_rate,E_POINTER);
- *sample_rate = m_SamplesPerSec;
- return S_OK;
-}
-
-STDMETHODIMP CCoreAACDecoder::get_Channels(int *channels)
-{- CheckPointer(channels,E_POINTER);
- *channels = m_Channels;
- return S_OK;
-}
-
-STDMETHODIMP CCoreAACDecoder::get_BitsPerSample(int *bits_per_sample)
-{- CheckPointer(bits_per_sample,E_POINTER);
- *bits_per_sample = m_BitsPerSample;
- return S_OK;
-}
-
-STDMETHODIMP CCoreAACDecoder::get_Bitrate(int *bitrate)
-{- CheckPointer(bitrate,E_POINTER);
- *bitrate = m_Bitrate;
- return S_OK;
-}
-
-STDMETHODIMP CCoreAACDecoder::get_FramesDecoded(unsigned int *frames_decoded)
-{- CheckPointer(frames_decoded,E_POINTER);
- *frames_decoded = m_DecodedFrames;
- return S_OK;
-}
-
-STDMETHODIMP CCoreAACDecoder::get_DownMatrix(bool *down_matrix)
-{- CheckPointer(down_matrix,E_POINTER);
- *down_matrix = m_DownMatrix;
- return S_OK;
-}
-
-STDMETHODIMP CCoreAACDecoder::set_DownMatrix(bool down_matrix)
-{- m_DownMatrix = down_matrix;
- return S_OK;
-}
-
-// ============================================================================
-
-
-
--- a/CoreAAC/CoreAAC.def
+++ /dev/null
@@ -1,8 +1,0 @@
-; This file provides declarations of the entrypoints in the DLL.
-
-LIBRARY CoreAAC.ax
-EXPORTS
- DllGetClassObject PRIVATE
- DllCanUnloadNow PRIVATE
- DllRegisterServer PRIVATE
- DllUnregisterServer PRIVATE
--- a/CoreAAC/CoreAAC.dsp
+++ /dev/null
@@ -1,322 +1,0 @@
-# Microsoft Developer Studio Project File - Name="CoreAAC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=CoreAAC - 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 "CoreAAC.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 "CoreAAC.mak" CFG="CoreAAC - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "CoreAAC - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "CoreAAC - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "CoreAAC - Win32 Release Unicode" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "CoreAAC - Win32 Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "CoreAAC - 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 /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Gz /MD /W3 /O2 /D DBG=0 /D WINVER=0x400 /D "INC_OLE2" /D "STRICT" /D "WIN32" /D "_WIN32" /D "_MT" /D "_DLL" /D _X86_=1 /YX"streams.h" /Oxs /GF /D_WIN32_WINNT=-0x0400 /c
-# SUBTRACT CPP /Fr
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "..\..\BaseClasses" /d "NDEBUG" /d "WIN32"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.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 /subsystem:windows /dll /machine:I386
-# ADD LINK32 strmbase.lib msvcrt.lib quartz.lib vfw32.lib winmm.lib kernel32.lib advapi32.lib version.lib largeint.lib user32.lib gdi32.lib comctl32.lib ole32.lib olepro32.lib oleaut32.lib uuid.lib /nologo /stack:0x200000,0x200000 /dll /pdb:none /machine:I386 /nodefaultlib /def:".\CoreAAC.def" /out:".\Release\CoreAAC.ax" /subsystem:windows,4.0 /opt:ref /release /debug:none /OPT:NOREF /OPT:ICF /ignore:4089 /ignore:4078
-# Begin Custom Build
-TargetDir=.\Release
-TargetPath=.\Release\CoreAAC.ax
-InputPath=.\Release\CoreAAC.ax
-SOURCE="$(InputPath)"
-
-"$(TargetDir)\null.txt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- regsvr32.exe /s /c "$(TargetPath)"
- echo "pouette" > $(TargetDir)\null.txt
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "CoreAAC - 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 /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Gz /MDd /W3 /Zi /Od /Gy /D _WIN32_WINNT=0x0400 /D WINVER=0x0400 /D DBG=1 /D "DEBUG" /D "_DEBUG" /D "INC_OLE2" /D "STRICT" /D "WIN32" /D "_WIN32" /D "_MT" /D "_DLL" /D _X86_=1 /YX"streams.h" /Oid /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "..\..\BaseClasses" /d "_DEBUG" /d "WIN32"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 strmbasd.lib msvcrtd.lib quartz.lib vfw32.lib winmm.lib kernel32.lib advapi32.lib version.lib largeint.lib user32.lib gdi32.lib comctl32.lib ole32.lib olepro32.lib oleaut32.lib uuid.lib /nologo /stack:0x200000,0x200000 /dll /pdb:none /debug /machine:I386 /nodefaultlib /out:".\Debug\CoreAAC.ax" /debug:mapped,full /subsystem:windows,4.0 /ignore:4089 /ignore:4078
-# Begin Custom Build
-TargetDir=.\Debug
-TargetPath=.\Debug\CoreAAC.ax
-InputPath=.\Debug\CoreAAC.ax
-SOURCE="$(InputPath)"
-
-"$(TargetDir)\null.txt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- regsvr32.exe /s /c "$(TargetPath)"
- echo "pouette" > $(TargetDir)\null.txt
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "CoreAAC - Win32 Release Unicode"
-
-# 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_Unicode"
-# PROP Intermediate_Dir "Release_Unicode"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Gz /MD /W4 /Gy /I "..\..\BaseClasses" /I "..\..\..\..\..\include" /D DBG=0 /D WINVER=0x400 /D "INC_OLE2" /D "STRICT" /D "_WIN32" /D "_MT" /D "_DLL" /D _X86_=1 /D "WIN32" /D "UNICODE" /D "_UNICODE" /YX"streams.h" /Oxs /GF /D_WIN32_WINNT=-0x0400 /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "..\..\BaseClasses" /d "NDEBUG" /d "WIN32"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.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 /subsystem:windows /dll /machine:I386
-# ADD LINK32 ..\..\BaseClasses\release_unicode\strmbase.lib msvcrt.lib quartz.lib vfw32.lib winmm.lib kernel32.lib advapi32.lib version.lib largeint.lib user32.lib gdi32.lib comctl32.lib ole32.lib olepro32.lib oleaut32.lib uuid.lib /nologo /stack:0x200000,0x200000 /dll /pdb:none /machine:I386 /nodefaultlib /out:".\Release_Unicode\CoreAAC.ax" /libpath:"..\..\..\..\lib" /subsystem:windows,4.0 /opt:ref /release /debug:none /OPT:NOREF /OPT:ICF /ignore:4089 /ignore:4078
-
-!ELSEIF "$(CFG)" == "CoreAAC - Win32 Debug Unicode"
-
-# 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_Unicode"
-# PROP Intermediate_Dir "Debug_Unicode"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Gz /MDd /W4 /Zi /Od /Gy /I "..\..\BaseClasses" /I "..\..\..\..\..\include" /D _WIN32_WINNT=0x0400 /D WINVER=0x0400 /D DBG=1 /D "DEBUG" /D "_DEBUG" /D "INC_OLE2" /D "STRICT" /D "_WIN32" /D "_MT" /D "_DLL" /D _X86_=1 /D "WIN32" /D "UNICODE" /D "_UNICODE" /YX"streams.h" /Oid /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "..\..\BaseClasses" /d "_DEBUG" /d "WIN32"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\..\BaseClasses\debug_unicode\strmbasd.lib msvcrtd.lib quartz.lib vfw32.lib winmm.lib kernel32.lib advapi32.lib version.lib largeint.lib user32.lib gdi32.lib comctl32.lib ole32.lib olepro32.lib oleaut32.lib uuid.lib /nologo /stack:0x200000,0x200000 /dll /pdb:none /debug /machine:I386 /nodefaultlib /out:".\Debug_Unicode\CoreAAC.ax" /libpath:"..\..\..\..\lib" /debug:mapped,full /subsystem:windows,4.0 /ignore:4089 /ignore:4078
-
-!ENDIF
-
-# Begin Target
-
-# Name "CoreAAC - Win32 Release"
-# Name "CoreAAC - Win32 Debug"
-# Name "CoreAAC - Win32 Release Unicode"
-# Name "CoreAAC - Win32 Debug Unicode"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\CoreAAC.cpp
-DEP_CPP_AACDE=\
- "..\faad2\include\faad.h"\
- ".\CoreAAC.h"\
- ".\AACProfilesName.h"\
- ".\CoreAACAboutProp.h"\
- ".\CoreAACGUID.h"\
- ".\ICoreAAC.h"\
- {$(INCLUDE)}"amextra.h"\- {$(INCLUDE)}"amfilter.h"\- {$(INCLUDE)}"audevcod.h"\- {$(INCLUDE)}"cache.h"\- {$(INCLUDE)}"combase.h"\- {$(INCLUDE)}"cprop.h"\- {$(INCLUDE)}"ctlutil.h"\- {$(INCLUDE)}"dllsetup.h"\- {$(INCLUDE)}"dsschedule.h"\- {$(INCLUDE)}"fourcc.h"\- {$(INCLUDE)}"ksmedia.h"\- {$(INCLUDE)}"measure.h"\- {$(INCLUDE)}"msgthrd.h"\- {$(INCLUDE)}"mtype.h"\- {$(INCLUDE)}"outputq.h"\- {$(INCLUDE)}"pstream.h"\- {$(INCLUDE)}"refclock.h"\- {$(INCLUDE)}"reftime.h"\- {$(INCLUDE)}"renbase.h"\- {$(INCLUDE)}"source.h"\- {$(INCLUDE)}"streams.h"\- {$(INCLUDE)}"strmctl.h"\- {$(INCLUDE)}"sysclock.h"\- {$(INCLUDE)}"transfrm.h"\- {$(INCLUDE)}"transip.h"\- {$(INCLUDE)}"videoctl.h"\- {$(INCLUDE)}"vtrans.h"\- {$(INCLUDE)}"winctrl.h"\- {$(INCLUDE)}"winutil.h"\- {$(INCLUDE)}"wxdebug.h"\- {$(INCLUDE)}"wxlist.h"\- {$(INCLUDE)}"wxutil.h"\-
-# End Source File
-# Begin Source File
-
-SOURCE=.\CoreAAC.def
-
-!IF "$(CFG)" == "CoreAAC - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "CoreAAC - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "CoreAAC - Win32 Release Unicode"
-
-!ELSEIF "$(CFG)" == "CoreAAC - Win32 Debug Unicode"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\CoreAACAboutProp.cpp
-DEP_CPP_COREA=\
- "..\faad2\include\faad.h"\
- ".\CoreAACAboutProp.h"\
- {$(INCLUDE)}"amextra.h"\- {$(INCLUDE)}"amfilter.h"\- {$(INCLUDE)}"audevcod.h"\- {$(INCLUDE)}"cache.h"\- {$(INCLUDE)}"combase.h"\- {$(INCLUDE)}"cprop.h"\- {$(INCLUDE)}"ctlutil.h"\- {$(INCLUDE)}"dllsetup.h"\- {$(INCLUDE)}"dsschedule.h"\- {$(INCLUDE)}"fourcc.h"\- {$(INCLUDE)}"measure.h"\- {$(INCLUDE)}"msgthrd.h"\- {$(INCLUDE)}"mtype.h"\- {$(INCLUDE)}"outputq.h"\- {$(INCLUDE)}"pstream.h"\- {$(INCLUDE)}"refclock.h"\- {$(INCLUDE)}"reftime.h"\- {$(INCLUDE)}"renbase.h"\- {$(INCLUDE)}"source.h"\- {$(INCLUDE)}"streams.h"\- {$(INCLUDE)}"strmctl.h"\- {$(INCLUDE)}"sysclock.h"\- {$(INCLUDE)}"transfrm.h"\- {$(INCLUDE)}"transip.h"\- {$(INCLUDE)}"videoctl.h"\- {$(INCLUDE)}"vtrans.h"\- {$(INCLUDE)}"winctrl.h"\- {$(INCLUDE)}"winutil.h"\- {$(INCLUDE)}"wxdebug.h"\- {$(INCLUDE)}"wxlist.h"\- {$(INCLUDE)}"wxutil.h"\-
-# End Source File
-# Begin Source File
-
-SOURCE=.\CoreAACInfoProp.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\CoreAAC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\AACProfilesName.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CoreAACAboutProp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CoreAACGUID.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CoreAACInfoProp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ICoreAAC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# End Group
-# Begin Group "resource"
-
-# PROP Default_Filter ".rc"
-# Begin Source File
-
-SOURCE=.\resource\aac_logo_sm.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CoreAAC.rc
-# End Source File
-# End Group
-# End Target
-# End Project
--- a/CoreAAC/CoreAAC.dsw
+++ /dev/null
@@ -1,44 +1,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "CoreAAC"=.\CoreAAC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{-}}}
-
-Package=<4>
-{{{- Begin Project Dependency
- Project_Dep_Name libfaad
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libfaad"=.\faad2\libfaad\libfaad.dsp - Package Owner=<4>
-
-Package=<5>
-{{{-}}}
-
-Package=<4>
-{{{-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{-}}}
-
-Package=<3>
-{{{-}}}
-
-###############################################################################
-
--- a/CoreAAC/CoreAAC.h
+++ /dev/null
@@ -1,90 +1,0 @@
-/*
- * CoreAAC - AAC DirectShow Decoder Filter
- *
- * Modification to decode AAC without ADTS and multichannel support
- * christophe.paris@free.fr
- *
- * Under section 8 of the GNU General Public License, the copyright
- * holders of CoreAAC explicitly forbid distribution in the following
- * countries:
- * - Japan
- * - United States of America
- *
- *
- * AAC DirectShow Decoder Filter
- * Copyright (C) 2003 Robert Cioch
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include "../faad2/include/faad.h"
-
-// ===========================================================================================
-
-class CCoreAACDecoder : public CTransformFilter,
- public ISpecifyPropertyPages,
- public ICoreAACDec
-{-public :
- DECLARE_IUNKNOWN
- static CUnknown *WINAPI CreateInstance(LPUNKNOWN punk, HRESULT *phr);
- STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
-
- CCoreAACDecoder(LPUNKNOWN lpunk, HRESULT *phr);
- virtual ~CCoreAACDecoder();
-
- // ----- ISpecifyPropertyPages -----
- STDMETHODIMP GetPages(CAUUID *pPages);
-
- // ----- ITransformFilter -----
- HRESULT Transform(IMediaSample *pIn, IMediaSample *pOut);
- HRESULT CheckInputType(const CMediaType *mtIn);
- HRESULT CheckTransform(const CMediaType *mtIn, const CMediaType *mtOut);
- HRESULT DecideBufferSize(IMemAllocator *pAllocator, ALLOCATOR_PROPERTIES *pprop);
- HRESULT GetMediaType(int iPosition, CMediaType *pMediaType);
- HRESULT CompleteConnect(PIN_DIRECTION direction, IPin *pReceivePin);
- HRESULT StartStreaming(void);
- bool Decode(BYTE *pSrc, DWORD SrcLength, BYTE *pDst, DWORD DstLength, DWORD *ActualDstLength);
-
- // ----- ICoreAACDec -----
- STDMETHODIMP get_ProfileName(char** name);
- STDMETHODIMP get_SampleRate(int* sample_rate);
- STDMETHODIMP get_Channels(int *channels);
- STDMETHODIMP get_BitsPerSample(int *bits_per_sample);
- STDMETHODIMP get_Bitrate(int *bitrate);
- STDMETHODIMP get_FramesDecoded(unsigned int *frames_decoded);
- STDMETHODIMP get_DownMatrix(bool *down_matrix);
- STDMETHODIMP set_DownMatrix(bool down_matrix);
-
-private:
- unsigned char* m_decoderSpecific;
- int m_decoderSpecificLen;
- faacDecHandle m_decHandle;
- int m_Channels;
- int m_SamplesPerSec;
- int m_BitsPerSample;
- bool m_DownMatrix;
- char m_ProfileName[64];
-
- unsigned int m_Bitrate;
- unsigned int m_brCalcFrames;
- unsigned int m_brBytesConsumed;
- unsigned int m_DecodedFrames;
-
- unsigned int m_OutputBuffLen;
-};
-
-// ===========================================================================================
\ No newline at end of file
--- a/CoreAAC/CoreAAC.nsi
+++ /dev/null
@@ -1,78 +1,0 @@
-; ---------------------------------------------------------------------------
-; CoreAAC install script for NSIS
-; ---------------------------------------------------------------------------
-
-!define NAME "CoreAAC Audio Decoder"
-!define OUTFILE "Redist\CoreAAC.exe"
-!define INPUT_PATH "Release\"
-!define FILTER_FILE1 "CoreAAC.ax"
-!define UNINST_NAME "CoreAAC-uninstall.exe"
-
-; ---------------------------------------------------------------------------
-; NOTE: this .NSI script is designed for NSIS v1.8+
-; ---------------------------------------------------------------------------
-
-Name "${NAME}"-OutFile "${OUTFILE}"-
-SetOverwrite ifnewer
-SetCompress auto ; (can be off or force)
-SetDatablockOptimize on ; (can be off)
-CRCCheck on ; (can be off)
-AutoCloseWindow false ; (can be true for the window go away automatically at end)
-ShowInstDetails hide ; (can be show to have them shown, or nevershow to disable)
-SetDateSave off ; (can be on to have files restored to their orginal date)
-
-InstallColors /windows
-InstProgressFlags smooth
-
-; ---------------------------------------------------------------------------
-
-Function .onInit
- MessageBox MB_YESNO "This will install ${NAME}. Do you wish to continue?" IDYES gogogo- Abort
- gogogo:
-FunctionEnd
-
-; ---------------------------------------------------------------------------
-
-Section "" ; (default section)
- SetOutPath "$SYSDIR"
- ; add files / whatever that need to be installed here.
- File "${INPUT_PATH}${FILTER_FILE1}"-
- ; write out uninstaller
- WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "DisplayName" "${NAME} (remove only)"- WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "UninstallString" '"$SYSDIR\${UNINST_NAME}"'- WriteUninstaller "$SYSDIR\${UNINST_NAME}"-
- RegDLL "$SYSDIR\${FILTER_FILE1}"-SectionEnd ; end of default section
-
-; ---------------------------------------------------------------------------
-
-; begin uninstall settings/section
-UninstallText "This will uninstall ${NAME} from your system"-
-Section Uninstall
- UnRegDLL "$SYSDIR\${FILTER_FILE1}"-
- ; add delete commands to delete whatever files/registry keys/etc you installed here.
- Delete /REBOOTOK "$SYSDIR\${FILTER_FILE1}" - Delete "$SYSDIR\${UNINST_NAME}"-
- DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}"-SectionEnd ; end of uninstall section
-
-; ---------------------------------------------------------------------------
-
-Function un.onUninstSuccess
- IfRebootFlag 0 NoReboot
- MessageBox MB_OK \
- "A file couldn't be deleted. It will be deleted at next reboot."
- NoReboot:
-FunctionEnd
-
-; ---------------------------------------------------------------------------
-; eof
-; ---------------------------------------------------------------------------
--- a/CoreAAC/CoreAAC.rc
+++ /dev/null
@@ -1,213 +1,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "windows.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_ABOUT DIALOG DISCARDABLE 0, 0, 211, 144
-STYLE WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
- GROUPBOX "",IDC_STATIC,4,4,200,43,BS_CENTER
- CTEXT "Copyright � 2003 Robert Cioch",IDC_STATIC,10,73,187,8,
- SS_CENTERIMAGE
- CTEXT "FAAD2 v1.1 - Freeware Advanced Audio Decoder",
- IDC_STATIC_FAAD_VERSION,10,102,187,8,SS_CENTERIMAGE
- CTEXT "Copyright � 2002 Menno Bakker",IDC_STATIC,10,113,187,8,
- SS_CENTERIMAGE
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,10,96,187,1
- CTEXT "http://www.audiocoding.com",IDC_STATIC,10,124,187,8,
- SS_CENTERIMAGE
- CTEXT "http://www.borgtech.org",IDC_STATIC,10,83,187,8,
- SS_CENTERIMAGE
- CTEXT "AAC Decoder v1.1",IDC_STATIC,10,62,187,8,SS_CENTERIMAGE
- CTEXT "http://corecodec.org/projects/coreaac/",IDC_STATIC,10,
- 34,187,8
- CTEXT "Version 1.0b - (May 21 2003, 17:05:09)",
- IDC_STATIC_VERSION,10,24,187,8
- CTEXT "CoreAAC : AAC DirectShow Filter Decoder",IDC_STATIC,10,
- 13,187,8
- GROUPBOX " This software is based on : ",IDC_STATIC,4,52,200,85
-END
-
-IDD_DIALOG_INFO DIALOG DISCARDABLE 0, 0, 211, 144
-STYLE WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
- GROUPBOX "",IDC_STATIC,4,29,200,109,BS_CENTER
- LTEXT "Sample rate :",IDC_STATIC,84,52,42,8
- LTEXT "Channels :",IDC_STATIC,84,63,34,8
- LTEXT "Profile :",IDC_STATIC,84,41,41,8
- LTEXT "Bitrate :",IDC_STATIC,84,85,25,8
- RTEXT "AAC LC",IDC_LABEL_PROFILE,110,41,87,8
- RTEXT "48000 Hz",IDC_LABEL_SAMPLERATE,154,52,43,8
- RTEXT "2",IDC_LABEL_CHANNELS,154,63,43,8
- RTEXT "-",IDC_LABEL_BITRATE,154,85,43,8
- LTEXT "Bits per sample :",IDC_STATIC,84,74,52,8
- RTEXT "16",IDC_LABEL_BPS,154,74,43,8
- LTEXT "Frames decoded :",IDC_STATIC,84,96,58,8
- RTEXT "-",IDC_LABEL_FRAMES_DECODED,154,96,43,8
- CONTROL 105,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,10,40,64,
- 65
- LTEXT "The ""AAC"" logo is a trademark of Dolby Laboratories.",
- IDC_STATIC,10,125,168,8
- CTEXT "CoreAAC : AAC DirectShow Filter Decoder",IDC_STATIC,10,
- 13,187,8
- GROUPBOX "",IDC_STATIC,4,4,200,23
- CONTROL "Downmix to 2 channels",IDC_CHECK_DOWNMIX,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,84,108,89,10
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
- IDD_ABOUT, DIALOG
- BEGIN
- LEFTMARGIN, 4
- VERTGUIDE, 10
- VERTGUIDE, 197
- VERTGUIDE, 204
- TOPMARGIN, 4
- BOTTOMMARGIN, 143
- END
-
- IDD_DIALOG_INFO, DIALOG
- BEGIN
- LEFTMARGIN, 4
- VERTGUIDE, 84
- VERTGUIDE, 154
- VERTGUIDE, 197
- TOPMARGIN, 4
- END
-END
-#endif // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE MOVEABLE PURE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE MOVEABLE PURE
-BEGIN
- "#include ""windows.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE MOVEABLE PURE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,0,456
- PRODUCTVERSION 1,1,0,456
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "Comments", "http://corecodec.org/projects/coreaac/\0"
- VALUE "FileDescription", "CoreAAC\0"
- VALUE "FileVersion", "1, 1, 0, 456\0"
- VALUE "InternalName", "CoreAAC\0"
- VALUE "LegalCopyright", "see the about box :p\0"
- VALUE "OriginalFilename", "CoreAAC.ax\0"
- VALUE "ProductVersion", "1, 1, 0, 456\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BITMAP_AAC_LOGO BITMAP DISCARDABLE "resource/aac_logo_sm.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_ABOUT "About"
- IDS_INFO "Info"
-END
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
--- a/CoreAAC/CoreAACAboutProp.cpp
+++ /dev/null
@@ -1,52 +1,0 @@
-#include <stdio.h>
-#include <streams.h>
-#include "CoreAACAboutProp.h"
-#include "resource.h"
-
-#include "../faad2/include/faad.h"
-#define FILTER_VERSION "1.0b4"
-
-// ----------------------------------------------------------------------------
-
-CUnknown *WINAPI CCoreAACAboutProp::CreateInstance(LPUNKNOWN punk, HRESULT *phr)
-{- CCoreAACAboutProp *pNewObject = new CCoreAACAboutProp(punk, phr);
- if (!pNewObject)
- *phr = E_OUTOFMEMORY;
- return pNewObject;
-}
-
-// ----------------------------------------------------------------------------
-
-CCoreAACAboutProp::CCoreAACAboutProp(LPUNKNOWN pUnk, HRESULT *phr) :
- CBasePropertyPage(NAME("About"), pUnk, IDD_ABOUT, IDS_ABOUT)-{-
-}
-
-// ----------------------------------------------------------------------------
-
-CCoreAACAboutProp::~CCoreAACAboutProp()
-{-
-}
-
-// ----------------------------------------------------------------------------
-
-HRESULT CCoreAACAboutProp::OnActivate()
-{ - SetDlgItemText(m_hwnd, IDC_STATIC_VERSION,
- "Version " FILTER_VERSION " - ("__DATE__", "__TIME__")");- SetDlgItemText(m_hwnd, IDC_STATIC_FAAD_VERSION,
- "FAAD2 " FAAD2_VERSION " - Freeware Advanced Audio Decoder");
- return S_OK;
-}
-
-// ----------------------------------------------------------------------------
-
-BOOL CCoreAACAboutProp::OnReceiveMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{- return CBasePropertyPage::OnReceiveMessage(hwnd, uMsg, wParam, lParam);
-}
-
-// ----------------------------------------------------------------------------
\ No newline at end of file
--- a/CoreAAC/CoreAACAboutProp.h
+++ /dev/null
@@ -1,15 +1,0 @@
-#if !defined(AFX_COREAACABOUTPROP_H__D1E17C99_2135_46E3_A2D6_7A9845F1A296__INCLUDED_)
-#define AFX_COREAACABOUTPROP_H__D1E17C99_2135_46E3_A2D6_7A9845F1A296__INCLUDED_
-
-class CCoreAACAboutProp : public CBasePropertyPage
-{-public:
- static CUnknown *WINAPI CreateInstance(LPUNKNOWN punk, HRESULT *phr);
- CCoreAACAboutProp(LPUNKNOWN pUnk, HRESULT *phr);
- virtual ~CCoreAACAboutProp();
- HRESULT OnActivate();
- BOOL OnReceiveMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-};
-
-
-#endif // !defined(AFX_COREAACABOUTPROP_H__D1E17C99_2135_46E3_A2D6_7A9845F1A296__INCLUDED_)
--- a/CoreAAC/CoreAACGUID.h
+++ /dev/null
@@ -1,28 +1,0 @@
-//-----------------------------------------------------------------------------
-#ifndef _COREAAC_H_
-#define _COREAAC_H_
-// ----------------------------------------------------------------------------
-
-// {6AC7C19E-8CA0-4e3d-9A9F-2881DE29E0AC}-DEFINE_GUID(CLSID_DECODER,
- 0x6ac7c19e, 0x8ca0, 0x4e3d, 0x9a, 0x9f, 0x28, 0x81, 0xde, 0x29, 0xe0, 0xac);
-
-// Be compatible with 3ivx
-#define WAVE_FORMAT_AAC 0x00FF
-//#define WAVE_FORMAT_AAC 0xAAC0
-
-// {000000FF-0000-0010-8000-00AA00389B71}-DEFINE_GUID(MEDIASUBTYPE_AAC,
- WAVE_FORMAT_AAC, 0x000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
-
-// {4665E44B-8B9A-4515-A086-E94ECE374608}-DEFINE_GUID(CLSID_CoreAACAboutProp,
- 0x4665e44b, 0x8b9a, 0x4515, 0xa0, 0x86, 0xe9, 0x4e, 0xce, 0x37, 0x46, 0x8);
-
-// {BBFC1A2A-D3A2-4610-847D-26592022F86E}-DEFINE_GUID(CLSID_CoreAACInfoProp,
- 0xbbfc1a2a, 0xd3a2, 0x4610, 0x84, 0x7d, 0x26, 0x59, 0x20, 0x22, 0xf8, 0x6e);
-
-// ----------------------------------------------------------------------------
-#endif // _COREAAC_H_
-// ----------------------------------------------------------------------------
\ No newline at end of file
--- a/CoreAAC/CoreAACInfoProp.cpp
+++ /dev/null
@@ -1,183 +1,0 @@
-#include <stdio.h>
-#include <streams.h>
-#include "ICoreAAC.h"
-#include "CoreAACInfoProp.h"
-#include "resource.h"
-
-// ----------------------------------------------------------------------------
-
-CUnknown *WINAPI CCoreAACInfoProp::CreateInstance(LPUNKNOWN punk, HRESULT *phr)
-{- CCoreAACInfoProp *pNewObject = new CCoreAACInfoProp(punk, phr);
- if (!pNewObject)
- *phr = E_OUTOFMEMORY;
- return pNewObject;
-}
-
-// ----------------------------------------------------------------------------
-
-CCoreAACInfoProp::CCoreAACInfoProp(LPUNKNOWN pUnk, HRESULT *phr) :
- CBasePropertyPage(NAME("Info"), pUnk, IDD_DIALOG_INFO, IDS_INFO),- m_pICoreAACDec(NULL),
- m_fWindowInActive(TRUE)
-{-
-}
-
-// ----------------------------------------------------------------------------
-
-CCoreAACInfoProp::~CCoreAACInfoProp()
-{-
-}
-
-// ----------------------------------------------------------------------------
-
-HRESULT CCoreAACInfoProp::OnConnect(IUnknown *pUnknown)
-{- if (pUnknown == NULL)
- {- return E_POINTER;
- }
-
- ASSERT(m_pICoreAACDec == NULL);
-
- // Ask the filter for it's control interface
- HRESULT hr = pUnknown->QueryInterface(IID_ICoreAACDec,reinterpret_cast<void**>(&m_pICoreAACDec));
- if(FAILED(hr))
- {- return hr;
- }
-
- ASSERT(m_pICoreAACDec);
-
- m_pICoreAACDec->get_DownMatrix(&m_DownMatrix);
-
- return S_OK;
-}
-
-// ----------------------------------------------------------------------------
-
-HRESULT CCoreAACInfoProp::OnDisconnect()
-{- // Release the interface
- if (m_pICoreAACDec == NULL) {- return E_UNEXPECTED;
- }
- m_pICoreAACDec->Release();
- m_pICoreAACDec = NULL;
- return NOERROR;
-}
-
-// ----------------------------------------------------------------------------
-
-HRESULT CCoreAACInfoProp::OnActivate()
-{ - char msgFormat[255];
- m_fWindowInActive = FALSE;
-
- char* profileName = NULL;
- m_pICoreAACDec->get_ProfileName(&profileName);
- SetDlgItemText(m_hwnd, IDC_LABEL_PROFILE, profileName);
-
- int sampleRate = 0;
- m_pICoreAACDec->get_SampleRate(&sampleRate);
- wsprintf(msgFormat, "%d Hz", sampleRate);
- SetDlgItemText(m_hwnd, IDC_LABEL_SAMPLERATE, msgFormat);
-
- int channels = 0;
- m_pICoreAACDec->get_Channels(&channels);
- wsprintf(msgFormat, "%d", channels);
- SetDlgItemText(m_hwnd, IDC_LABEL_CHANNELS, msgFormat);
-
- int bps = 0;
- m_pICoreAACDec->get_BitsPerSample(&bps);
- wsprintf(msgFormat, "%d", bps);
- SetDlgItemText(m_hwnd, IDC_LABEL_BPS, msgFormat);
-
- CheckDlgButton(m_hwnd,IDC_CHECK_DOWNMIX, m_DownMatrix ? BST_CHECKED : BST_UNCHECKED);
-
- RefreshDisplay(m_hwnd);
- SetTimer(m_hwnd,0,1000,NULL);
-
- return S_OK;
-}
-
-// ----------------------------------------------------------------------------
-
-HRESULT CCoreAACInfoProp::OnDeactivate()
-{- KillTimer(m_hwnd,0);
- m_fWindowInActive = TRUE;
- return S_OK;
-}
-
-// ----------------------------------------------------------------------------
-
-HRESULT CCoreAACInfoProp::OnApplyChanges(void)
-{- m_pICoreAACDec->set_DownMatrix(m_DownMatrix);
- return S_OK;
-}
-
-// ----------------------------------------------------------------------------
-
-BOOL CCoreAACInfoProp::OnReceiveMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{- if(m_fWindowInActive)
- return FALSE;
-
- switch(uMsg)
- {- case WM_COMMAND:
- switch (LOWORD(wParam))
- {- case IDC_CHECK_DOWNMIX:
- m_DownMatrix = (IsDlgButtonChecked(hwnd,IDC_CHECK_DOWNMIX) == BST_CHECKED) ? true : false;
- SetDirty();
- break;
- }
- break;
-
- case WM_TIMER:
- RefreshDisplay(hwnd);
- return (LRESULT) 1;
- }
-
- return CBasePropertyPage::OnReceiveMessage(hwnd, uMsg, wParam, lParam);
-}
-
-// ----------------------------------------------------------------------------
-
-void CCoreAACInfoProp::RefreshDisplay(HWND hwnd)
-{- static char msgFormat[16];
-
- int bitrate = 0;
- m_pICoreAACDec->get_Bitrate(&bitrate);
- if(bitrate)
- wsprintf(msgFormat, "%d kbps", bitrate/1000);
- else
- wsprintf(msgFormat, "-");
- SetDlgItemText(hwnd, IDC_LABEL_BITRATE, msgFormat);
-
- unsigned int frames_decoded = 0;
- m_pICoreAACDec->get_FramesDecoded(&frames_decoded);
- if(frames_decoded)
- wsprintf(msgFormat, "%d", frames_decoded);
- else
- wsprintf(msgFormat, "-");
- SetDlgItemText(hwnd, IDC_LABEL_FRAMES_DECODED, msgFormat);
-
-}
-
-// ----------------------------------------------------------------------------
-
-void CCoreAACInfoProp::SetDirty()
-{- m_bDirty = TRUE;
- if (m_pPageSite)
- m_pPageSite->OnStatusChange(PROPPAGESTATUS_DIRTY);
-}
-
-// ----------------------------------------------------------------------------
\ No newline at end of file
--- a/CoreAAC/CoreAACInfoProp.h
+++ /dev/null
@@ -1,26 +1,0 @@
-#if !defined(AFX_COREAACINFOPROP_H__2722D950_7796_4061_B127_B78F1B28B908__INCLUDED_)
-#define AFX_COREAACINFOPROP_H__2722D950_7796_4061_B127_B78F1B28B908__INCLUDED_
-
-class CCoreAACInfoProp : public CBasePropertyPage
-{-public:
- static CUnknown *WINAPI CreateInstance(LPUNKNOWN punk, HRESULT *phr);
- CCoreAACInfoProp(LPUNKNOWN pUnk, HRESULT *phr);
- virtual ~CCoreAACInfoProp();
- HRESULT OnConnect(IUnknown *pUnknown);
- HRESULT OnDisconnect();
- HRESULT OnActivate();
- HRESULT OnDeactivate();
- BOOL OnReceiveMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
- HRESULT OnApplyChanges();
- void SetDirty();
-
-private:
- void CCoreAACInfoProp::RefreshDisplay(HWND hwnd);
-
- ICoreAACDec* m_pICoreAACDec;
- bool m_DownMatrix;
- BOOL m_fWindowInActive; // TRUE ==> dialog is being destroyed
-};
-
-#endif // !defined(AFX_COREAACINFOPROP_H__2722D950_7796_4061_B127_B78F1B28B908__INCLUDED_)
--- a/CoreAAC/ICoreAAC.h
+++ /dev/null
@@ -1,33 +1,0 @@
-#ifndef _ICoreAAC_H_
-#define _ICoreAAC_H_
-
-#ifdef __cplusplus
-extern "C" {-#endif
-
-
-// ICoreAACDec GUID
-// {231E221B-AA58-4a83-A209-06C3526E7EE4}-DEFINE_GUID(IID_ICoreAACDec,
- 0x231e221b, 0xaa58, 0x4a83, 0xa2, 0x9, 0x6, 0xc3, 0x52, 0x6e, 0x7e, 0xe4);
-
-//
-// ICoreAACDec
-//
-DECLARE_INTERFACE_(ICoreAACDec, IUnknown)
-{- STDMETHOD(get_ProfileName)(THIS_ char** name) PURE;
- STDMETHOD(get_SampleRate)(THIS_ int* sample_rate) PURE;
- STDMETHOD(get_Channels)(THIS_ int *channels) PURE;
- STDMETHOD(get_BitsPerSample)(THIS_ int *bits_per_sample) PURE;
- STDMETHOD(get_Bitrate)(THIS_ int *bitrate) PURE;
- STDMETHOD(get_FramesDecoded)(THIS_ unsigned int *frames_decoded) PURE;
- STDMETHOD(get_DownMatrix)(THIS_ bool *down_matrix) PURE;
- STDMETHOD(set_DownMatrix)(THIS_ bool down_matrix) PURE;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _ICoreAAC_H_
\ No newline at end of file
--- a/CoreAAC/INSTALL
+++ /dev/null
@@ -1,57 +1,0 @@
-CoreAAC build instructions
-==========================
-
-
-Requirements :
---------------
-
-Visual C++ 6 (or later but there is no project file up to date)
-DX SDK9 (probably compile with DX SDK8 also)
-faad2 module in the FAAC CVS (http://sourceforge.net/projects/faac/)
-
-
-How to compile the filter :
----------------------------
-
-First you need to compile the DirectShow BaseClasses available in the
-SDK ($DXSDK\Samples\C++\DirectShow\BaseClasses).
-
-Make sure you have the path to the include files and to the library in
-your Visual C++ options (they must be at the top of the list).
-- Include :
-$DXSDK\Include
-$DXSDK\Samples\C++\DirectShow\BaseClasses\
-- Library :
-$DXSDK\Lib
-$DXSDK\Samples\C++\DirectShow\BaseClasses\Debug
-$DXSDK\Samples\C++\DirectShow\BaseClasses\Release
-
-The faad2 directory must be at the same level as the CoreAAC directory.
-
-Now you can open the project workspace CoreAAC.dsw and compile the filter.
-
-
-Registering the filter :
-------------------------
-
-The filter is automatically registered with the project file provided.
-If you want to register/unregister the filter manually you can use the
-following commands :
-To register : regsvr32 CoreAAC.ax
-To unregister : regsvr32 /u CoreAAC.ax
-
-Also some .bat files are provided :
-register_release.bat
-unregister_release.bat
-register_debug.bat
-unregister_debug.bat
-
-
-Installer
----------
-
-To create the installer you need to install NSIS
-(http://nsis.sourceforge.net/)
-
-Just right click on the file CoreAAC.nsi and select "Compile NSI".
-The file Redist\CoreAAC.exe should be created.
--- a/CoreAAC/register_debug.bat
+++ /dev/null
@@ -1,1 +1,0 @@
-regsvr32 debug\CoreAAC.ax
--- a/CoreAAC/register_release.bat
+++ /dev/null
@@ -1,1 +1,0 @@
-regsvr32 release\CoreAAC.ax
--- a/CoreAAC/resource.h
+++ /dev/null
@@ -1,32 +1,0 @@
-//{{NO_DEPENDENCIES}}-// Microsoft Developer Studio generated include file.
-// Used by aacdec.rc
-//
-#define IDS_ABOUT 1
-#define IDS_INFO 2
-#define IDD_ABOUT 101
-#define IDD_DIALOG_INFO 102
-#define IDB_BITMAP_AAC_LOGO 105
-#define IDC_STATIC_VERSION 1000
-#define IDC_LABEL_PROFILE 1001
-#define IDC_LABEL_SAMPLERATE 1002
-#define IDC_LABEL_CHANNELS 1003
-#define IDC_LABEL_IBITRATE 1004
-#define IDC_LABEL_BITRATE 1004
-#define IDC_LABEL_BPS 1005
-#define IDC_STATIC_FAAD_VERSION 1006
-#define IDC_LABEL_FRAMES_DECODED 1007
-#define IDC_CHECK1 1008
-#define IDC_CHECK_DOWNMIX 1008
-#define IDC_STATIC -1
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 106
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1009
-#define _APS_NEXT_SYMED_VALUE 102
-#endif
-#endif
binary files a/CoreAAC/resource/aac_logo_sm.bmp /dev/null differ
--- a/CoreAAC/unregister_debug.bat
+++ /dev/null
@@ -1,1 +1,0 @@
-regsvr32 /u debug\CoreAAC.ax
--- a/CoreAAC/unregister_release.bat
+++ /dev/null
@@ -1,1 +1,0 @@
-regsvr32 /u release\CoreAAC.ax