this file is missing lots of defines. this should add a bunch
A+
Name: mmreg
ChangeLog: added lots of missing defines
GenDate: 2002/02/23 21:48:43 UTC
ModifiedFiles: include/mmreg.h
AddedFiles:
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/include/mmreg.h,v
retrieving revision 1.7
diff -u -u -r1.7 mmreg.h
--- include/mmreg.h 14 Oct 2001 16:10:02 -0000 1.7
+++ include/mmreg.h 19 Oct 2001 22:16:42 -0000
@@ -102,7 +102,247 @@
#define WAVE_FORMAT_DEVELOPMENT (0xFFFF)
+typedef struct adpcmcoef_tag {
+ short iCoef1;
+ short iCoef2;
+} ADPCMCOEFSET;
+typedef ADPCMCOEFSET *PADPCMCOEFSET,
+ *NPADPCMCOEFSET, *LPADPCMCOEFSET;
+typedef struct adpcmwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wSamplesPerBlock;
+ WORD wNumCoef;
+ /* FIXME: this should be aCoef[0] */
+ ADPCMCOEFSET aCoef[1];
+} ADPCMWAVEFORMAT;
+typedef ADPCMWAVEFORMAT *PADPCMWAVEFORMAT,
+ *NPADPCMWAVEFORMAT, *LPADPCMWAVEFORMAT;
+
+typedef struct dvi_adpcmwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wSamplesPerBlock;
+} DVIADPCMWAVEFORMAT;
+typedef DVIADPCMWAVEFORMAT *PDVIADPCMWAVEFORMAT,
+ *NPDVIADPCMWAVEFORMAT, *LPDVIADPCMWAVEFORMAT;
+
+typedef struct ima_adpcmwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wSamplesPerBlock;
+} IMAADPCMWAVEFORMAT;
+typedef IMAADPCMWAVEFORMAT *PIMAADPCMWAVEFORMAT, *NPIMAADPCMWAVEFORMAT,
+ *LPIMAADPCMWAVEFORMAT;
+
+typedef struct mediaspace_adpcmwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wRevision;
+} MEDIASPACEADPCMWAVEFORMAT;
+typedef MEDIASPACEADPCMWAVEFORMAT *PMEDIASPACEADPCMWAVEFORMAT,
+ *NPMEDIASPACEADPCMWAVEFORMAT, *LPMEDIASPACEADPCMWAVEFORMAT;
+
+typedef struct sierra_adpcmwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wRevision;
+} SIERRAADPCMWAVEFORMAT;
+typedef SIERRAADPCMWAVEFORMAT *PSIERRAADPCMWAVEFORMAT,
+ *NPSIERRAADPCMWAVEFORMAT, *LPSIERRAADPCMWAVEFORMAT;
+
+typedef struct g723_adpcmwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD cbExtraSize;
+ WORD nAuxBlockSize;
+} G723_ADPCMWAVEFORMAT;
+typedef G723_ADPCMWAVEFORMAT *PG723_ADPCMWAVEFORMAT,
+ *NPG723_ADPCMWAVEFORMAT, *LPG723_ADPCMWAVEFORMAT;
+
+typedef struct digistdwaveformat_tag {
+ WAVEFORMATEX wfx;
+} DIGISTDWAVEFORMAT;
+typedef DIGISTDWAVEFORMAT *PDIGISTDWAVEFORMAT,
+ *NPDIGISTDWAVEFORMAT, *LPDIGISTDWAVEFORMAT;
+
+typedef struct digifixwaveformat_tag {
+ WAVEFORMATEX wfx;
+} DIGIFIXWAVEFORMAT;
+typedef DIGIFIXWAVEFORMAT *PDIGIFIXWAVEFORMAT,
+ *NPDIGIFIXWAVEFORMAT, *LPDIGIFIXWAVEFORMAT;
+
+typedef struct creative_fastspeechformat_tag {
+ WAVEFORMATEX ewf;
+} DIALOGICOKIADPCMWAVEFORMAT;
+typedef DIALOGICOKIADPCMWAVEFORMAT *PDIALOGICOKIADPCMWAVEFORMAT,
+ *NPDIALOGICOKIADPCMWAVEFORMAT, *LPDIALOGICOKIADPCMWAVEFORMAT;
+
+typedef struct yamaha_adpmcwaveformat_tag {
+ WAVEFORMATEX wfx;
+} YAMAHA_ADPCMWAVEFORMAT;
+typedef YAMAHA_ADPCMWAVEFORMAT *PYAMAHA_ADPCMWAVEFORMAT,
+ *NPYAMAHA_ADPCMWAVEFORMAT, *LPYAMAHA_ADPCMWAVEFORMAT;
+
+typedef struct sonarcwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wCompType;
+} SONARCWAVEFORMAT;
+typedef SONARCWAVEFORMAT *PSONARCWAVEFORMAT,
+ *NPSONARCWAVEFORMAT,*LPSONARCWAVEFORMAT;
+
+typedef struct truespeechwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wRevision;
+ WORD nSamplesPerBlock;
+ BYTE abReserved[28];
+} TRUESPEECHWAVEFORMAT;
+typedef TRUESPEECHWAVEFORMAT *PTRUESPEECHWAVEFORMAT,
+ *NPTRUESPEECHWAVEFORMAT, *LPTRUESPEECHWAVEFORMAT;
+
+typedef struct echosc1waveformat_tag {
+ WAVEFORMATEX wfx;
+} ECHOSC1WAVEFORMAT;
+typedef ECHOSC1WAVEFORMAT *PECHOSC1WAVEFORMAT,
+ *NPECHOSC1WAVEFORMAT, *LPECHOSC1WAVEFORMAT;
+
+typedef struct audiofile_af36waveformat_tag {
+ WAVEFORMATEX wfx;
+} AUDIOFILE_AF36WAVEFORMAT;
+typedef AUDIOFILE_AF36WAVEFORMAT *PAUDIOFILE_AF36WAVEFORMAT,
+ *NPAUDIOFILE_AF36WAVEFORMAT, *LPAUDIOFILE_AF36WAVEFORMAT;
+
+typedef struct aptxwaveformat_tag {
+ WAVEFORMATEX wfx;
+} APTXWAVEFORMAT;
+typedef APTXWAVEFORMAT *PAPTXWAVEFORMAT,
+ *NPAPTXWAVEFORMAT, *LPAPTXWAVEFORMAT;
+
+typedef struct audiofile_af10waveformat_tag {
+ WAVEFORMATEX wfx;
+} AUDIOFILE_AF10WAVEFORMAT;
+typedef AUDIOFILE_AF10WAVEFORMAT *PAUDIOFILE_AF10WAVEFORMAT,
+ *NPAUDIOFILE_AF10WAVEFORMAT, *LPAUDIOFILE_AF10WAVEFORMAT;
+
+typedef struct dolbyac2waveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD nAuxBitsCode;
+} DOLBYAC2WAVEFORMAT;
+
+typedef struct gsm610waveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wSamplesPerBlock;
+} GSM610WAVEFORMAT;
+typedef GSM610WAVEFORMAT *PGSM610WAVEFORMAT,
+ *NPGSM610WAVEFORMAT, *LPGSM610WAVEFORMAT;
+
+typedef struct adpcmewaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wSamplesPerBlock;
+} ADPCMEWAVEFORMAT;
+typedef ADPCMEWAVEFORMAT *PADPCMEWAVEFORMAT,
+ *NPADPCMEWAVEFORMAT, *LPADPCMEWAVEFORMAT;
+
+typedef struct contres_vqlpcwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wSamplesPerBlock;
+} CONTRESVQLPCWAVEFORMAT;
+typedef CONTRESVQLPCWAVEFORMAT *PCONTRESVQLPCWAVEFORMAT,
+ *NPCONTRESVQLPCWAVEFORMAT, *LPCONTRESVQLPCWAVEFORMAT;
+
+typedef struct digirealwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wSamplesPerBlock;
+} DIGIREALWAVEFORMAT;
+typedef DIGIREALWAVEFORMAT *PDIGIREALWAVEFORMAT,
+ *NPDIGIREALWAVEFORMAT, *LPDIGIREALWAVEFORMAT;
+
+typedef struct digiadpcmmwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wSamplesPerBlock;
+} DIGIADPCMWAVEFORMAT;
+typedef DIGIADPCMWAVEFORMAT *PDIGIADPCMWAVEFORMAT,
+ *NPDIGIADPCMWAVEFORMAT, *LPDIGIADPCMWAVEFORMAT;
+
+typedef struct contres_cr10waveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wSamplesPerBlock;
+} CONTRESCR10WAVEFORMAT;
+typedef CONTRESCR10WAVEFORMAT *PCONTRESCR10WAVEFORMAT,
+ *NPCONTRESCR10WAVEFORMAT, *LPCONTRESCR10WAVEFORMAT;
+
+typedef struct nms_vbxadpcmmwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wSamplesPerBlock;
+} NMS_VBXADPCMWAVEFORMAT;
+typedef NMS_VBXADPCMWAVEFORMAT *PNMS_VBXADPCMWAVEFORMAT,
+ *NPNMS_VBXADPCMWAVEFORMAT, *LPNMS_VBXADPCMWAVEFORMAT;
+
+typedef struct g721_adpcmwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD nAuxBlockSize;
+} G721_ADPCMWAVEFORMAT;
+typedef G721_ADPCMWAVEFORMAT *PG721_ADPCMWAVEFORMAT,
+ *NG721_ADPCMWAVEFORMAT, *LPG721_ADPCMWAVEFORMAT;
+
+typedef struct creative_adpcmwaveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wRevision;
+} CREATIVEADPCMWAVEFORMAT;
+typedef CREATIVEADPCMWAVEFORMAT *PCREATIVEADPCMWAVEFORMAT,
+ *NPCREATIVEADPCMWAVEFORMAT, *LPCREATIVEADPCMWAVEFORMAT;
+
+typedef struct creative_fastspeech8format_tag {
+ WAVEFORMATEX wfx;
+ WORD wRevision;
+} CREATIVEFASTSPEECH8WAVEFORMAT;
+typedef CREATIVEFASTSPEECH8WAVEFORMAT *PCREATIVEFASTSPEECH8WAVEFORMAT,
+ *NPCREATIVEFASTSPEECH8WAVEFORMAT, *LPCREATIVEFASTSPEECH8WAVEFORMAT;
+
+typedef struct creative_fastspeech10format_tag {
+ WAVEFORMATEX wfx;
+ WORD wRevision;
+} CREATIVEFASTSPEECH10WAVEFORMAT;
+typedef CREATIVEFASTSPEECH10WAVEFORMAT *PCREATIVEFASTSPEECH10WAVEFORMAT,
+ *NPCREATIVEFASTSPEECH10WAVEFORMAT, *LPCREATIVEFASTSPEECH10WAVEFORMAT;
+
+typedef struct fmtowns_snd_waveformat_tag {
+ WAVEFORMATEX wfx;
+ WORD wRevision;
+} FMTOWNS_SND_WAVEFORMAT;
+typedef FMTOWNS_SND_WAVEFORMAT *PFMTOWNS_SND_WAVEFORMAT,
+ *NPFMTOWNS_SND_WAVEFORMAT, *LPFMTOWNS_SND_WAVEFORMAT;
+
+typedef struct oligsmwaveformat_tag {
+ WAVEFORMATEX wfx;
+} OLIGSMWAVEFORMAT;
+typedef OLIGSMWAVEFORMAT *POLIGSMWAVEFORMAT,
+ *NPOLIGSMWAVEFORMAT, *LPOLIGSMWAVEFORMAT;
+
+typedef struct oliadpcmwaveformat_tag {
+ WAVEFORMATEX wfx;
+} OLIADPCMWAVEFORMAT;
+typedef OLIADPCMWAVEFORMAT *POLIADPCMWAVEFORMAT,
+ *NPOLIADPCMWAVEFORMAT, *LPOLIADPCMWAVEFORMAT;
+
+typedef struct olicelpwaveformat_tag {
+ WAVEFORMATEX wfx;
+} OLICELPWAVEFORMAT;
+typedef OLICELPWAVEFORMAT *POLICELPWAVEFORMAT,
+ *NPOLICELPWAVEFORMAT, *LPOLICELPWAVEFORMAT;
+
+typedef struct olisbcwaveformat_tag {
+ WAVEFORMATEX wfx;
+} OLISBCWAVEFORMAT;
+typedef OLISBCWAVEFORMAT *POLISBCWAVEFORMAT,
+ *NPOLISBCWAVEFORMAT, *LPOLISBCWAVEFORMAT;
+
+typedef struct olioprwaveformat_tag {
+ WAVEFORMATEX wfx;
+} OLIOPRWAVEFORMAT;
+typedef OLIOPRWAVEFORMAT *POLIOPRWAVEFORMAT,
+ *NPOLIOPRWAVEFORMAT, *LPOLIOPRWAVEFORMAT;
+
+typedef struct csimaadpcmwaveformat_tag {
+ WAVEFORMATEX wfx;
+} CSIMAADPCMWAVEFORMAT;
+typedef CSIMAADPCMWAVEFORMAT *PCSIMAADPCMWAVEFORMAT,
+ *NPCSIMAADPCMWAVEFORMAT, *LPCSIMAADPCMWAVEFORMAT;
typedef struct
{
@@ -141,13 +381,14 @@
WORD nCodecDelay;
} MPEGLAYER3WAVEFORMAT;
+#define MPEGLAYER3_WFX_EXTRA_BYTES 12
+
+#define MPEGLAYER3_ID_UNKNOWN 0
#define MPEGLAYER3_ID_MPEG 1
#define MPEGLAYER3_ID_CONSTANTFRAMESIZE 2
#define MPEGLAYER3_FLAG_PADDING_ISO 0x00000000
#define MPEGLAYER3_FLAG_PADDING_ON 0x00000001
#define MPEGLAYER3_FLAG_PADDING_OFF 0x00000002
-
-
#endif /* __WINE_MMREG_H */
