Update of /cvsroot/audacity/audacity-src/src/include
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv2100
Modified Files:
BladeMP3EncDLL.h lame.h
Log Message:
Update to version 3.92
Index: BladeMP3EncDLL.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/include/BladeMP3EncDLL.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- BladeMP3EncDLL.h 20 Mar 2007 07:39:51 -0000 1.4
+++ BladeMP3EncDLL.h 22 Apr 2007 18:44:39 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * Blade DLL Interface for LAME.
+ * Blade Type of DLL Interface for MP2Enc.
*
- * Copyright (c) 1999 A.L. Faber
+ * Copyright (c) 1999-2002 A.L. Faber
* Based on bladedll.h version 1.0 written by Jukka Poikolainen
*
* This library is free software; you can redistribute it and/or
@@ -26,6 +26,10 @@
#pragma pack(push)
#pragma pack(1)
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* encoding formats */
#define BE_CONFIG_MP3 0
@@ -70,17 +74,6 @@
#define CURRENT_STRUCT_VERSION 1
#define CURRENT_STRUCT_SIZE sizeof(BE_CONFIG) // is currently 331 bytes
-/* OBSOLETE, VALUES STILL WORK
-typedef enum
-{
- NORMAL_QUALITY=0,
- LOW_QUALITY,
- HIGH_QUALITY,
- VOICE_QUALITY
-} LAME_QUALTIY_PRESET;
-
-*/
-
typedef enum
{
@@ -94,15 +87,22 @@
typedef enum
{
- LQP_NOPRESET=-1,
+ LQP_NOPRESET =-1,
// QUALITY PRESETS
- LQP_NORMAL_QUALITY=0,
- LQP_LOW_QUALITY,
- LQP_HIGH_QUALITY,
- LQP_VOICE_QUALITY,
- LQP_R3MIX_QUALITY,
- LQP_VERYHIGH_QUALITY,
+ LQP_NORMAL_QUALITY = 0,
+ LQP_LOW_QUALITY = 1,
+ LQP_HIGH_QUALITY = 2,
+ LQP_VOICE_QUALITY = 3,
+ LQP_R3MIX = 4,
+ LQP_VERYHIGH_QUALITY = 5,
+ LQP_STANDARD = 6,
+ LQP_FAST_STANDARD = 7,
+ LQP_EXTREME = 8,
+ LQP_FAST_EXTREME = 9,
+ LQP_INSANE = 10,
+ LQP_ABR = 11,
+ LQP_CBR = 12,
// NEW PRESET VALUES
LQP_PHONE =1000,
@@ -127,7 +127,7 @@
struct {
- DWORD dwSampleRate; // 48000, 44100 and 32000
allowed
+ DWORD dwSampleRate; // 48000, 44100 and
32000 allowed
BYTE byMode; // BE_MP3_MODE_STEREO,
BE_MP3_MODE_DUALCHANNEL, BE_MP3_MODE_MONO
WORD wBitrate; // 32, 40, 48, 56, 64,
80, 96, 112, 128, 160, 192, 224, 256 and 320 allowed
BOOL bPrivate;
@@ -144,21 +144,21 @@
DWORD dwStructSize;
// BASIC ENCODER SETTINGS
- DWORD dwSampleRate; // SAMPLERATE
OF INPUT FILE
- DWORD dwReSampleRate; //
DOWNSAMPLERATE, 0=ENCODER DECIDES
- LONG nMode; //
BE_MP3_MODE_STEREO, BE_MP3_MODE_DUALCHANNEL, BE_MP3_MODE_MONO
- DWORD dwBitrate; // CBR
bitrate, VBR min bitrate
- DWORD dwMaxBitrate; // CBR ignored,
VBR Max bitrate
- LONG nPreset; //
Quality preset, use one of the settings of the LAME_QUALITY_PRESET enum
- DWORD dwMpegVersion; // FUTURE USE,
MPEG-1 OR MPEG-2
- DWORD dwPsyModel; //
FUTURE USE, SET TO 0
- DWORD dwEmphasis; //
FUTURE USE, SET TO 0
+ DWORD dwSampleRate; //
SAMPLERATE OF INPUT FILE
+ DWORD dwReSampleRate; //
DOWNSAMPLERATE, 0=ENCODER DECIDES
+ LONG nMode;
// BE_MP3_MODE_STEREO, BE_MP3_MODE_DUALCHANNEL, BE_MP3_MODE_MONO
+ DWORD dwBitrate;
// CBR bitrate, VBR min bitrate
+ DWORD dwMaxBitrate; // CBR
ignored, VBR Max bitrate
+ LONG nPreset;
// Quality preset, use one of the settings of the LAME_QUALITY_PRESET enum
+ DWORD dwMpegVersion; //
FUTURE USE, MPEG-1 OR MPEG-2
+ DWORD dwPsyModel;
// FUTURE USE, SET TO 0
+ DWORD dwEmphasis;
// FUTURE USE, SET TO 0
// BIT STREAM SETTINGS
- BOOL bPrivate; // Set
Private Bit (TRUE/FALSE)
- BOOL bCRC; //
Insert CRC (TRUE/FALSE)
- BOOL bCopyright; // Set
Copyright Bit (TRUE/FALSE)
- BOOL bOriginal; // Set
Original Bit (TRUE/FALSE)
+ BOOL bPrivate;
// Set Private Bit (TRUE/FALSE)
+ BOOL bCRC;
// Insert CRC (TRUE/FALSE)
+ BOOL bCopyright;
// Set Copyright Bit (TRUE/FALSE)
+ BOOL bOriginal;
// Set Original Bit (TRUE/FALSE)
// VBR STUFF
BOOL bWriteVBRHeader; //
WRITE XING VBR HEADER (TRUE/FALSE)
@@ -166,9 +166,11 @@
INT nVBRQuality;
// VBR QUALITY 0..9
DWORD dwVbrAbr_bps; // Use
ABR in stead of nVBRQuality
VBRMETHOD nVbrMethod;
- BOOL bNoRes;
// Disable Bit resorvoir
+ BOOL bNoRes;
// Disable Bit resorvoir (TRUE/FALSE)
- BYTE
btReserved[255-3*sizeof(DWORD)]; // FUTURE USE, SET TO 0
+ BOOL bStrictIso;
// Use strict ISO encoding rules (TRUE/FALSE)
+
+ BYTE
btReserved[255-4*sizeof(DWORD)]; // FUTURE USE, SET TO 0
} LHV1; // LAME header
version 1
@@ -221,30 +223,42 @@
typedef BE_ERR (*BEINITSTREAM) (PBE_CONFIG, PDWORD, PDWORD,
PHBE_STREAM);
typedef BE_ERR (*BEENCODECHUNK) (HBE_STREAM, DWORD, PSHORT,
PBYTE, PDWORD);
-typedef BE_ERR (*BEDEINITSTREAM) (HBE_STREAM, PBYTE, PDWORD);
-typedef BE_ERR (*BECLOSESTREAM) (HBE_STREAM);
-typedef VOID (*BEVERSION) (PBE_VERSION);
-typedef VOID (*BEWRITEVBRHEADER) (LPCSTR);
-#define TEXT_BEINITSTREAM "beInitStream"
-#define TEXT_BEENCODECHUNK "beEncodeChunk"
-#define TEXT_BEDEINITSTREAM "beDeinitStream"
-#define TEXT_BECLOSESTREAM "beCloseStream"
-#define TEXT_BEVERSION "beVersion"
-#define TEXT_BEWRITEVBRHEADER "beWriteVBRHeader"
+// added for floating point audio -- DSPguru, jd
+typedef BE_ERR (*BEENCODECHUNKFLOATS16NI) (HBE_STREAM, DWORD, PFLOAT,
PFLOAT, PBYTE, PDWORD);
+typedef BE_ERR (*BEDEINITSTREAM) (HBE_STREAM, PBYTE,
PDWORD);
+typedef BE_ERR (*BECLOSESTREAM) (HBE_STREAM);
+typedef VOID (*BEVERSION) (PBE_VERSION);
+typedef VOID (*BEWRITEVBRHEADER) (LPCSTR);
+
+#define TEXT_BEINITSTREAM "beInitStream"
+#define TEXT_BEENCODECHUNK "beEncodeChunk"
+#define TEXT_BEENCODECHUNKFLOATS16NI "beEncodeChunkFloatS16NI"
+#define TEXT_BEDEINITSTREAM "beDeinitStream"
+#define TEXT_BECLOSESTREAM "beCloseStream"
+#define TEXT_BEVERSION "beVersion"
+#define TEXT_BEWRITEVBRHEADER "beWriteVBRHeader"
+#define TEXT_BEFLUSHNOGAP "beFlushNoGap"
#else
__declspec(dllexport) BE_ERR beInitStream(PBE_CONFIG pbeConfig, PDWORD
dwSamples, PDWORD dwBufferSize, PHBE_STREAM phbeStream);
__declspec(dllexport) BE_ERR beEncodeChunk(HBE_STREAM hbeStream, DWORD
nSamples, PSHORT pSamples, PBYTE pOutput, PDWORD pdwOutput);
+
+// added for floating point audio -- DSPguru, jd
+__declspec(dllexport) BE_ERR beEncodeChunkFloatS16NI(HBE_STREAM hbeStream,
DWORD nSamples, PFLOAT buffer_l, PFLOAT buffer_r, PBYTE pOutput, PDWORD
pdwOutput);
__declspec(dllexport) BE_ERR beDeinitStream(HBE_STREAM hbeStream, PBYTE
pOutput, PDWORD pdwOutput);
__declspec(dllexport) BE_ERR beCloseStream(HBE_STREAM hbeStream);
__declspec(dllexport) VOID beVersion(PBE_VERSION pbeVersion);
__declspec(dllexport) BE_ERR beWriteVBRHeader(LPCSTR lpszFileName);
-
+__declspec(dllexport) BE_ERR beFlushNoGap(HBE_STREAM hbeStream, PBYTE
pOutput, PDWORD pdwOutput);
#endif
#pragma pack(pop)
+#ifdef __cplusplus
+}
+#endif
+
#endif
Index: lame.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/include/lame.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lame.h 20 Mar 2007 07:39:51 -0000 1.4
+++ lame.h 22 Apr 2007 18:44:39 -0000 1.5
@@ -69,6 +69,29 @@
+/*presets*/
+typedef enum preset_mode_e {
+ /*values from 8 to 320 should be reserved for abr bitrates*/
+ /*for abr I'd suggest to directly use the targeted bitrate as a value*/
+ ABR_8 = 8,
+ ABR_320 = 320,
+ R3MIX = 1000,
+ STANDARD = 1001,
+ EXTREME = 1002,
+ INSANE = 1003,
+ STANDARD_FAST = 1004,
+ EXTREME_FAST = 1005
+} preset_mode;
+
+
+/*asm optimizations*/
+typedef enum asm_optimizations_e {
+ MMX = 1,
+ AMD_3DNOW = 2,
+ SSE = 3
+} asm_optimizations;
+
+
struct lame_global_struct;
typedef struct lame_global_struct lame_global_flags;
typedef lame_global_flags *lame_t;
@@ -221,6 +244,12 @@
int CDECL lame_set_compression_ratio(lame_global_flags *, float);
float CDECL lame_get_compression_ratio(const lame_global_flags *);
+
+int CDECL lame_set_preset( lame_global_flags* gfp, int );
+int CDECL lame_set_asm_optimizations( lame_global_flags* gfp, int, int );
+
+
+
/********************************************************************
* frame params
***********************************************************************/
@@ -273,7 +302,9 @@
int CDECL lame_set_exp_nspsytune(lame_global_flags *, int);
int CDECL lame_get_exp_nspsytune(const lame_global_flags *);
-
+int lame_set_exp_nspsytune2_int( lame_global_flags*, int, int);
+float lame_set_exp_nspsytune2_real( lame_global_flags*, int, float);
+void * lame_set_exp_nspsytune2_pointer( lame_global_flags*, int, void *);
/********************************************************************
* VBR control
@@ -369,6 +400,10 @@
int CDECL lame_set_useTemporal(lame_global_flags *, int);
int CDECL lame_get_useTemporal(const lame_global_flags *);
+// use temporal masking effect (default = 1)
+int CDECL lame_set_interChRatio(lame_global_flags *, float);
+int CDECL lame_get_interChRatio(const lame_global_flags *);
+
// disable short blocks
int CDECL lame_set_no_short_blocks(lame_global_flags *, int);
int CDECL lame_get_no_short_blocks(const lame_global_flags *);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
