ref: 6de315c5c8219b3b43f05962b72cff50b5db5e60
parent: 47faef7a1d0b5f55a876166b2fc2ded00309e352
author: menno <menno>
date: Fri Oct 26 07:21:23 EDT 2001
Enable RAW aac output in the frontends
--- a/frontend/faac.dsp
+++ b/frontend/faac.dsp
@@ -100,11 +100,19 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
+SOURCE="E:\Program Files\Microsoft Visual Studio\VC98\Include\BASETSD.H"
+# End Source File
+# Begin Source File
+
SOURCE=..\include\faac.h
# End Source File
# Begin Source File
SOURCE=..\common\getopt\getopt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\common\libsndfile\src\sndfile.h
# End Source File
# Begin Source File
--- a/frontend/faacgui.dsp
+++ b/frontend/faacgui.dsp
@@ -25,7 +25,7 @@
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
MTL=midl.exe
RSC=rc.exe
@@ -51,7 +51,7 @@
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# SUBTRACT LINK32 /profile /nodefaultlib
@@ -78,7 +78,7 @@
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
@@ -99,6 +99,10 @@
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE="E:\Program Files\Microsoft Visual Studio\VC98\Include\BASETSD.H"
+# End Source File
# Begin Source File
SOURCE=..\include\faac.h
--- a/frontend/faacgui.rc
+++ b/frontend/faacgui.rc
@@ -85,8 +85,8 @@
LTEXT "Bitrate:",IDC_STATIC,98,73,37,8
LTEXT "bps/ch",IDC_STATIC,151,85,24,8
LTEXT "Hz",IDC_STATIC,152,112,10,8
- CONTROL "Use LFE channel",IDC_USELFE,"Button",BS_AUTOCHECKBOX |
- BS_LEFTTEXT | WS_DISABLED | WS_TABSTOP,14,103,71,10
+ CONTROL "Use RAW output",IDC_USERAW,"Button",BS_AUTOCHECKBOX |
+ BS_LEFTTEXT | WS_TABSTOP,14,103,71,10
CONTROL "Use TNS",IDC_USETNS,"Button",BS_AUTOCHECKBOX |
BS_LEFTTEXT | WS_TABSTOP,14,92,71,10
RTEXT "-",IDC_COMPILEDATE,194,170,63,8
@@ -96,6 +96,8 @@
WS_VSCROLL | WS_TABSTOP
LTEXT "MPEG Verion",IDC_STATIC,183,73,44,8
LTEXT "AAC Object Type",IDC_STATIC,183,100,56,8
+ CONTROL "Use LFE channel",IDC_USELFE,"Button",BS_AUTOCHECKBOX |
+ BS_LEFTTEXT | WS_DISABLED | WS_TABSTOP,14,114,71,10
END
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: main.c,v 1.22 2001/06/25 07:45:33 menno Exp $
+ * $Id: main.c,v 1.23 2001/10/26 11:21:23 menno Exp $
*/
#ifdef _WIN32
@@ -62,7 +62,7 @@
int main(int argc, char *argv[])
{- int i, frames, currentFrame;
+ int frames, currentFrame;
faacEncHandle hEncoder;
SNDFILE *infile;
SF_INFO sfinfo;
@@ -75,6 +75,7 @@
unsigned int objectType = LOW;
unsigned int useMidSide = 1;
unsigned int useTns = 0;
+ unsigned int useAdts = 1;
unsigned int cutOff = 18000;
unsigned long bitRate = 64000;
@@ -112,6 +113,7 @@
static struct option long_options[] = { { "mpeg", 0, 0, 'm' }, { "objecttype", 0, 0, 'o' },+ { "raw", 0, 0, 'r' }, { "nomidside", 0, 0, 'n' }, { "usetns", 0, 0, 't' }, { "cutoff", 1, 0, 'c' },@@ -118,7 +120,7 @@
{ "bitrate", 1, 0, 'b' }};
- c = getopt_long(argc, argv, "m:o:ntc:b:",
+ c = getopt_long(argc, argv, "m:o:rntc:b:",
long_options, &option_index);
if (c == -1)
@@ -159,6 +161,10 @@
}
break;
}
+ case 'r': {+ useAdts = 0;
+ break;
+ }
case 'n': {useMidSide = 0;
break;
@@ -201,6 +207,7 @@
fprintf(stderr, " -m X AAC MPEG version, X can be 2 or 4.\n");
fprintf(stderr, " -o X AAC object type, X can be LC, MAIN or LTP.\n");
fprintf(stderr, " -n Don\'t use mid/side coding.\n");
+ fprintf(stderr, " -r RAW AAC output file.\n");
fprintf(stderr, " -t Use TNS coding.\n");
fprintf(stderr, " -c X Set the bandwidth, X in Hz.\n");
fprintf(stderr, " -b X Set the bitrate per channel, X in bps.\n\n");
@@ -245,6 +252,7 @@
myFormat->allowMidside = useMidSide;
myFormat->bitRate = bitRate;
myFormat->bandWidth = cutOff;
+ myFormat->outputFormat = useAdts;
if (!faacEncSetConfiguration(hEncoder, myFormat)) {fprintf(stderr, "Unsupported output format!\n");
return 1;
--- a/frontend/maingui.c
+++ b/frontend/maingui.c
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: maingui.c,v 1.17 2001/06/08 18:01:09 menno Exp $
+ * $Id: maingui.c,v 1.18 2001/10/26 11:21:23 menno Exp $
*/
#include <windows.h>
@@ -157,6 +157,7 @@
config->allowMidside = IsDlgButtonChecked(hWnd, IDC_ALLOWMIDSIDE) == BST_CHECKED ? 1 : 0;
config->useTns = IsDlgButtonChecked(hWnd, IDC_USETNS) == BST_CHECKED ? 1 : 0;
config->useLfe = IsDlgButtonChecked(hWnd, IDC_USELFE) == BST_CHECKED ? 1 : 0;
+ config->outputFormat = IsDlgButtonChecked(hWnd, IDC_USERAW) == BST_CHECKED ? 0 : 1;
config->mpegVersion = SendMessage(GetDlgItem(hWnd, IDC_MPEGVERSION), CB_GETCURSEL, 0, 0);
config->aacObjectType = SendMessage(GetDlgItem(hWnd, IDC_OBJECTTYPE), CB_GETCURSEL, 0, 0);
@@ -307,6 +308,7 @@
CheckDlgButton(hWnd, IDC_ALLOWMIDSIDE, TRUE);
CheckDlgButton(hWnd, IDC_USELFE, FALSE);
+ CheckDlgButton(hWnd, IDC_USERAW, FALSE);
CheckDlgButton(hWnd, IDC_USETNS, TRUE);
SetDlgItemText(hWnd, IDC_BITRATE, "64000");
SetDlgItemText(hWnd, IDC_BANDWIDTH, "18000");
--- a/frontend/resource.h
+++ b/frontend/resource.h
@@ -13,14 +13,16 @@
#define IDC_TIME 1008
#define IDC_BANDWIDTH 1009
#define IDC_BITRATE 1010
-#define IDC_USELFE 1011
+#define IDC_USERAW 1011
#define IDC_USETNS 1012
+#define IDC_USELFE2 1013
+#define IDC_USELFE 1013
#define IDC_COMPILEDATE 1018
#define IDC_MPEGVERSION 1020
#define IDC_OBJECTTYPE 1021
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 104