* src/video_output/video_output.c : do not use FIND_ANYWHERE to catch

[vlc] / include / codecs.h

diff --git a/include/codecs.h b/include/codecs.h
index 44ffe49a2f69945447fda9e0b7ce201069caaeda..e455f422aae58fcaa7a6ed1ba62682550064ae84 100644 (file)
--- a/include/codecs.h
+++ b/include/codecs.h
@@ -2,7 +2,7 @@
  * codecs.h: codec related structures needed by the demuxers and decoders
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: codecs.h,v 1.2 2002/11/07 19:31:07 gbazin Exp $
+ * $Id: codecs.h,v 1.5 2003/08/18 00:17:44 fenrir Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -28,7 +28,11 @@
 
 #ifndef _WAVEFORMATEX_
 #define _WAVEFORMATEX_
-typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
+typedef struct
+#ifdef HAVE_ATTRIBUTE_PACKED
+    __attribute__((__packed__))
+#endif
+_WAVEFORMATEX {
     uint16_t   wFormatTag;
     uint16_t   nChannels;
     uint32_t   nSamplesPerSec;
@@ -41,7 +45,10 @@ typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
 
 #if !defined(_BITMAPINFOHEADER_) && !defined(WIN32)
 #define _BITMAPINFOHEADER_
-typedef struct __attribute__((__packed__))
+typedef struct
+#ifdef HAVE_ATTRIBUTE_PACKED
+    __attribute__((__packed__))
+#endif
 {
     uint32_t   biSize;
     uint32_t   biWidth;
@@ -70,17 +77,69 @@ typedef struct {
 #define  WAVE_FORMAT_ALAW               0x0006 /* Microsoft Corporation */
 #define  WAVE_FORMAT_MULAW              0x0007 /* Microsoft Corporation */
 #define  WAVE_FORMAT_DTS                0x0008 /* Microsoft Corporation */
+#define  WAVE_FORMAT_IMA_ADPCM          0x0011
 #define  WAVE_FORMAT_MPEG               0x0050 /* Microsoft Corporation */
 #define  WAVE_FORMAT_MPEGLAYER3         0x0055 /* ISO/MPEG Layer3 Format Tag */
 #define  WAVE_FORMAT_DOLBY_AC3_SPDIF    0x0092 /* Sonic Foundry */
 
-/* Need to check these */
 #define WAVE_FORMAT_A52             0x2000
 #define WAVE_FORMAT_WMA1            0x0160
 #define WAVE_FORMAT_WMA2            0x0161
+#define WAVE_FORMAT_WMA3            0x0162
+
+/* Need to check these */
+#define WAVE_FORMAT_DK3             0x0061
+#define WAVE_FORMAT_DK4             0x0061
 
 #if !defined(WAVE_FORMAT_EXTENSIBLE)
 #define  WAVE_FORMAT_EXTENSIBLE                 0xFFFE /* Microsoft */
 #endif
 
+static struct
+{
+    uint16_t     i_tag;
+    vlc_fourcc_t i_fourcc;
+    char         *psz_name;
+}
+wave_format_tag_to_fourcc[] =
+{
+    { WAVE_FORMAT_PCM,      VLC_FOURCC( 'a', 'r', 'a', 'w' ), "Raw audio" },
+    { WAVE_FORMAT_ADPCM,    VLC_FOURCC( 'm', 's', 0x00,0x02), "Adpcm" },
+    { WAVE_FORMAT_ALAW,     VLC_FOURCC( 'a', 'l', 'a', 'w' ), "A-Law" },
+    { WAVE_FORMAT_MULAW,    VLC_FOURCC( 'm', 'l', 'a', 'w' ), "Mu-Law" },
+    { WAVE_FORMAT_IMA_ADPCM,VLC_FOURCC( 'm', 's', 0x00,0x11), "Ima-Adpcm" },
+    { WAVE_FORMAT_MPEGLAYER3,VLC_FOURCC('m', 'p', 'g', 'a' ), "Mpeg Audio" },
+    { WAVE_FORMAT_MPEG,     VLC_FOURCC( 'm', 'p', 'g', 'a' ), "Mpeg Audio" },
+    { WAVE_FORMAT_A52,      VLC_FOURCC( 'a', '5', '2', ' ' ), "A/52" },
+    { WAVE_FORMAT_WMA1,     VLC_FOURCC( 'w', 'm', 'a', '1' ), "Window Media Audio 1" },
+    { WAVE_FORMAT_WMA2,     VLC_FOURCC( 'w', 'm', 'a', '2' ), "Window Media Audio 2" },
+    { WAVE_FORMAT_WMA3,     VLC_FOURCC( 'w', 'm', 'a', '3' ), "Window Media Audio 3" },
+    { WAVE_FORMAT_DK3,      VLC_FOURCC( 'm', 's', 0x00,0x61), "Duck DK3" },
+    { WAVE_FORMAT_DK4,      VLC_FOURCC( 'm', 's', 0x00,0x62), "Duck DK4" },
+    { WAVE_FORMAT_UNKNOWN,  VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" }
+};
+
+static inline void wf_tag_to_fourcc( uint16_t i_tag,
+                                     vlc_fourcc_t *fcc, char **ppsz_name )
+{
+    int i;
+    for( i = 0; wave_format_tag_to_fourcc[i].i_tag != 0; i++ )
+    {
+        if( wave_format_tag_to_fourcc[i].i_tag == i_tag )
+        {
+            break;
+        }
+    }
+    if( fcc )
+    {
+        *fcc = wave_format_tag_to_fourcc[i].i_fourcc;
+    }
+    if( ppsz_name )
+    {
+        *ppsz_name = wave_format_tag_to_fourcc[i].psz_name;
+    }
+}
+
+
 #endif /* "codecs.h" */
+