Rémi Bernon : include: Add HEAACWAVEINFO and HEAACWAVEFORMAT definitions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 681d20146226132c2ed18ae7ecb53003e6ffcf44
URL:    https://gitlab.winehq.org/wine/wine/-/commit/681d20146226132c2ed18ae7ecb5300...

Author: Rémi Bernon 
Date:   Thu Nov 16 11:31:22 2023 +0100

include: Add HEAACWAVEINFO and HEAACWAVEFORMAT definitions.

---

dlls/winegstreamer/mfplat.c | 18 +-----------------
 include/mmreg.h             | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index 0e1d489d8e5..82fb19126bb 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -25,6 +25,7 @@
 #include "initguid.h"
 #include "d3d9types.h"
 #include "mfapi.h"
+#include "mmreg.h"

#include "wine/debug.h"
 #include "wine/list.h"
@@ -633,23 +634,6 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, const GUID *sub

static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, const GUID *subtype, struct wg_format *format)
 {
-    /* Audio specific config is stored at after HEAACWAVEINFO in MF_MT_USER_DATA
-     * https://docs.microsoft.com/en-us/windows/win32/api/mmreg/ns-mmreg-heaacwavef...
-     */
-    typedef struct
-    {
-        WORD wPayloadType;
-        WORD wAudioProfileLevelIndication;
-        WORD wStructType;
-        WORD wReserved1;
-        DWORD dwReserved2;
-    } HEAACWAVEINFO;
-    typedef struct
-    {
-        HEAACWAVEINFO wfInfo;
-        BYTE pbAudioSpecificConfig[1];
-    } HEAACWAVEFORMAT;
-
     BYTE buffer[64];
     HEAACWAVEFORMAT *user_data = (HEAACWAVEFORMAT *)buffer;
     UINT32 codec_data_size;
diff --git a/include/mmreg.h b/include/mmreg.h
index 1b19e1f068f..a8b0056064e 100644
--- a/include/mmreg.h
+++ b/include/mmreg.h
@@ -645,6 +645,22 @@ typedef struct mpeg1waveformat_tag {
 typedef MPEG1WAVEFORMAT *PMPEG1WAVEFORMAT,
    *NPMPEG1WAVEFORMAT, *LPMPEG1WAVEFORMAT;

+typedef struct heaacwaveinfo_tag
+{
+    WAVEFORMATEX wfx;
+    WORD wPayloadType;
+    WORD wAudioProfileLevelIndication;
+    WORD wStructType;
+    WORD wReserved1;
+    DWORD dwReserved2;
+} HEAACWAVEINFO, *PHEAACWAVEINFO;
+
+typedef struct heaacwaveformat_tag
+{
+    HEAACWAVEINFO wfInfo;
+    BYTE pbAudioSpecificConfig[1];
+} HEAACWAVEFORMAT, *PHEAACWAVEFORMAT;
+
 #define	ACM_MPEG_LAYER1		0x0001
 #define	ACM_MPEG_LAYER2		0x0002
 #define	ACM_MPEG_LAYER3		0x0004