X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Favcodec%2Ffourcc.c;h=6f695b0c3be27efb1a28d8e60f641ca8e7bfc877;hb=881e8e56d53b11519b311a778326565c20e0d619;hp=51d0c598f62aed7b828ed2fb8076cfd9a42d23c8;hpb=152b1687c0ec112f3ab1360006d048d6b9cf7258;p=vlc

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 51d0c598f6..6f695b0c3b 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * fourcc.c: libavcodec <-> libvlc conversion routines
  *****************************************************************************
- * Copyright (C) 1999-2008 the VideoLAN team
+ * Copyright (C) 1999-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -89,9 +89,8 @@ static const struct
     { VLC_CODEC_WMV2, CODEC_ID_WMV2, VIDEO_ES },
     { VLC_CODEC_WMV3, CODEC_ID_WMV3, VIDEO_ES },
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 10, 1 )
     { VLC_CODEC_VC1,  CODEC_ID_VC1, VIDEO_ES },
-#endif
+    { VLC_CODEC_WMVA, CODEC_ID_VC1, VIDEO_ES },
 
     { VLC_CODEC_MSVIDEO1, CODEC_ID_MSVIDEO1, VIDEO_ES },
     { VLC_CODEC_MSRLE, CODEC_ID_MSRLE, VIDEO_ES },
@@ -105,16 +104,10 @@ static const struct
     { VLC_CODEC_CYUV, CODEC_ID_CYUV, VIDEO_ES },
 
     { VLC_CODEC_VP3, CODEC_ID_VP3, VIDEO_ES },
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 14, 0 )
     { VLC_CODEC_VP5, CODEC_ID_VP5, VIDEO_ES },
-#endif
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 27, 0 )
     { VLC_CODEC_VP6, CODEC_ID_VP6, VIDEO_ES },
     { VLC_CODEC_VP6F, CODEC_ID_VP6F, VIDEO_ES },
-#endif
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 47, 0 )
     { VLC_CODEC_VP6A, CODEC_ID_VP6A, VIDEO_ES },
-#endif
 
     { VLC_CODEC_THEORA, CODEC_ID_THEORA, VIDEO_ES },
 
@@ -132,9 +125,8 @@ static const struct
 
     /* Real Video */
     { VLC_CODEC_RV10, CODEC_ID_RV10, VIDEO_ES },
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 15, 1 )
+    { VLC_CODEC_RV13, CODEC_ID_RV10, VIDEO_ES },
     { VLC_CODEC_RV20, CODEC_ID_RV20, VIDEO_ES },
-#endif
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 8, 0 )
     { VLC_CODEC_RV30, CODEC_ID_RV30, VIDEO_ES },
 #endif
@@ -154,9 +146,7 @@ static const struct
 
     { VLC_CODEC_ZMBV, CODEC_ID_ZMBV, VIDEO_ES },
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 13, 0 )
     { VLC_CODEC_VMNC, CODEC_ID_VMNC, VIDEO_ES },
-#endif
     { VLC_CODEC_FRAPS, CODEC_ID_FRAPS, VIDEO_ES },
 
     { VLC_CODEC_TRUEMOTION1, CODEC_ID_TRUEMOTION1, VIDEO_ES },
@@ -180,38 +170,36 @@ static const struct
 
     { VLC_CODEC_AASC, CODEC_ID_AASC, VIDEO_ES },
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 11, 0 )
     { VLC_CODEC_FLASHSV, CODEC_ID_FLASHSV, VIDEO_ES },
-#endif
     { VLC_CODEC_KMVC, CODEC_ID_KMVC, VIDEO_ES },
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 13, 0 )
     { VLC_CODEC_NUV, CODEC_ID_NUV, VIDEO_ES },
-#endif
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 8, 0 )
     { VLC_CODEC_SMACKVIDEO, CODEC_ID_SMACKVIDEO, VIDEO_ES },
-#endif
 
     /* Chinese AVS - Untested */
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 8, 0 )
     { VLC_CODEC_CAVS, CODEC_ID_CAVS, VIDEO_ES },
-#endif
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 40, 0 )
     /* Untested yet */
     { VLC_CODEC_DNXHD, CODEC_ID_DNXHD, VIDEO_ES },
-#endif
     { VLC_CODEC_8BPS, CODEC_ID_8BPS, VIDEO_ES },
 
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 52, 0 )
     { VLC_CODEC_MIMIC, CODEC_ID_MIMIC, VIDEO_ES },
 #endif
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 55, 0 )
+    { VLC_CODEC_DIRAC, CODEC_ID_DIRAC, VIDEO_ES },
+#endif
+
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 29, 0 )
     { VLC_CODEC_V210, CODEC_ID_V210, VIDEO_ES },
 #endif
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 37, 1 )
+    { VLC_CODEC_FRWU, CODEC_ID_FRWU, VIDEO_ES },
+#endif
+
     /* Videogames Codecs */
 
     { VLC_CODEC_INTERPLAY, CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES },
@@ -226,6 +214,8 @@ static const struct
 
     { VLC_CODEC_VMDVIDEO, CODEC_ID_VMDVIDEO, VIDEO_ES },
 
+    { VLC_CODEC_AMV, CODEC_ID_AMV, VIDEO_ES },
+
 #if 0
 /*    UNTESTED VideoGames*/
     { VLC_FOURCC('W','C','3','V'), CODEC_ID_XAN_WC3,
@@ -260,135 +250,122 @@ static const struct
     { VLC_CODEC_PAM, CODEC_ID_PAM, VIDEO_ES },
     { VLC_CODEC_JPEGLS, CODEC_ID_JPEGLS, VIDEO_ES },
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 0, 0 )
     { VLC_CODEC_BMP, CODEC_ID_BMP, VIDEO_ES },
-#endif
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 40, 1 )
     { VLC_CODEC_TIFF, CODEC_ID_TIFF, VIDEO_ES },
     { VLC_CODEC_GIF, CODEC_ID_GIF, VIDEO_ES },
     { VLC_CODEC_TARGA, CODEC_ID_TARGA, VIDEO_ES },
-#endif
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 40, 3 )
     { VLC_CODEC_SGI, CODEC_ID_SGI, VIDEO_ES },
-#endif
-
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 55, 0 )
-    { VLC_CODEC_DIRAC, CODEC_ID_DIRAC, VIDEO_ES },
-#endif
 
     /*
      *  Audio Codecs
      */
-
+    /* WMA family */
     { VLC_CODEC_WMA1, CODEC_ID_WMAV1, AUDIO_ES },
     { VLC_CODEC_WMA2, CODEC_ID_WMAV2, AUDIO_ES },
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 35, 0 )
+    { VLC_CODEC_WMAP, CODEC_ID_WMAPRO, AUDIO_ES },
+#endif
 
     { VLC_CODEC_DVAUDIO, CODEC_ID_DVAUDIO, AUDIO_ES },
 
     { VLC_CODEC_MACE3, CODEC_ID_MACE3, AUDIO_ES },
     { VLC_CODEC_MACE6, CODEC_ID_MACE6, AUDIO_ES },
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 41, 1 )
     { VLC_CODEC_MUSEPACK7, CODEC_ID_MUSEPACK7, AUDIO_ES },
-#endif
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 48, 0 )
     { VLC_CODEC_MUSEPACK8, CODEC_ID_MUSEPACK8, AUDIO_ES },
-#endif
 
     { VLC_CODEC_RA_144, CODEC_ID_RA_144, AUDIO_ES },
     { VLC_CODEC_RA_288, CODEC_ID_RA_288, AUDIO_ES },
 
-    { VLC_CODEC_MPGA, CODEC_ID_MP3, AUDIO_ES },
-
     { VLC_CODEC_A52, CODEC_ID_AC3, AUDIO_ES },
-
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 0, 0 )
     { VLC_CODEC_EAC3, CODEC_ID_EAC3, AUDIO_ES },
 #endif
 
     { VLC_CODEC_DTS, CODEC_ID_DTS, AUDIO_ES },
 
-    { VLC_CODEC_MP4A, CODEC_ID_AAC, AUDIO_ES },
-
-    { VLC_CODEC_ADPCM_4XM, CODEC_ID_ADPCM_4XM, AUDIO_ES },
+    { VLC_CODEC_MPGA, CODEC_ID_MP3, AUDIO_ES },
 
-    { VLC_CODEC_ADPCM_EA, CODEC_ID_ADPCM_EA, AUDIO_ES },
+    { VLC_CODEC_MP4A, CODEC_ID_AAC, AUDIO_ES },
 
     { VLC_CODEC_INTERPLAY_DPCM, CODEC_ID_INTERPLAY_DPCM, AUDIO_ES },
 
     { VLC_CODEC_ROQ_DPCM, CODEC_ID_ROQ_DPCM, AUDIO_ES },
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 27, 0 )
     { VLC_CODEC_DSICINAUDIO, CODEC_ID_DSICINAUDIO, AUDIO_ES },
-#endif
 
+    { VLC_CODEC_ADPCM_4XM, CODEC_ID_ADPCM_4XM, AUDIO_ES },
+    { VLC_CODEC_ADPCM_EA, CODEC_ID_ADPCM_EA, AUDIO_ES },
     { VLC_CODEC_ADPCM_XA, CODEC_ID_ADPCM_XA, AUDIO_ES },
     { VLC_CODEC_ADPCM_ADX, CODEC_ID_ADPCM_ADX, AUDIO_ES },
     { VLC_CODEC_ADPCM_IMA_WS, CODEC_ID_ADPCM_IMA_WS, AUDIO_ES },
+    { VLC_CODEC_ADPCM_MS, CODEC_ID_ADPCM_MS, AUDIO_ES },
+    { VLC_CODEC_ADPCM_IMA_WAV, CODEC_ID_ADPCM_IMA_WAV, AUDIO_ES },
+    { VLC_CODEC_ADPCM_IMA_AMV, CODEC_ID_ADPCM_IMA_AMV, AUDIO_ES },
 
     { VLC_CODEC_VMDAUDIO, CODEC_ID_VMDAUDIO, AUDIO_ES },
 
     { VLC_CODEC_ADPCM_G726, CODEC_ID_ADPCM_G726, AUDIO_ES },
+    { VLC_CODEC_ADPCM_SWF, CODEC_ID_ADPCM_SWF, AUDIO_ES },
 
     { VLC_CODEC_AMR_NB, CODEC_ID_AMR_NB, AUDIO_ES },
     { VLC_CODEC_AMR_WB, CODEC_ID_AMR_WB, AUDIO_ES },
 
-    { VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES },
-
-    { VLC_CODEC_ALAC, CODEC_ID_ALAC, AUDIO_ES },
+    { VLC_CODEC_GSM, CODEC_ID_GSM, AUDIO_ES },
+    { VLC_CODEC_GSM_MS, CODEC_ID_GSM_MS, AUDIO_ES },
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 50, 0, 1 )
     { VLC_CODEC_QDM2, CODEC_ID_QDM2, AUDIO_ES },
-#endif
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 0, 0 )
     { VLC_CODEC_COOK, CODEC_ID_COOK, AUDIO_ES },
-#endif
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 4, 0 )
     { VLC_CODEC_TTA, CODEC_ID_TTA, AUDIO_ES },
-#endif
-
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 8, 0 )
-    { VLC_CODEC_SHORTEN, CODEC_ID_SHORTEN, AUDIO_ES },
-#endif
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 16, 0 )
     { VLC_CODEC_WAVPACK, CODEC_ID_WAVPACK, AUDIO_ES },
-#endif
-
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 34, 0 )
-    { VLC_CODEC_GSM, CODEC_ID_GSM, AUDIO_ES },
-    { VLC_CODEC_GSM_MS, CODEC_ID_GSM_MS, AUDIO_ES },
-#endif
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 40, 4 )
     { VLC_CODEC_ATRAC3, CODEC_ID_ATRAC3, AUDIO_ES },
-#endif
 
     { VLC_CODEC_SONIC, CODEC_ID_SONIC, AUDIO_ES },
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 34, 0 )
     { VLC_CODEC_IMC, CODEC_ID_IMC, AUDIO_ES },
-#endif
+
     { VLC_CODEC_TRUESPEECH, CODEC_ID_TRUESPEECH, AUDIO_ES },
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 46, 0 )
+
     { VLC_CODEC_NELLYMOSER, CODEC_ID_NELLYMOSER, AUDIO_ES },
+
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 6, 0 )
+    { VLC_CODEC_QCELP, CODEC_ID_QCELP, AUDIO_ES },
 #endif
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 44, 0 )
-    { VLC_CODEC_APE, CODEC_ID_APE, AUDIO_ES },
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 50, 1 )
+    { VLC_CODEC_SPEEX, CODEC_ID_SPEEX, AUDIO_ES },
 #endif
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 58, 0 )
-    { VLC_CODEC_MLP, CODEC_ID_MLP, AUDIO_ES },
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 34, 0 )
+    { VLC_CODEC_TWINVQ, CODEC_ID_TWINVQ, AUDIO_ES },
+#endif
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 36, 0 )
+    { VLC_CODEC_ATRAC1, CODEC_ID_ATRAC1, AUDIO_ES },
+#endif
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 47, 0 )
+    { VLC_CODEC_SIPR, CODEC_ID_SIPR, AUDIO_ES },
 #endif
+
+    /* Lossless */
+    { VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES },
+
+    { VLC_CODEC_ALAC, CODEC_ID_ALAC, AUDIO_ES },
+
+    { VLC_CODEC_APE, CODEC_ID_APE, AUDIO_ES },
+
+    { VLC_CODEC_SHORTEN, CODEC_ID_SHORTEN, AUDIO_ES },
+
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 22, 0 )
     { VLC_CODEC_TRUEHD, CODEC_ID_TRUEHD, AUDIO_ES },
 #endif
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 6, 0 )
-    { VLC_CODEC_QCELP, CODEC_ID_QCELP, AUDIO_ES },
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 58, 0 )
+    { VLC_CODEC_MLP, CODEC_ID_MLP, AUDIO_ES },
 #endif
 
+
     /* PCM */
     { VLC_CODEC_S8, CODEC_ID_PCM_S8, AUDIO_ES },
     { VLC_CODEC_U8, CODEC_ID_PCM_U8, AUDIO_ES },
@@ -407,17 +384,28 @@ static const struct
     { VLC_CODEC_ALAW, CODEC_ID_PCM_ALAW, AUDIO_ES },
     { VLC_CODEC_MULAW, CODEC_ID_PCM_MULAW, AUDIO_ES },
     { VLC_CODEC_S24DAUD, CODEC_ID_PCM_S24DAUD, AUDIO_ES },
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 66, 0 )
+#if ( !defined( WORDS_BIGENDIAN ) )
+    { VLC_CODEC_FL32, CODEC_ID_PCM_F32LE, AUDIO_ES },
+    { VLC_CODEC_FL64, CODEC_ID_PCM_F64LE, AUDIO_ES },
+#else
+    { VLC_CODEC_FL32, CODEC_ID_PCM_F32BE, AUDIO_ES },
+    { VLC_CODEC_FL64, CODEC_ID_PCM_F64BE, AUDIO_ES },
+#endif
+#endif
 
     /* Subtitle streams */
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 41, 0 )
-    /* Before this version, subs were too experimental */
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 33, 0 )
+    { VLC_CODEC_BD_PG, CODEC_ID_HDMV_PGS_SUBTITLE, SPU_ES },
+#endif
+#if 0
     { VLC_CODEC_SPU, CODEC_ID_DVD_SUBTITLE, SPU_ES },
     { VLC_CODEC_DVBS, CODEC_ID_DVB_SUBTITLE, SPU_ES },
     { VLC_CODEC_SUBT, CODEC_ID_TEXT, SPU_ES },
     { VLC_CODEC_XSUB, CODEC_ID_XSUB, SPU_ES },
-#endif
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 50, 0 )
     { VLC_CODEC_SSA, CODEC_ID_SSA, SPU_ES },
+#endif
 #endif
 
     { 0, 0, UNKNOWN_ES }