[cmake,coreAudio,audioDecoders/lav] Add decoding support for WMA9 Los…

…sless codec
mean00 · Jul 13, 2021 · 35d37b1 · 35d37b1
1 parent 5baf7f8
commit 35d37b1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/avidemux_core/ADM_coreAudio/include/ADM_audioCodecEnum.h b/avidemux_core/ADM_coreAudio/include/ADM_audioCodecEnum.h
@@ -8,6 +8,7 @@
 #define WAV_MP2 	80
 #define WAV_WMA 	353
 #define WAV_WMAPRO 	354
+#define WAV_WMALOSSLESS 0x163
 #define WAV_PCM 	1
 #define WAV_MSADPCM 	2
 #define WAV_LPCM 	3

diff --git a/avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp b/avidemux_core/ADM_coreAudio/src/ADM_audioStream.cpp
@@ -218,6 +218,7 @@ const char *getStrFromAudioCodec( uint32_t codec)
               case WAV_MP2: return QT_TRANSLATE_NOOP("adm","MP2");
               case WAV_MP3: return QT_TRANSLATE_NOOP("adm","MP3");
               case WAV_WMAPRO:  return QT_TRANSLATE_NOOP("adm","WMAPRO");
+              case WAV_WMALOSSLESS: return QT_TRANSLATE_NOOP("adm","WMA Lossless");
               case WAV_WMA:  return QT_TRANSLATE_NOOP("adm","WMA");
               case WAV_LPCM: return QT_TRANSLATE_NOOP("adm","LPCM");
               case WAV_AC3:  return QT_TRANSLATE_NOOP("adm","AC3");

diff --git a/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp b/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp
@@ -85,6 +85,7 @@ typedef enum
 static  ad_supportedFormat Formats[]={
         {WAV_WMA,AD_MEDIUM_QUAL},
         {WAV_WMAPRO,AD_MEDIUM_QUAL},
+        {WAV_WMALOSSLESS,AD_MEDIUM_QUAL},
         {WAV_QDM2,AD_MEDIUM_QUAL},
         {WAV_AMV_ADPCM,AD_MEDIUM_QUAL},
         {WAV_NELLYMOSER,AD_MEDIUM_QUAL},
@@ -140,6 +141,9 @@ DECLARE_AUDIO_DECODER(ADM_AudiocoderLavcodec,						// Class
       case WAV_WMAPRO:
         codecID = AV_CODEC_ID_WMAPRO;
         break;
+      case WAV_WMALOSSLESS:
+        codecID = AV_CODEC_ID_WMALOSSLESS;
+        break;
       case WAV_WMA:
         codecID = AV_CODEC_ID_WMAV2;
         break;
@@ -528,7 +532,6 @@ uint8_t ADM_AudiocoderLavcodec::run(uint8_t *inptr, uint32_t nbIn, float *outptr
                 ADM_warning("[ADM_ad_lav] decoding error %d: %s\n",res,er);
                 break;
             }
-
             if(_context->sample_rate!=outputFrequency)
             {
                 if(!frequencyChecked)

diff --git a/cmake/admFFmpegBuild_helpers.cmake b/cmake/admFFmpegBuild_helpers.cmake
@@ -25,7 +25,7 @@ set(FFMPEG_DECODERS     aac  ac3  adpcm_ima_amv  amv  cinepak  cscd  cyuv
                         mjpeg  mjpegb  mp2  mp3  mpeg2video  mpeg4  msmpeg4v2  msmpeg4v3
                         msvideo1  nellymoser  png  prores  qdm2  rawvideo  snow  svq3  theora
                         tscc  utvideo  vc1  vorbis  vp3  vp6  vp6a  vp6f  vp8
-                        vp9  wmapro  wmav2  wmv1  wmv2  wmv3)
+                        vp9  wmapro  wmalossless  wmav2  wmv1  wmv2  wmv3)
 
 set(FFMPEG_ENCODERS     aac  ac3  dvvideo  ffv1  ffvhuff  flac  flv  h263  huffyuv
                         mjpeg  mp2  mpeg1video  mpeg2video  mpeg4  png  snow  utvideo)