ref: 3ade1a7f63615c67453091af46209c8b511eba12
parent: 7931bb59b42c060b984a43c60c784e8bf31ccaf4
author: menno <menno>
date: Thu May 22 16:03:27 EDT 2003
CoreAAC DShow filter added
--- /dev/null
+++ b/CoreAAC/COPYING
@@ -1,0 +1,340 @@
+ 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.
--- /dev/null
+++ b/CoreAAC/aacdec.cpp
@@ -1,0 +1,449 @@
+/*
+ * CoreAAC - AAC DirectShow Decoder Filter
+ *
+ * Modification to decode AAC without ADTS and multichannel support
+ * christophe.paris@free.fr
+ */
+
+/*
+ * 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 <dvdmedia.h>
+#include <transfrm.h>
+
+#include <mmreg.h>
+#include <ks.h>
+#include <ksmedia.h>
+
+#include "aacdec.h"
+
+// ===========================================================================================
+#include <stdio.h>
+
+#if defined(_DEBUG)
+ void DBGOUT(char *s, ...)
+ {+ char b[1024];
+ va_list args;
+
+ va_start(args, s);
+ vsprintf(b, s, args);
+ va_end(args);
+ OutputDebugString(b);
+ }
+#else
+ #define DBGOUT
+#endif
+
+// ===========================================================================================
+/*
+// As for today there is no Dolby's AAC waveformat tag registered at Microsoft
+// I have choosen 0xAAC0 because it looks nice, but when Dolby registers this format
+// then we may get in trouble since on 99.9% it will _NOT_ be 0xAAC0
+
+#define WAVE_FORMAT_AAC 0xAAC0
+
+// {0000aac0-0000-0010-8000-00AA00389B71}+DEFINE_GUID(MEDIASUBTYPE_AAC,
+ WAVE_FORMAT_AAC, 0x000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+*/
+
+// Be compatible with 3ivx
+#define WAVE_FORMAT_AAC 0x00FF
+
+// {000000FF-0000-0010-8000-00AA00389B71}+DEFINE_GUID(MEDIASUBTYPE_AAC,
+ WAVE_FORMAT_AAC, 0x000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+
+
+// ===========================================================================================
+// 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, CDecoder::CreateInstance, NULL, &sudDecoder },+ { L"CoreAAC Audio Decoder About", &CLSID_ABOUT, CAbout::CreateInstance}+};
+
+// Count of objects listed in g_cTemplates
+int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]);
+
+// ===========================================================================================
+
+STDAPI DllRegisterServer()
+{+ DBGOUT("RegisterServer\n");+ return AMovieDllRegisterServer2(TRUE);
+}
+
+// -------------------------------------------------------------------------------------------
+
+STDAPI DllUnregisterServer()
+{+ DBGOUT("UnregisterServer\n");+ 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 CDecoder :: CreateInstance(LPUNKNOWN punk, HRESULT *phr)
+{+ DBGOUT("CreateInstance\n");+ CDecoder *pNewObject = new CDecoder(punk, phr);
+ if (!pNewObject)
+ *phr = E_OUTOFMEMORY;
+ return pNewObject;
+}
+
+// -------------------------------------------------------------------------------------------
+
+CDecoder :: ~CDecoder()
+{+ if(m_decHandle)
+ {+ faacDecClose(m_decHandle);
+ m_decHandle = NULL;
+ }
+ if(m_decoderSpecific)
+ {+ delete m_decoderSpecific;
+ m_decoderSpecific = NULL;
+ }
+}
+
+// -------------------------------------------------------------------------------------------
+
+STDMETHODIMP CDecoder :: NonDelegatingQueryInterface(REFIID riid, void **ppv)
+{+ if (riid == IID_ISpecifyPropertyPages)
+ return GetInterface((ISpecifyPropertyPages *)this, ppv);
+
+ return CTransformFilter::NonDelegatingQueryInterface(riid, ppv);
+}
+
+// -------------------------------------------------------------------------------------------
+// property pages
+
+STDMETHODIMP CDecoder :: GetPages(CAUUID *pPages)
+{+ DBGOUT("GetPages\n");+
+ pPages->cElems = 1;
+ pPages->pElems = (GUID *)CoTaskMemAlloc(pPages->cElems * sizeof(GUID));
+ if (!pPages->pElems)
+ return E_OUTOFMEMORY;
+
+ pPages->pElems[0] = CLSID_ABOUT;
+
+ return S_OK;
+}
+
+// -------------------------------------------------------------------------------------------
+
+STDMETHODIMP CDecoder :: FreePages(CAUUID *pPages)
+{+ DBGOUT("FreePages\n");+
+ CoTaskMemFree(pPages->pElems);
+ return S_OK;
+}
+
+// ===========================================================================================
+// accept only aac audio wrapped in waveformat
+
+HRESULT CDecoder :: CheckInputType(const CMediaType *mtIn)
+{+ DBGOUT("CheckInputType\n");+
+ 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;
+
+ if (mtIn->IsTemporalCompressed())
+ 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 CDecoder :: GetMediaType(int iPosition, CMediaType *mtOut)
+{+ DBGOUT("GetMediaType\n");+
+ if (!m_pInput->IsConnected())
+ return E_UNEXPECTED;
+
+ if (iPosition < 0)
+ return E_INVALIDARG;
+
+ if (iPosition > 0)
+ return VFW_S_NO_MORE_ITEMS;
+
+
+ WAVEFORMATEXTENSIBLE wfex;
+ ZeroMemory(&wfex, sizeof(WAVEFORMATEXTENSIBLE));
+
+ wfex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+ wfex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE);
+ wfex.Format.nChannels = (unsigned short)m_Channels;
+ wfex.Format.nSamplesPerSec = (unsigned short)m_SamplesPerSec;
+ wfex.Format.wBitsPerSample = (unsigned short)m_BitesPerSample;
+ 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 6:
+ wfex.dwChannelMask = KSAUDIO_SPEAKER_5POINT1;
+ break;
+ default:
+ break;
+ }
+ wfex.Samples.wValidBitsPerSample = wfex.Format.wBitsPerSample;
+ wfex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
+
+ mtOut->SetType(&MEDIATYPE_Audio);
+ mtOut->SetSubtype(&MEDIASUBTYPE_PCM);
+ mtOut->SetFormatType(&FORMAT_WaveFormatEx);
+ mtOut->SetFormat( (BYTE*) &wfex,sizeof(WAVEFORMATEXTENSIBLE));
+ mtOut->SetTemporalCompression(FALSE);
+
+ return S_OK;
+}
+
+// -------------------------------------------------------------------------------------------
+
+HRESULT CDecoder :: CheckTransform(const CMediaType *mtIn, const CMediaType *mtOut)
+{+ DBGOUT("CheckTransform\n");+
+ if (*mtOut->FormatType() != FORMAT_WaveFormatEx)
+ return VFW_E_INVALIDMEDIATYPE;
+
+ if (mtOut->FormatLength() < sizeof(WAVEFORMATEX))
+ return VFW_E_INVALIDMEDIATYPE;
+
+ if (((WAVEFORMATEX *)mtIn->Format())->nSamplesPerSec != ((WAVEFORMATEX *)mtOut->Format())->nSamplesPerSec)
+ return VFW_E_TYPE_NOT_ACCEPTED;
+
+ // should we compare whole waveformat here???
+ return S_OK;
+}
+
+// -------------------------------------------------------------------------------------------
+#define MAXFRAMELEN 1024 // 960 for LD or else 1024
+
+HRESULT CDecoder :: DecideBufferSize(IMemAllocator *pAllocator, ALLOCATOR_PROPERTIES *pProperties)
+{+ DBGOUT("DecideBufferSize\n");+ pProperties->cBuffers = 1;
+ pProperties->cbBuffer = m_Channels * MAXFRAMELEN * 2;
+
+ DBGOUT("CDecoder::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 CDecoder :: CompleteConnect(PIN_DIRECTION direction, IPin *pReceivePin)
+{+ DBGOUT("CompleteConnect\n"); + HRESULT hr = CTransformFilter::CompleteConnect(direction, pReceivePin);
+
+ if(direction == PINDIR_INPUT)
+ {+ if(m_decHandle)
+ {+ faacDecClose(m_decHandle);
+ m_decHandle = NULL;
+ }
+ m_decHandle = faacDecOpen();
+
+ // 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;
+ }
+
+ // WAVEFORMATEX used for output mediatype
+ m_Channels = Channels;
+ m_SamplesPerSec = SamplesPerSec;
+ m_BitesPerSample = 16; // XXX : can it be different ???
+ }
+
+ return hr;
+}
+
+// -------------------------------------------------------------------------------------------
+
+HRESULT CDecoder :: Transform(IMediaSample *pIn, IMediaSample *pOut)
+{+ DBGOUT("Transform\n");+
+ if (m_State == State_Stopped)
+ { + pOut->SetActualDataLength(0);
+ return S_OK;
+ }
+
+ // Decode the sample data
+ DWORD ActualDstLength;
+ BYTE *pSrc, *pDst;
+ DWORD SrcLength = pIn->GetActualDataLength();
+ DWORD DstLength = pOut->GetSize();
+ pIn->GetPointer(&pSrc);
+ pOut->GetPointer(&pDst);
+
+ // Decode data
+ if(!Decode(pSrc, SrcLength, pDst, DstLength, &ActualDstLength))
+ return S_FALSE;
+
+ DBGOUT("Transform: %u->%u (%u)\n", SrcLength, ActualDstLength, DstLength);+
+ // Copy the actual data length
+ pOut->SetActualDataLength(ActualDstLength);
+ return S_OK;
+}
+
+// ===========================================================================================
+
+bool CDecoder :: 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)
+ {+ DBGOUT("AAC: Error %d [%s]\n", frameInfo.error, faacDecGetErrorMessage(frameInfo.error));+ return false;
+ }
+
+ if (!frameInfo.error && outsamples)
+ memcpy(pDst, outsamples, frameInfo.samples * 2);
+ else
+ return false;
+
+ *ActualDstLength = frameInfo.samples * 2;
+ return true;
+}
+
+// ===========================================================================================
--- /dev/null
+++ b/CoreAAC/aacdec.def
@@ -1,0 +1,8 @@
+; This file provides declarations of the entrypoints in the DLL.
+
+LIBRARY CoreAAC.ax
+EXPORTS
+ DllGetClassObject PRIVATE
+ DllCanUnloadNow PRIVATE
+ DllRegisterServer PRIVATE
+ DllUnregisterServer PRIVATE
--- /dev/null
+++ b/CoreAAC/aacdec.dsp
@@ -1,0 +1,255 @@
+# Microsoft Developer Studio Project File - Name="aacdec" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=aacdec - 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 "aacdec.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 "aacdec.mak" CFG="aacdec - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "aacdec - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "aacdec - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "aacdec - Win32 Release Unicode" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "aacdec - 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)" == "aacdec - 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:".\aacdec.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)" == "aacdec - 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)" == "aacdec - 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\aacdec.ax" /libpath:"..\..\..\..\lib" /subsystem:windows,4.0 /opt:ref /release /debug:none /OPT:NOREF /OPT:ICF /ignore:4089 /ignore:4078
+
+!ELSEIF "$(CFG)" == "aacdec - 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\aacdec.ax" /libpath:"..\..\..\..\lib" /debug:mapped,full /subsystem:windows,4.0 /ignore:4089 /ignore:4078
+
+!ENDIF
+
+# Begin Target
+
+# Name "aacdec - Win32 Release"
+# Name "aacdec - Win32 Debug"
+# Name "aacdec - Win32 Release Unicode"
+# Name "aacdec - Win32 Debug Unicode"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\aacdec.cpp
+DEP_CPP_AACDE=\
+ ".\aacdec.h"\
+ ".\faad2\include\faad.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=.\aacdec.def
+
+!IF "$(CFG)" == "aacdec - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "aacdec - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "aacdec - Win32 Release Unicode"
+
+!ELSEIF "$(CFG)" == "aacdec - Win32 Debug Unicode"
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\aacdec.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\faad2\include\faad.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=.\aacdec.rc
+# End Source File
+# End Group
+# End Target
+# End Project
--- /dev/null
+++ b/CoreAAC/aacdec.dsw
@@ -1,0 +1,44 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "aacdec"=.\aacdec.dsp - Package Owner=<4>
+
+Package=<5>
+{{{+}}}
+
+Package=<4>
+{{{+ Begin Project Dependency
+ Project_Dep_Name libfaad
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libfaad"=..\libfaad\libfaad.dsp - Package Owner=<4>
+
+Package=<5>
+{{{+}}}
+
+Package=<4>
+{{{+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{+}}}
+
+Package=<3>
+{{{+}}}
+
+###############################################################################
+
--- /dev/null
+++ b/CoreAAC/aacdec.h
@@ -1,0 +1,114 @@
+/*
+ * CoreAAC - AAC DirectShow Decoder Filter
+ *
+ * Modification to decode AAC without ADTS and multichannel support
+ * christophe.paris@free.fr
+ */
+
+/*
+ * 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 "..\\include\\faad.h"
+#include "resource.h"
+
+#define FILTER_VERSION "1.0b"
+
+// ===========================================================================================
+
+// {6AC7C19E-8CA0-4e3d-9A9F-2881DE29E0AC}+DEFINE_GUID(CLSID_DECODER, 0x6ac7c19e, 0x8ca0, 0x4e3d, 0x9a, 0x9f, 0x28, 0x81, 0xde, 0x29, 0xe0, 0xac);
+
+class CDecoder : public CTransformFilter, public ISpecifyPropertyPages
+{+public :
+ DECLARE_IUNKNOWN
+ static CUnknown *WINAPI CreateInstance(LPUNKNOWN punk, HRESULT *phr);
+ STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
+
+ CDecoder(LPUNKNOWN lpunk, HRESULT *phr) :
+ CTransformFilter(NAME("AAC Audio Decoder"), lpunk, CLSID_DECODER),+ m_decHandle(NULL),
+ m_decoderSpecificLen(0),
+ m_decoderSpecific(NULL)
+ { }+
+ virtual ~CDecoder();
+
+ // property pages
+ STDMETHODIMP GetPages(CAUUID *pPages);
+ STDMETHODIMP FreePages(CAUUID *pPages);
+
+ // ITransformFilter interface methods
+ 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);
+
+ bool Decode(BYTE *pSrc, DWORD SrcLength, BYTE *pDst, DWORD DstLength, DWORD *ActualDstLength);
+
+private:
+ unsigned char* m_decoderSpecific;
+ int m_decoderSpecificLen;
+ faacDecHandle m_decHandle;
+ int m_Channels;
+ int m_SamplesPerSec;
+ int m_BitesPerSample;
+};
+
+// ===========================================================================================
+// simple about page
+
+// {4665E44B-8B9A-4515-A086-E94ECE374608}+DEFINE_GUID(CLSID_ABOUT, 0x4665e44b, 0x8b9a, 0x4515, 0xa0, 0x86, 0xe9, 0x4e, 0xce, 0x37, 0x46, 0x8);
+
+class CAbout : public CBasePropertyPage
+{+public:
+ static CUnknown *WINAPI CreateInstance(LPUNKNOWN punk, HRESULT *phr)
+ {+ CAbout *pNewObject = new CAbout(punk, phr);
+ if (!pNewObject)
+ *phr = E_OUTOFMEMORY;
+ return pNewObject;
+ }
+
+ CAbout(LPUNKNOWN pUnk, HRESULT *phr) :
+ CBasePropertyPage(NAME("About"), pUnk, IDD_ABOUT, IDS_ABOUT)+ { }+
+ ~CAbout()
+ { }+
+ HRESULT OnActivate()
+ { + SetDlgItemText(m_hwnd,IDC_STATIC_VERSION,"Version " FILTER_VERSION " - ("__DATE__", "__TIME__")");+ return S_OK;
+ }
+
+ BOOL OnReceiveMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+ {+ return CBasePropertyPage::OnReceiveMessage(hwnd, uMsg, wParam, lParam);
+ }
+};
+
+// ===========================================================================================
--- /dev/null
+++ b/CoreAAC/aacdec.rc
@@ -1,0 +1,178 @@
+//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
+
+/////////////////////////////////////////////////////////////////////////////
+// Polish resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PLK)
+#ifdef _WIN32
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+#pragma code_page(1250)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_ABOUT "About"
+END
+
+#endif // Polish resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// 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, 212, 142
+STYLE WS_CHILD | WS_VISIBLE
+FONT 8, "Tahoma"
+BEGIN
+ GROUPBOX "CoreAAC Decoder",IDC_STATIC,4,4,204,130,BS_CENTER
+ CTEXT "Copyright � 2003 Robert Cioch",IDC_STATIC,7,65,198,8,
+ SS_CENTERIMAGE
+ CTEXT "This software is based on :",IDC_STATIC,8,37,196,8,
+ SS_CENTERIMAGE
+ CTEXT "FAAD2 v1.1 - Freeware Advanced Audio Decoder",
+ IDC_STATIC,7,97,198,8,SS_CENTERIMAGE
+ CTEXT "Copyright � 2002 Menno Bakker",IDC_STATIC,7,108,198,8,
+ SS_CENTERIMAGE
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,8,90,197,1
+ CTEXT "http://www.audiocoding.com",IDC_STATIC,7,119,198,8,
+ SS_CENTERIMAGE
+ CTEXT "http://www.borgtech.org",IDC_STATIC,7,76,198,8,
+ SS_CENTERIMAGE
+ CTEXT "AAC Decoder v1.1",IDC_STATIC,7,54,198,8,SS_CENTERIMAGE
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,49,198,1
+ CTEXT "http://corecodec.org/projects/coreaac/",IDC_STATIC,7,26,
+ 198,8
+ CTEXT "Version 1.0b - (May 21 2003, 17:05:09)",
+ IDC_STATIC_VERSION,7,15,198,8
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE
+BEGIN
+ IDD_ABOUT, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 205
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 135
+ 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,166
+ PRODUCTVERSION 1,1,0,166
+ 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://www.borgtech.org\r\n\r\nWe are the Borg.\r\nResistance is futile.\0"
+ VALUE "FileDescription", "AAC DirectShow Decoder\0"
+ VALUE "FileVersion", "1, 1, 0, 166\0"
+ VALUE "InternalName", "aacdec\0"
+ VALUE "LegalCopyright", "Copyright � 2003 Robert Cioch\0"
+ VALUE "OriginalFilename", "aacdec.ax\0"
+ VALUE "ProductVersion", "1, 1, 0, 166\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#endif // !_MAC
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
--- /dev/null
+++ b/CoreAAC/aacdec.vcproj
@@ -1,0 +1,373 @@
+<?xml version="1.0" encoding = "windows-1250"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.00"
+ Name="aacdec"
+ ProjectGUID="{FB7F9727-0B56-4995-997B-5AD8A70940A4}"+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="2"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2"
+ WholeProgramOptimization="TRUE">
+ <Tool
+ Name="VCCLCompilerTool"
+ GlobalOptimizations="TRUE"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="TRUE"
+ FavorSizeOrSpeed="1"
+ OptimizeForProcessor="0"
+ OptimizeForWindowsApplication="TRUE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;RELEASE"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\Release/aacdec.pch"
+ AssemblerListingLocation=".\Release/"
+ ObjectFile=".\Release/"
+ ProgramDataBaseFileName=".\Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CallingConvention="2"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="strmbase.lib winmm.lib odbc32.lib odbccp32.lib"
+ OutputFile="Release/aacdec.ax"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ ModuleDefinitionFile=".\aacdec.def"
+ ProgramDatabaseFile=".\Release/aacdec.pdb"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ OptimizeForWindows98="2"
+ EntryPointSymbol="DllEntryPoint@12"
+ ImportLibrary=".\Release/aacdec.lib"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Release/aacdec.tlb"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1045"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="2"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DEBUG"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Debug/aacdec.pch"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CallingConvention="2"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="strmbasd.lib winmm.lib odbc32.lib odbccp32.lib"
+ OutputFile="Debug/aacdec.ax"
+ LinkIncremental="2"
+ SuppressStartupBanner="TRUE"
+ ModuleDefinitionFile=".\aacdec.def"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\Debug/aacdec.pdb"
+ OptimizeForWindows98="0"
+ EntryPointSymbol="DllEntryPoint@12"
+ ImportLibrary=".\Debug/aacdec.lib"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Debug/aacdec.tlb"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1045"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ </Configurations>
+ <Files>
+ <Filter
+ Name="faad2"
+ Filter="">
+ <File
+ RelativePath="faad2\libfaad\analysis.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\bits.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\bits.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\cfft.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\cfft.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\common.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\common.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\data.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\data.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\decoder.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\decoder.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\drc.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\drc.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\error.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\error.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\filtbank.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\filtbank.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\huffman.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\ic_predict.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\ic_predict.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\is.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\is.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\kbd_win.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\lt_predict.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\lt_predict.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\mdct.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\mdct.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\mp4.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\mp4.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\ms.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\ms.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\output.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\output.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\pns.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\pns.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\pulse.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\pulse.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\reordered_spectral_data.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\rvlc_scale_factors.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\rvlc_scale_factors.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\sbr_dec.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\sbr_dec.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\sbr_huff.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\sbr_huff.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\sbr_qmf.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\sbr_qmf.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\sbr_syntax.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\sbr_syntax.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\specrec.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\specrec.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\syntax.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\syntax.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\tns.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\tns.h">
+ </File>
+ <Filter
+ Name="codebook"
+ Filter="">
+ <File
+ RelativePath="faad2\libfaad\codebook\hcb.h">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\codebook\hcb_1.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\codebook\hcb_10.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\codebook\hcb_11.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\codebook\hcb_2.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\codebook\hcb_3.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\codebook\hcb_4.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\codebook\hcb_5.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\codebook\hcb_6.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\codebook\hcb_7.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\codebook\hcb_8.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\codebook\hcb_9.c">
+ </File>
+ <File
+ RelativePath="faad2\libfaad\codebook\hcb_sf.c">
+ </File>
+ </Filter>
+ </Filter>
+ <File
+ RelativePath=".\aacdec.cpp">
+ </File>
+ <File
+ RelativePath=".\aacdec.def">
+ </File>
+ <File
+ RelativePath=".\aacdec.h">
+ </File>
+ <File
+ RelativePath=".\aacdec.rc">
+ </File>
+ <File
+ RelativePath="faad2\include\faad.h">
+ </File>
+ <File
+ RelativePath="resource.h">
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
--- /dev/null
+++ b/CoreAAC/register_debug.bat
@@ -1,0 +1,1 @@
+regsvr32 debug\CoreAAC.ax
--- /dev/null
+++ b/CoreAAC/register_release.bat
@@ -1,0 +1,1 @@
+regsvr32 release\CoreAAC.ax
--- /dev/null
+++ b/CoreAAC/resource.h
@@ -1,0 +1,19 @@
+//{{NO_DEPENDENCIES}}+// Microsoft Developer Studio generated include file.
+// Used by aacdec.rc
+//
+#define IDS_ABOUT 1
+#define IDD_ABOUT 101
+#define IDC_STATIC_VERSION 1000
+#define IDC_STATIC -1
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 102
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 102
+#endif
+#endif
--- /dev/null
+++ b/CoreAAC/unregister_debug.bat
@@ -1,0 +1,1 @@
+regsvr32 /u debug\CoreAAC.ax
--- /dev/null
+++ b/CoreAAC/unregister_release.bat
@@ -1,0 +1,1 @@
+regsvr32 /u release\CoreAAC.ax