add test

Author: gBillal

Makefile

@@ -16,8 +16,8 @@ XAV_VIDEO_CONVERTER_SO = $(PRIV_DIR)/libxavvideoconverter.so
 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
 
-ENCODER_HEADERS = $(XAV_DIR)/xav_encoder.h $(XAV_DIR)/encoder.h $(XAV_DIR)/utils.h
-ENCODER_SOURCES = $(XAV_DIR)/xav_encoder.c $(XAV_DIR)/encoder.c $(XAV_DIR)/utils.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
 
 READER_HEADERS = $(XAV_DIR)/xav_reader.h $(XAV_DIR)/reader.h $(XAV_DIR)/video_converter.h $(XAV_DIR)/audio_converter.h $(XAV_DIR)/utils.h $(XAV_DIR)/channel_layout.h
 READER_SOURCES = $(XAV_DIR)/xav_reader.c $(XAV_DIR)/reader.c $(XAV_DIR)/video_converter.c $(XAV_DIR)/audio_converter.c $(XAV_DIR)/utils.c

c_src/xav/xav_encoder.c

@@ -1,4 +1,5 @@
 #include "xav_encoder.h"
+#include "channel_layout.h"
 
 ErlNifResourceType *xav_encoder_resource_type;
 
@@ -132,10 +133,16 @@ ERL_NIF_TERM new (ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
   if (encoder_config.codec->type == AVMEDIA_TYPE_AUDIO) {
     xav_encoder->frame->format = encoder_config.format;
     xav_encoder->frame->nb_samples = xav_encoder->encoder->c->frame_size;
+    // For encoder that accepts dynamic frame size, we set it to 1024.
+    if (xav_encoder->frame->nb_samples == 0) {
+      xav_encoder->frame->nb_samples = 1024;
+    }
+
     if (xav_set_frame_channel_layout(xav_encoder->frame, &encoder_config.channel_layout) < 0) {
       ret = xav_nif_raise(env, "failed_to_set_channel_layout");
       goto clean;
     }
+
     if (av_frame_get_buffer(xav_encoder->frame, 0) < 0) {
       ret = xav_nif_raise(env, "failed_to_get_buffer");
       goto clean;
@@ -197,6 +204,8 @@ 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);

c_src/xav/xav_encoder.h

@@ -1,4 +1,3 @@
-#include "channel_layout.c"
 #include "encoder.h"
 #include "utils.h"
 #include <libavutil/pixfmt.h>

test/encoder_test.exs

@@ -111,5 +111,33 @@ defmodule Xav.EncoderTest do
       assert length(packets) == 20
       assert Enum.all?(packets, &(&1.dts == &1.pts)), "dts should be equal to pts"
     end
+
+    test "encode audio samples" do
+      audio_file = "test/fixtures/encoder/audio/input-s16le.raw"
+      ref_file = "test/fixtures/encoder/audio/reference.al"
+
+      encoder =
+        Xav.Encoder.new(:pcm_alaw,
+          format: :s16,
+          channel_layout: "mono",
+          sample_rate: 8000
+        )
+
+      encoded_data =
+        File.stream!(audio_file, 20)
+        |> Stream.map(&%Xav.Frame{type: :audio, data: &1, format: :s16, pts: 0})
+        |> Stream.transform(
+          fn -> encoder end,
+          fn frame, encoder ->
+            {Xav.Encoder.encode(encoder, frame), encoder}
+          end,
+          fn encoder -> {Xav.Encoder.flush(encoder), encoder} end,
+          fn _encoder -> :ok end
+        )
+        |> Stream.map(& &1.data)
+        |> Enum.join()
+
+      assert File.read!(ref_file) == encoded_data
+    end
   end
 end