Switch to new AVChannelLayout API

Author: CJRChang

c_src/membrane_ffmpeg_swresample_plugin/converter.c

@@ -4,7 +4,7 @@
 
 static int membrane_sample_fmt_to_av_sample_fmt(int in, char dir, char *s24le,
                                                 enum AVSampleFormat *out);
-static int nb_channels_to_av_layout(int channels, int64_t *av_layout);
+static int nb_channels_to_av_chlayout(int channels, AVChannelLayout *layout);
 
 UNIFEX_TERM create(UnifexEnv *env, unsigned int src_format, int src_rate,
                    int src_channels, unsigned int dst_format, int dst_rate,
@@ -25,19 +25,19 @@ UNIFEX_TERM create(UnifexEnv *env, unsigned int src_format, int src_rate,
     err_reason = "unsupported_dst_format";
     goto create_exit;
   }
-  int64_t src_layout, dst_layout;
-  if (nb_channels_to_av_layout(src_channels, &src_layout)) {
+  AVChannelLayout src_layout, dst_layout;
+  if (nb_channels_to_av_chlayout(src_channels, &src_layout)) {
     err_reason = "unsupported_src_channels_no";
     goto create_exit;
   }
-  if (nb_channels_to_av_layout(dst_channels, &dst_layout)) {
+  if (nb_channels_to_av_chlayout(dst_channels, &dst_layout)) {
     err_reason = "unsupported_dst_channels_no";
     goto create_exit;
   }
 
   state = unifex_alloc_state(env);
-  err_reason = lib_init(state, from_s24le, src_av_format, src_rate, src_layout,
-                        dst_av_format, dst_rate, dst_layout);
+  err_reason = lib_init(state, from_s24le, src_av_format, src_rate, &src_layout,
+                        dst_av_format, dst_rate, &dst_layout);
   if (err_reason) {
     goto create_exit;
   }
@@ -121,17 +121,11 @@ static int membrane_sample_fmt_to_av_sample_fmt(int in, char dir, char *s24le,
   return error;
 }
 
-static int nb_channels_to_av_layout(int channels, int64_t *av_layout) {
-  int error = 0;
-  switch (channels) {
-  case 1:
-    *av_layout = AV_CH_LAYOUT_MONO;
-    break;
-  case 2:
-    *av_layout = AV_CH_LAYOUT_STEREO;
-    break;
-  default:
-    error = -1;
-  }
-  return error;
+static int nb_channels_to_av_chlayout(int channels, AVChannelLayout *layout) {
+  if (channels <= 0)
+    return -1;
+  av_channel_layout_default(layout, channels);
+  if (layout->nb_channels != channels)
+    return -1;
+  return 0;
 }

c_src/membrane_ffmpeg_swresample_plugin/converter_lib.c

@@ -3,42 +3,35 @@
 
 char *lib_init(ConverterState *state, char from_s24le,
                enum AVSampleFormat src_sample_fmt, int src_rate,
-               int64_t src_ch_layout, enum AVSampleFormat dst_sample_fmt,
-               int dst_rate, int64_t dst_ch_layout)
+               const AVChannelLayout *src_ch_layout,
+               enum AVSampleFormat dst_sample_fmt, int dst_rate,
+               const AVChannelLayout *dst_ch_layout)
 {
   state->swr_ctx = NULL;
 
-  struct SwrContext *swr_ctx = swr_alloc();
-  if (!swr_ctx)
+  struct SwrContext *swr_ctx = NULL;
+  if (swr_alloc_set_opts2(&swr_ctx,
+                          dst_ch_layout, dst_sample_fmt, dst_rate,
+                          src_ch_layout, src_sample_fmt, src_rate,
+                          0, NULL) < 0)
   {
-    return "swr_alloc";
+    return "swr_alloc_set_opts2";
   }
 
   /* set options */
-  av_opt_set_int(swr_ctx, "in_channel_layout", src_ch_layout, 0);
-  av_opt_set_int(swr_ctx, "in_sample_rate", src_rate, 0);
-  av_opt_set_sample_fmt(swr_ctx, "in_sample_fmt", src_sample_fmt, 0);
-  av_opt_set_int(swr_ctx, "out_channel_layout", dst_ch_layout, 0);
-  av_opt_set_int(swr_ctx, "out_sample_rate", dst_rate, 0);
-  av_opt_set_sample_fmt(swr_ctx, "out_sample_fmt", dst_sample_fmt, 0);
   av_opt_set_int(swr_ctx, "dither_method", SWR_DITHER_RECTANGULAR, 0);
 
   if (swr_init(swr_ctx) < 0)
     return "swr_init";
 
-  AVChannelLayout src_ch_av_layout;
-  AVChannelLayout dst_ch_av_layout;
-  av_channel_layout_from_mask(&src_ch_av_layout, src_ch_layout);
-  av_channel_layout_from_mask(&dst_ch_av_layout, dst_ch_layout);
-
   *state = (ConverterState){
       .swr_ctx = swr_ctx,
       .src_rate = src_rate,
       .dst_rate = dst_rate,
       .src_sample_fmt = src_sample_fmt,
       .dst_sample_fmt = dst_sample_fmt,
-      .src_nb_channels = src_ch_av_layout.nb_channels,
-      .dst_nb_channels = dst_ch_av_layout.nb_channels,
+      .src_nb_channels = src_ch_layout->nb_channels,
+      .dst_nb_channels = dst_ch_layout->nb_channels,
       .from_s24le = from_s24le};
 
   return NULL;

c_src/membrane_ffmpeg_swresample_plugin/converter_lib.h

@@ -14,8 +14,9 @@ typedef struct ConverterState
 
 char *lib_init(ConverterState *state, char from_s24le,
                enum AVSampleFormat src_sample_fmt, int src_rate,
-               int64_t src_ch_layout, enum AVSampleFormat dst_sample_fmt,
-               int dst_rate, int64_t dst_ch_layout);
+               const AVChannelLayout *src_ch_layout,
+               enum AVSampleFormat dst_sample_fmt, int dst_rate,
+               const AVChannelLayout *dst_ch_layout);
 
 char *lib_convert(ConverterState *state, uint8_t *input, int input_size,
                   uint8_t **output, int *output_size);