fix failing tests

Author: gBillal

Makefile

@@ -14,7 +14,7 @@ XAV_VIDEO_CONVERTER_SO = $(PRIV_DIR)/libxavvideoconverter.so
 # XAV_DEBUG_LOGS = -DXAV_DEBUG=1
 
 DECODER_HEADERS = $(XAV_DIR)/xav_decoder.h $(XAV_DIR)/decoder.h $(XAV_DIR)/video_converter.h $(XAV_DIR)/audio_converter.h $(XAV_DIR)/utils.h $(XAV_DIR)/channel_layout.h
-DECODER_SOURCES = $(XAV_DIR)/xav_decoder.c $(XAV_DIR)/decoder.c $(XAV_DIR)/video_converter.c $(XAV_DIR)/audio_converter.c $(XAV_DIR)/utils.c
+DECODER_SOURCES = $(XAV_DIR)/xav_decoder.c $(XAV_DIR)/decoder.c $(XAV_DIR)/video_converter.c $(XAV_DIR)/audio_converter.c $(XAV_DIR)/utils.c $(XAV_DIR)/channel_layout.c
 
 ENCODER_HEADERS = $(XAV_DIR)/xav_encoder.h $(XAV_DIR)/encoder.h $(XAV_DIR)/utils.h $(XAV_DIR)/channel_layout.h
 ENCODER_SOURCES = $(XAV_DIR)/xav_encoder.c $(XAV_DIR)/encoder.c $(XAV_DIR)/utils.c $(XAV_DIR)/channel_layout.c

c_src/xav/channel_layout.c

@@ -15,6 +15,15 @@ int xav_get_channel_layout(const char *name, struct ChannelLayout *layout) {
   return 1;
 }
 
+int xav_get_channel_layout_from_context(struct ChannelLayout *layout, const AVCodecContext *ctx) {
+#if LIBAVUTIL_VERSION_MAJOR >= 58
+  return av_channel_layout_copy(&layout->layout, &ctx->ch_layout);
+#else
+  layout->layout = ctx->channel_layout;
+  return 0;
+#endif
+}
+
 int xav_set_channel_layout(AVCodecContext *ctx, struct ChannelLayout *layout) {
 #if LIBAVUTIL_VERSION_MAJOR >= 58
   return av_channel_layout_copy(&ctx->ch_layout, &layout->layout);
@@ -24,6 +33,15 @@ int xav_set_channel_layout(AVCodecContext *ctx, struct ChannelLayout *layout) {
 #endif
 }
 
+int xav_set_default_channel_layout(struct ChannelLayout *layout, int channels) {
+#if LIBAVUTIL_VERSION_MAJOR >= 58
+  av_channel_layout_default(&layout->layout, channels);
+#else
+  layout->layout = av_get_default_channel_layout(channels);
+#endif
+  return 0;
+}
+
 int xav_set_frame_channel_layout(AVFrame *frame, struct ChannelLayout *layout) {
 #if LIBAVUTIL_VERSION_MAJOR >= 58
   return av_channel_layout_copy(&frame->ch_layout, &layout->layout);

c_src/xav/channel_layout.h

@@ -1,7 +1,7 @@
-#ifndef CHANNEL_LAYOUT_H
-#define CHANNEL_LAYOUT_H
-#include <libavutil/channel_layout.h>
+#ifndef XAV_CHANNEL_LAYOUT_H
+#define XAV_CHANNEL_LAYOUT_H
 #include <libavcodec/avcodec.h>
+#include <libavutil/channel_layout.h>
 
 struct ChannelLayout {
 #if LIBAVUTIL_VERSION_MAJOR >= 58
@@ -12,6 +12,8 @@ struct ChannelLayout {
 };
 
 int xav_get_channel_layout(const char *name, struct ChannelLayout *layout);
+int xav_get_channel_layout_from_context(struct ChannelLayout *layout, const AVCodecContext *ctx);
 int xav_set_channel_layout(AVCodecContext *ctx, struct ChannelLayout *layout);
+int xav_set_default_channel_layout(struct ChannelLayout *layout, int channels);
 int xav_set_frame_channel_layout(AVFrame *frame, struct ChannelLayout *layout);
 #endif

c_src/xav/decoder.c

@@ -23,7 +23,9 @@ int decoder_init(struct Decoder *decoder, const AVCodec *codec, int channels) {
   }
 
   if (codec->type == AVMEDIA_TYPE_AUDIO && channels != -1) {
-    decoder->c->channels = channels;
+    struct ChannelLayout ch_layout;
+    xav_set_default_channel_layout(&ch_layout, channels);
+    xav_set_channel_layout(decoder->c, &ch_layout);
   }
 
   decoder->frame = av_frame_alloc();

c_src/xav/decoder.h

@@ -2,6 +2,7 @@
 #include <libswresample/swresample.h>
 
 #include "audio_converter.h"
+#include "channel_layout.h"
 #include "utils.h"
 
 #define MAX_FLUSH_BUFFER 16

c_src/xav/utils.c

@@ -95,9 +95,9 @@ ERL_NIF_TERM xav_nif_packet_to_term(ErlNifEnv *env, AVPacket *packet) {
 }
 
 int xav_get_nb_channels(const AVFrame *frame) {
-  #if LIBAVUTIL_VERSION_MAJOR >= 58
-    return frame->ch_layout.nb_channels;
-  #else
-    return frame->channels;
-  #endif
-  }
+#if LIBAVUTIL_VERSION_MAJOR >= 58
+  return frame->ch_layout.nb_channels;
+#else
+  return frame->channels;
+#endif
+}

c_src/xav/xav_decoder.c

@@ -347,21 +347,13 @@ static int init_audio_converter(struct XavDecoder *xav_decoder) {
   }
 
   struct ChannelLayout in_chlayout, out_chlayout;
-#if LIBAVUTIL_VERSION_MAJOR >= 58
-  in_chlayout.layout = xav_decoder->decoder->c->ch_layout;
-  if (xav_decoder->out_channels == 0) {
-    out_chlayout.layout = in_chlayout.layout;
-  } else {
-    av_channel_layout_default(&out_chlayout.layout, xav_decoder->out_channels);
-  }
-#else
-  in_chlayout.layout = xav_decoder->decoder->c->channel_layout;
+  xav_get_channel_layout_from_context(&in_chlayout, xav_decoder->decoder->c);
+
   if (xav_decoder->out_channels == 0) {
-    out_chlayout.layout = in_chlayout.layout;
+    xav_get_channel_layout_from_context(&out_chlayout, xav_decoder->decoder->c);
   } else {
-    out_chlayout.layout = av_get_default_channel_layout(xav_decoder->out_channels);
+    xav_set_default_channel_layout(&out_chlayout, xav_decoder->out_channels);
   }
-#endif
 
   return audio_converter_init(xav_decoder->ac, in_chlayout, xav_decoder->decoder->c->sample_rate,
                               xav_decoder->decoder->c->sample_fmt, out_chlayout, out_sample_rate,

c_src/xav/xav_encoder.c

@@ -205,7 +205,7 @@ ERL_NIF_TERM encode(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
   } else {
     frame->pts = pts;
     frame->nb_samples = input.size / av_get_bytes_per_sample(xav_encoder->encoder->c->sample_fmt);
-    
+
     int nb_channels = xav_get_nb_channels(frame);
     ret = av_samples_fill_arrays(frame->data, frame->linesize, input.data, nb_channels,
                                  frame->nb_samples, xav_encoder->encoder->c->sample_fmt, 1);