libhb: add alac passthru and encoders

contrib/ffmpeg/module.defs

@@ -40,6 +40,7 @@ FFMPEG.CONFIGURE.extra = \
     --enable-encoder=aac \
     --enable-encoder=ac3 \
     --enable-encoder=eac3 \
+    --enable-encoder=alac \
     --enable-encoder=flac \
     --enable-encoder=mpeg2video \
     --enable-encoder=mpeg4 \

libhb/common.c

@@ -80,6 +80,8 @@ enum
     HB_GID_VCODEC_AV1_NVENC,
     HB_GID_VCODEC_AV1_VCE,
     HB_GID_VCODEC_FFV1,
+    HB_GID_ACODEC_ALAC,
+    HB_GID_ACODEC_ALAC_PASS,
     HB_GID_ACODEC_AAC,
     HB_GID_ACODEC_AAC_HE,
     HB_GID_ACODEC_AAC_PASS,
@@ -446,6 +448,9 @@ hb_encoder_internal_t hb_audio_encoders[]  =
     { { "FLAC 16-bit",        "flac16",     "FLAC 16-bit (libavcodec)",    HB_ACODEC_FFFLAC,      HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_FLAC,       },
     { { "FLAC 24-bit",        "flac24",     "FLAC 24-bit (libavcodec)",    HB_ACODEC_FFFLAC24,    HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_FLAC,       },
     { { "FLAC Passthru",      "copy:flac",  "FLAC Passthru",               HB_ACODEC_FLAC_PASS,   HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_FLAC_PASS,  },
+    { { "ALAC 16-bit",        "alac16",     "ALAC 16-bit (libavcodec)",    HB_ACODEC_FFALAC,      HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_ALAC,       },
+    { { "ALAC 24-bit",        "alac24",     "ALAC 24-bit (libavcodec)",    HB_ACODEC_FFALAC24,    HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_ALAC,       },
+    { { "ALAC Passthru",      "copy:alac",  "ALAC Passthru",               HB_ACODEC_ALAC_PASS,   HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_ALAC_PASS,  },
     { { "Auto Passthru",      "copy",       "Auto Passthru",               HB_ACODEC_AUTO_PASS,   HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_AUTO_PASS,  },
 };
 int hb_audio_encoders_count = sizeof(hb_audio_encoders) / sizeof(hb_audio_encoders[0]);
@@ -476,6 +481,10 @@ static int hb_audio_encoder_is_enabled(int encoder)
         case HB_ACODEC_AC3:
             return avcodec_find_encoder(AV_CODEC_ID_AC3) != NULL;
 
+        case HB_ACODEC_FFALAC:
+        case HB_ACODEC_FFALAC24:
+            return avcodec_find_encoder(AV_CODEC_ID_ALAC) != NULL;
+
         case HB_ACODEC_FFEAC3:
             return avcodec_find_encoder(AV_CODEC_ID_EAC3) != NULL;
 
@@ -1134,6 +1143,8 @@ int hb_audio_bitrate_get_default(uint32_t codec, int samplerate, int mixdown)
 
     switch (codec)
     {
+        case HB_ACODEC_FFALAC:
+        case HB_ACODEC_FFALAC24:
         case HB_ACODEC_FFFLAC:
         case HB_ACODEC_FFFLAC24:
         case HB_ACODEC_FFTRUEHD:
@@ -1322,6 +1333,8 @@ void hb_audio_bitrate_get_limits(uint32_t codec, int samplerate, int mixdown,
     switch (codec)
     {
         // Bitrates don't apply to "lossless" audio
+        case HB_ACODEC_FFALAC:
+        case HB_ACODEC_FFALAC24:
         case HB_ACODEC_FFFLAC:
         case HB_ACODEC_FFFLAC24:
         case HB_ACODEC_FFTRUEHD:
@@ -2188,6 +2201,14 @@ void hb_audio_compression_get_limits(uint32_t codec, float *low, float *high,
 {
     switch (codec)
     {
+        case HB_ACODEC_FFALAC:
+        case HB_ACODEC_FFALAC24:
+            *direction   = 0;
+            *granularity = 1.;
+            *high        = 2.;
+            *low         = 0.;
+            break;
+
         case HB_ACODEC_FFFLAC:
         case HB_ACODEC_FFFLAC24:
             *direction   = 0;
@@ -2234,6 +2255,10 @@ float hb_audio_compression_get_default(uint32_t codec)
 {
     switch (codec)
     {
+        case HB_ACODEC_FFALAC:
+        case HB_ACODEC_FFALAC24:
+            return 2.;
+
         case HB_ACODEC_FFFLAC:
         case HB_ACODEC_FFFLAC24:
             return 5.;
@@ -2370,6 +2395,8 @@ int hb_mixdown_has_codec_support(int mixdown, uint32_t codec)
     switch (codec)
     {
         case HB_ACODEC_VORBIS:
+        case HB_ACODEC_FFALAC:
+        case HB_ACODEC_FFALAC24:
         case HB_ACODEC_FFFLAC:
         case HB_ACODEC_FFFLAC24:
         case HB_ACODEC_OPUS:
@@ -2538,6 +2565,8 @@ int hb_mixdown_get_default(uint32_t codec, uint64_t layout)
     switch (codec)
     {
         // the FLAC encoder defaults to the best mixdown up to 7.1
+        case HB_ACODEC_FFALAC:
+        case HB_ACODEC_FFALAC24:
         case HB_ACODEC_FFFLAC:
         case HB_ACODEC_FFFLAC24:
         case HB_ACODEC_OPUS:
@@ -2790,6 +2819,10 @@ int hb_audio_encoder_get_fallback_for_passthru(int passthru)
     const hb_encoder_t *audio_encoder = NULL;
     switch (passthru)
     {
+        case HB_ACODEC_ALAC_PASS:
+            gid = HB_GID_ACODEC_ALAC;
+            break;
+
         case HB_ACODEC_AAC_PASS:
             gid = HB_GID_ACODEC_AAC;
             break;

libhb/encavcodecaudio.c

@@ -121,6 +121,22 @@ static int encavcodecaInit(hb_work_object_t *w, hb_job_t *job)
                 channel_layout  = AV_CH_LAYOUT_5POINT1_BACK;
             break;
 
+        case HB_ACODEC_FFALAC:
+        case HB_ACODEC_FFALAC24:
+            codec_id = AV_CODEC_ID_ALAC;
+            switch (audio->config.out.codec)
+            {
+                case HB_ACODEC_FFALAC24:
+                    sample_fmt          = AV_SAMPLE_FMT_S32;
+                    bits_per_raw_sample = 24;
+                    break;
+                default:
+                    sample_fmt          = AV_SAMPLE_FMT_S16;
+                    bits_per_raw_sample = 16;
+                    break;
+            }
+            break;
+
         case HB_ACODEC_FFFLAC:
         case HB_ACODEC_FFFLAC24:
             codec_id = AV_CODEC_ID_FLAC;

libhb/handbrake/common.h

@@ -869,7 +869,9 @@ struct hb_job_s
 /* Audio Codecs: Update win/CS/HandBrake.Interop/Interop/HbLib/NativeConstants.cs when changing these consts */
 #define HB_ACODEC_INVALID   0x00000000
 #define HB_ACODEC_NONE      0x00000001
-#define HB_ACODEC_MASK      0x0FFFFF01
+#define HB_ACODEC_MASK      0x0FFFFF81
+#define HB_ACODEC_FFALAC    0x00000080
+#define HB_ACODEC_FFALAC24  0x00000100
 #define HB_ACODEC_LAME      0x00000200
 #define HB_ACODEC_VORBIS    0x00000400
 #define HB_ACODEC_AC3       0x00000800
@@ -889,13 +891,14 @@ struct hb_job_s
 #define HB_ACODEC_FFEAC3    0x01000000
 #define HB_ACODEC_FFTRUEHD  0x02000000
 #define HB_ACODEC_OPUS      0x04000000
-#define HB_ACODEC_FF_MASK   0x0FFF2800
+#define HB_ACODEC_FF_MASK   0x0FFF2980
 #define HB_ACODEC_PASS_FLAG 0x40000000
-#define HB_ACODEC_PASS_MASK   (HB_ACODEC_AC3 | HB_ACODEC_DCA | HB_ACODEC_DCA_HD | HB_ACODEC_FFAAC | HB_ACODEC_FFEAC3 | HB_ACODEC_FFFLAC | HB_ACODEC_MP2 | HB_ACODEC_MP3 | HB_ACODEC_FFTRUEHD | HB_ACODEC_OPUS)
+#define HB_ACODEC_PASS_MASK   (HB_ACODEC_AC3 | HB_ACODEC_DCA | HB_ACODEC_DCA_HD | HB_ACODEC_FFAAC | HB_ACODEC_FFEAC3 | HB_ACODEC_FFALAC | HB_ACODEC_FFFLAC | HB_ACODEC_MP2 | HB_ACODEC_MP3 | HB_ACODEC_FFTRUEHD | HB_ACODEC_OPUS)
 #define HB_ACODEC_AUTO_PASS   (HB_ACODEC_PASS_FLAG | HB_ACODEC_PASS_MASK)
 #define HB_ACODEC_ANY         (HB_ACODEC_PASS_FLAG | HB_ACODEC_MASK)
 #define HB_ACODEC_AAC_PASS    (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFAAC)
 #define HB_ACODEC_AC3_PASS    (HB_ACODEC_PASS_FLAG | HB_ACODEC_AC3)
+#define HB_ACODEC_ALAC_PASS   (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFALAC)
 #define HB_ACODEC_DCA_PASS    (HB_ACODEC_PASS_FLAG | HB_ACODEC_DCA)
 #define HB_ACODEC_DCA_HD_PASS (HB_ACODEC_PASS_FLAG | HB_ACODEC_DCA_HD)
 #define HB_ACODEC_EAC3_PASS   (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFEAC3)

libhb/muxavformat.c

@@ -579,6 +579,10 @@ static int avformatInit( hb_mux_object_t * m )
             case HB_ACODEC_OPUS:
                 track->st->codecpar->codec_id = AV_CODEC_ID_OPUS;
                 break;
+            case HB_ACODEC_FFALAC:
+            case HB_ACODEC_FFALAC24:
+                track->st->codecpar->codec_id = AV_CODEC_ID_ALAC;
+                break;
             case HB_ACODEC_FFFLAC:
             case HB_ACODEC_FFFLAC24:
                 track->st->codecpar->codec_id = AV_CODEC_ID_FLAC;

libhb/preset.c

@@ -3634,6 +3634,8 @@ static void import_audio_0_0_0(hb_value_t *preset)
         hb_value_array_append(copy, hb_value_string("copy:dtshd"));
     if (hb_value_get_bool(hb_dict_get(preset, "AudioAllowEAC3Pass")))
         hb_value_array_append(copy, hb_value_string("copy:eac3"));
+    if (hb_value_get_bool(hb_dict_get(preset, "AudioAllowALACPass")))
+        hb_value_array_append(copy, hb_value_string("copy:alac"));
     if (hb_value_get_bool(hb_dict_get(preset, "AudioAllowFLACPass")))
         hb_value_array_append(copy, hb_value_string("copy:flac"));
     if (hb_value_get_bool(hb_dict_get(preset, "AudioAllowTRUEHDPass")))

libhb/scan.c

@@ -1582,6 +1582,9 @@ static void LookForAudio(hb_scan_t *scan, hb_title_t * title, hb_audio_t * audio
                 case AV_CODEC_ID_AC3:
                     codec_name = "AC3";
                     break;
+                case AV_CODEC_ID_ALAC:
+                    codec_name = "ALAC";
+                    break;
                 case AV_CODEC_ID_EAC3:
                     codec_name = "E-AC3";
                     break;
@@ -1633,6 +1636,9 @@ static void LookForAudio(hb_scan_t *scan, hb_title_t * title, hb_audio_t * audio
                 case HB_ACODEC_FFEAC3:
                     codec_name = "E-AC3";
                     break;
+                case HB_ACODEC_FFALAC:
+                    codec_name = "ALAC";
+                    break;
                 case HB_ACODEC_FFTRUEHD:
                     codec_name = "TrueHD";
                     break;

libhb/stream.c

@@ -5542,6 +5542,12 @@ static void add_ffmpeg_audio(hb_title_t *title, hb_stream_t *stream, int id)
             audio->config.in.codec = HB_ACODEC_AC3;
             break;
 
+        case AV_CODEC_ID_ALAC:
+        {
+            hb_set_extradata(&audio->priv.extradata, codecpar->extradata, codecpar->extradata_size);
+            audio->config.in.codec = HB_ACODEC_FFALAC;
+        } break;
+
         case AV_CODEC_ID_EAC3:
             audio->config.in.codec = HB_ACODEC_FFEAC3;
             break;

win/CS/HandBrake.Interop/Interop/HbLib/NativeConstants.cs

@@ -14,24 +14,28 @@ namespace HandBrake.Interop.Interop.HbLib
     public class NativeConstants
     {
         // Audio encoders
+        public const uint HB_ACODEC_FFALAC = 0x00000080;
+        public const uint HB_ACODEC_FFALAC24 = 0x00000100;
         public const uint HB_ACODEC_AC3 = 0x00000800;
         public const uint HB_ACODEC_DCA = 0x00002000;
         public const uint HB_ACODEC_FFAAC = 0x00010000;
         public const uint HB_ACODEC_DCA_HD = 0x00040000;
         public const uint HB_ACODEC_MP3 = 0x00080000;
         public const uint HB_ACODEC_FFFLAC = 0x00100000;
+        public const uint HB_ACODEC_FFFLAC_24 = 0x00200000;
         public const uint HB_ACODEC_FFEAC3 = 0x01000000;
         public const uint HB_ACODEC_FFTRUEHD = 0x02000000;
         public const uint HB_ACODEC_OPUS = 0x04000000;
         public const uint HB_ACODEC_MP2 = 0x08000000;
         public const uint HB_ACODEC_PASS_FLAG = 0x40000000;
-        public const uint HB_ACODEC_PASS_MASK = (HB_ACODEC_AC3 | HB_ACODEC_DCA | HB_ACODEC_DCA_HD | HB_ACODEC_FFAAC | HB_ACODEC_FFEAC3 | HB_ACODEC_FFFLAC | HB_ACODEC_MP2 | HB_ACODEC_MP3 | HB_ACODEC_FFTRUEHD | HB_ACODEC_OPUS);
+        public const uint HB_ACODEC_PASS_MASK = (HB_ACODEC_AC3 | HB_ACODEC_DCA | HB_ACODEC_DCA_HD | HB_ACODEC_FFAAC | HB_ACODEC_FFEAC3 | HB_ACODEC_FFALAC | HB_ACODEC_FFFLAC | HB_ACODEC_MP2 | HB_ACODEC_MP3 | HB_ACODEC_FFTRUEHD | HB_ACODEC_OPUS);
 
-        public const uint HB_ACODEC_MASK = 0x0FFFFF01;
+        public const uint HB_ACODEC_MASK = 0x0FFFFF81;
         public const uint HB_ACODEC_AUTO_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_PASS_MASK);
         public const uint HB_ACODEC_ANY = (HB_ACODEC_PASS_FLAG | HB_ACODEC_MASK);
         public const uint HB_ACODEC_AAC_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFAAC);
         public const uint HB_ACODEC_AC3_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_AC3);
+        public const uint HB_ACODEC_ALAC_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFALAC);
         public const uint HB_ACODEC_DCA_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_DCA);
         public const uint HB_ACODEC_DCA_HD_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_DCA_HD);
         public const uint HB_ACODEC_EAC3_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFEAC3);