miniaudio 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306f78eb852bb174b8633fc9ad08aa6326781cd093dbd73273d08c443abc6dc7
-  data.tar.gz: cc91095d14079ae4a07ab781aadc9b3d1ba1a56fef79d6a9004dc30b9287ce77
+  metadata.gz: 46b073fb1490d4f4e235a5ae135b6206aeab32660025b92d6e888f4e07cd95b1
+  data.tar.gz: 8810ae96dd14fc4d8ebcd0ae7db2f62e76a213976ff4392e560ba64b90e94e67
 SHA512:
-  metadata.gz: 10af5458bab8aaafe256dacbf00d7c1c91933c6d05592e721a81307562e9f888b44e619edd53f83f8cbe66b91866628a14a937a95ca4447ad84cf4037f71085a
-  data.tar.gz: c44b2f23f95db3c3d9d7e1014b7cbb1d82d4a8d6c376f470aeedefd776a39587cf706cd1c1337df4d7d1b4e518d01dab18cfef812761f9bc462c26abdde288a2
+  metadata.gz: a91fb070b3fc260997f6ef33bb5dab393a87025bc385f69176e8ba269a13e9c99de9d192c1177e18c158ea230c08f9375e00c21592c3dade212c229f8538eb8c
+  data.tar.gz: 630e68a04d05808e9d0e13b80fd525893da8c14ffe066aed8e2f226579b4568c008f2582cc0845a2296532e8ea0c708119a0b2adb1a36cc6b85a7997bfb25042

data/ext/miniaudio/convert_functions.h

@@ -39,6 +39,23 @@ if (ID2SYM(rb_intern(MA_SAMPLE_FORMAT_U8)) == rb) { \
   rb_raise(rb_eArgError, "Unknown %s sample format: %+"PRIsVALUE". Allowed: :u8, :s16, :s24, :s32, :f32", err, rb); \
 }
 
+#define CHECK_MA_G711_CONVERTIBLE_SAMPLE_FORMAT(rb, c, err) \
+ma_format c = ma_format_unknown; \
+if (ID2SYM(rb_intern(MA_SAMPLE_FORMAT_S16)) == rb) { \
+  c = ma_format_s16; \
+} else if (ID2SYM(rb_intern(MA_SAMPLE_FORMAT_S32)) == rb) { \
+  c = ma_format_s32; \
+} else if (ID2SYM(rb_intern(MA_SAMPLE_FORMAT_F32)) == rb) { \
+  c = ma_format_f32; \
+} else { \
+  rb_raise(rb_eArgError, "Unknown %s sample format: %+"PRIsVALUE". Allowed: :s16, :s32, :f32", err, rb); \
+}
+
+#define CHECK_G711_FORMAT(rb, err) \
+if (ID2SYM(rb_intern(G711_FORMAT_ALAW)) != rb && ID2SYM(rb_intern(G711_FORMAT_MULAW)) != rb) { \
+  rb_raise(rb_eArgError, "Unknown %s format: %+"PRIsVALUE". Allowed: :alaw and :mulaw", err, rb); \
+}
+
 static int sample_width(ma_format ma_fmt) {
   switch (ma_fmt) {
     case ma_format_u8:
@@ -56,6 +73,26 @@ static int sample_width(ma_format ma_fmt) {
   return 0;
 }
 
+#define SAMPLE_WIDTH_s16 2
+#define SAMPLE_WIDTH_s32 4
+#define SAMPLE_WIDTH_f32 4
+
+#define FROM_G711_CONVERSION(FROM, TO) \
+static VALUE rb_g711_conversion_ ## FROM ## _to_ ## TO (VALUE mod, VALUE rb_source) { \
+  int mem_len = RSTRING_LEN(rb_source) * SAMPLE_WIDTH_ ## TO; \
+  void *converted = malloc(mem_len); \
+ \
+  if (converted == NULL) { \
+    rb_raise(rb_eNoMemError, "Unable to allocate memory for converted frames"); \
+  } \
+ \
+  drwav_ ## FROM ## _to_ ## TO (converted, (void*)StringValuePtr(rb_source), RSTRING_LEN(rb_source)); \
+ \
+  VALUE rb_output = rb_str_new(converted, mem_len); \
+  free(converted); \
+  return rb_output; \
+}
+
 static VALUE rb_ma_convert_frames(
   VALUE mod, VALUE rb_source, 
   VALUE rb_source_format, VALUE rb_source_channels, VALUE rb_source_sample_rate,
@@ -113,6 +150,22 @@ static VALUE rb_ma_convert_frames(
   return ret;
 }
 
+FROM_G711_CONVERSION(alaw, s16)
+FROM_G711_CONVERSION(alaw, s32)
+FROM_G711_CONVERSION(alaw, f32)
+
+FROM_G711_CONVERSION(mulaw, s16)
+FROM_G711_CONVERSION(mulaw, s32)
+FROM_G711_CONVERSION(mulaw, f32)
+
 void define_convert_functions_under(VALUE mod) {
-  rb_define_module_function(mod, "convert_frames", &rb_ma_convert_frames, 7);
+  rb_define_module_function(mod, "_convert_frames", &rb_ma_convert_frames, 7);
+  
+  rb_define_module_function(mod, "alaw_to_s16", &rb_g711_conversion_alaw_to_s16, 1);
+  rb_define_module_function(mod, "alaw_to_s32", &rb_g711_conversion_alaw_to_s32, 1);
+  rb_define_module_function(mod, "alaw_to_f32", &rb_g711_conversion_alaw_to_f32, 1);
+  
+  rb_define_module_function(mod, "mulaw_to_s16", &rb_g711_conversion_mulaw_to_s16, 1);
+  rb_define_module_function(mod, "mulaw_to_s32", &rb_g711_conversion_mulaw_to_s32, 1);
+  rb_define_module_function(mod, "mulaw_to_f32", &rb_g711_conversion_mulaw_to_f32, 1);
 }

data/lib/miniaudio.rb

@@ -1,8 +1,48 @@
 module Miniaudio
-  VERSION = '0.1.0'
+  VERSION = '0.3.3'
 
-  FRAME_FORMATS = %i[u8 s16 s24 s32 f32]
+  FRAME_FORMATS = %i[u8 s16 s24 s32 f32].freeze
+
+  G711_ALGORYTHMS = %i[alaw mulaw].freeze
+  G711_ALGOS = G711_ALGORYTHMS
+  G711_CONVERTIBLE_FORMATS = %i[s16 s32 f32].freeze
+
+  G711_SAMPLE_RATE = 8000
+
+  class << self
+    def convert_frames(
+      source_string,
+      src_frame_format, src_channels_num, src_sample_rate,
+      dst_frame_format, dst_channels_num, dst_sample_rate)
+
+      raise ArgumentError, "Unable to convert to G.711 codec" if G711_ALGOS.include?(dst_frame_format)
+
+      if G711_ALGOS.include?(src_frame_format)
+        target_format = FRAME_FORMATS.include?(dst_frame_format) ? dst_frame_format : :s16
+
+        pcm = method("#{src_frame_format}_to_#{target_format}").(source_string)
+
+        if src_sample_rate != dst_sample_rate || src_channels_num != dst_channels_num || dst_frame_format != target_format
+          converted, bytes_used = _convert_frames(
+            pcm,
+            target_format, src_channels_num, G711_SAMPLE_RATE,
+            dst_frame_format, dst_channels_num, dst_sample_rate
+          )
+
+          [converted, bytes_used * source_string.length / pcm.length]
+        else
+          [pcm, source_string.length]
+        end
+      else
+        _convert_frames(
+          source_string,
+          src_frame_format, src_channels_num, src_sample_rate,
+          dst_frame_format, dst_channels_num, dst_sample_rate
+        )
+      end
+    end
+  end
 end
 
-require 'miniaudio/miniaudio'
+require_relative 'miniaudio/miniaudio'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miniaudio
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Ivan Razuvaev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies: []
 description: Miniaudio library (https://github.com/mackron/miniaudio) Ruby wrapper
 email: team@orlando-labs.com
@@ -28,7 +28,7 @@ homepage: https://github.com/orlando-labs/rb-miniaudio
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Miniaudio library Ruby wrapper
 test_files: []