- low quality audio convertor for VK audiomessages

Author: devgopher

…i.Audio.Tests/UniversalConvertorTests.cs …sts/UniversalLowQualityConvertorTests.csBotticelli.Audio.Tests/UniversalConvertorTests.cs renamed to Botticelli.Audio.Tests/UniversalLowQualityConvertorTests.cs Botticelli.Audio.Tests/UniversalConvertorTests.cs renamed to Botticelli.Audio.Tests/UniversalLowQualityConvertorTests.cs

@@ -3,15 +3,15 @@
 namespace Botticelli.Audio.Tests
 {
     [TestFixture()]
-    public class UniversalConvertorTests
+    public class UniversalLowQualityConvertorTests
     {
         private readonly IConvertor _convertor;
         private readonly IAnalyzer _analyzer;
 
-        public UniversalConvertorTests()
+        public UniversalLowQualityConvertorTests()
         {
             _analyzer = new InputAnalyzer();
-            _convertor = new UniversalConvertor(_analyzer);
+            _convertor = new UniversalLowQualityConvertor(_analyzer);
         }
 
         [Test()]
@@ -33,14 +33,14 @@ public void ConvertMp3ToOpusTest()
         }
 
         [Test()]
-        public void ConvertMp3ToWavTest()
+        public void ConvertMp3ToOggTest()
         {
             if (!File.Exists("voice.mp3"))
                 Assert.Fail("no voice.mp3!");
             using var stream = File.OpenRead("voice.mp3");
             var outcome = _convertor.Convert(stream, new AudioInfo()
             {
-                AudioFormat = AudioFormat.Aac,
+                AudioFormat = AudioFormat.Ogg,
                 Channels = 2,
                 SampleRate = 8000,
                 BitsPerSample = 8

Botticelli.Audio/Exceptions/AudioConvertorException.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Botticelli.Audio.Exceptions
+{
+    public class AudioConvertorException : Exception
+    {
+        public AudioConvertorException(string message, Exception ex) : base(message, ex) { }
+    }
+}

Botticelli.Audio/IConvertor.cs

@@ -3,4 +3,5 @@
 public interface IConvertor
 {
     public byte[] Convert(Stream input, AudioInfo targetParams);
+    public byte[] Convert(byte[] input, AudioInfo targetParams);
 }

Botticelli.Audio/UniversalConvertor.cs …li.Audio/UniversalLowQualityConvertor.csBotticelli.Audio/UniversalConvertor.cs renamed to Botticelli.Audio/UniversalLowQualityConvertor.cs Botticelli.Audio/UniversalConvertor.cs renamed to Botticelli.Audio/UniversalLowQualityConvertor.cs

@@ -1,4 +1,6 @@
-using FFMpegCore;
+using System.ComponentModel;
+using Botticelli.Audio.Exceptions;
+using FFMpegCore;
 using FFMpegCore.Enums;
 using FFMpegCore.Exceptions;
 using FFMpegCore.Pipes;
@@ -8,24 +10,38 @@
 
 namespace Botticelli.Audio;
 
-public class UniversalConvertor : IConvertor
+public class UniversalLowQualityConvertor : IConvertor
 {
     private readonly IAnalyzer _analyzer;
 
-    public UniversalConvertor(IAnalyzer analyzer) => _analyzer = analyzer;
+    public UniversalLowQualityConvertor(IAnalyzer analyzer) => _analyzer = analyzer;
 
     public byte[] Convert(Stream input, AudioInfo targetParams)
     {
-        if (targetParams.AudioFormat is AudioFormat.M4a or AudioFormat.Aac or AudioFormat.Opus)
-            return ProcessByStreamEncoder(input, targetParams);
+        try
+        {
+            if (targetParams.AudioFormat is AudioFormat.M4a or AudioFormat.Aac or AudioFormat.Opus or AudioFormat.Ogg)
+                return ProcessByStreamEncoder(input, targetParams);
 
-        var srcParams = _analyzer.Analyze(input);
+            var srcParams = _analyzer.Analyze(input);
 
-        using var resultStream = new MemoryStream();
-        using var srcStream = GetSourceWaveStream(input, srcParams);
-        using var tgtStream = GetTargetWaveStream(srcStream, targetParams);
+            using var resultStream = new MemoryStream();
+            using var srcStream = GetSourceWaveStream(input, srcParams);
+            using var tgtStream = GetTargetWaveStream(srcStream, targetParams);
 
-        return tgtStream.ToArray();
+            return tgtStream.ToArray();
+        }
+        catch (Exception ex)
+        {
+            throw new AudioConvertorException($"Audio conversion error: {ex.Message}", ex);
+        }
+    }
+
+    public byte[] Convert(byte[] input, AudioInfo targetParams)
+    {
+        using var ms = new MemoryStream(input);
+     
+        return Convert(ms, targetParams);
     }
 
     private static byte[] ProcessByStreamEncoder(Stream input, AudioInfo tgtParams)
@@ -47,6 +63,9 @@ private static byte[] ProcessByStreamEncoder(Stream input, AudioInfo tgtParams)
                 case AudioFormat.Opus:
                     codec = "opus";
                     break;
+                case AudioFormat.Wav:
+                    codec = "wav";
+                    break;
                 case AudioFormat.Unknown:
                 default:
                     throw new ArgumentOutOfRangeException();
@@ -57,6 +76,7 @@ private static byte[] ProcessByStreamEncoder(Stream input, AudioInfo tgtParams)
                 .FromPipeInput(new StreamPipeSource(input))
                 .OutputToPipe(new StreamPipeSink(output), options => options
                     .ForceFormat(codec)
+                    .WithAudioBitrate(16000)
                     .WithAudioBitrate(AudioQuality.Low))
                 .ProcessSynchronously();
 

Botticelli.Framework.Vk/Botticelli.Framework.Vk.Messages.csproj

@@ -15,6 +15,7 @@
 	<ItemGroup>
 		<ProjectReference Include="..\BotDataSecureStorage\BotDataSecureStorage.csproj" />
 		<ProjectReference Include="..\Botticelli.API\Botticelli.BotBase.csproj" />
+		<ProjectReference Include="..\Botticelli.Audio\Botticelli.Audio.csproj" />
 		<ProjectReference Include="..\Botticelli.Framework\Botticelli.Framework.csproj" />
 		<PackageReference Include="Flurl" Version="3.0.7" />
 		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.10" />

Botticelli.Framework.Vk/Extensions/ServiceCollectionExtensions.cs

@@ -1,4 +1,5 @@
 using BotDataSecureStorage;
+using Botticelli.Audio;
 using Botticelli.BotBase;
 using Botticelli.BotBase.Settings;
 using Botticelli.BotBase.Utils;
@@ -79,6 +80,7 @@ public static IServiceCollection AddVkBot(this IServiceCollection services,
                 .AddSingleton<VkStorageUploader>()
                 .AddSingleton<LongPollMessagesProvider>()
                 .AddSingleton<MessagePublisher>()
+                .AddSingleton<IConvertor, UniversalLowQualityConvertor>()
                 .AddSingleton(secureStorage)
                 .AddBotticelliFramework();
 

Botticelli.Framework.Vk/VkStorageUploader.cs

@@ -1,4 +1,5 @@
 using System.Text.Json;
+using Botticelli.Audio;
 using Botticelli.BotBase.Exceptions;
 using Botticelli.Framework.Vk.API.Requests;
 using Botticelli.Framework.Vk.API.Responses;
@@ -13,12 +14,16 @@ namespace Botticelli.Framework.Vk.Messages;
 public class VkStorageUploader
 {
     private readonly IHttpClientFactory _httpClientFactory;
+    private readonly IConvertor _audioConvertor;
     private readonly ILogger<MessagePublisher> _logger;
     private string _apiKey;
 
-    public VkStorageUploader(IHttpClientFactory httpClientFactory, ILogger<MessagePublisher> logger)
+    public VkStorageUploader(IHttpClientFactory httpClientFactory, 
+        IConvertor audioConvertor,
+        ILogger<MessagePublisher> logger)
     {
         _httpClientFactory = httpClientFactory;
+        _audioConvertor = audioConvertor;
         _logger = logger;
     }
 
@@ -166,7 +171,14 @@ private async Task<UploadPhotoResult> UploadPhoto(string uploadUrl, string name,
     private async Task<UploadDocResult> UploadAudioMessage(string uploadUrl, string name, byte[] binaryContent, CancellationToken token)
     {
         using var httpClient = _httpClientFactory.CreateClient();
-        using var memoryContentStream = new MemoryStream(binaryContent);
+        // convert to ogg in order to meet VK requirements
+        var oggContent = _audioConvertor.Convert(binaryContent, new AudioInfo()
+        {
+            AudioFormat = AudioFormat.Ogg,
+            Bitrate = 16000
+        });
+
+        using var memoryContentStream = new MemoryStream(oggContent);
         memoryContentStream.Seek(0, SeekOrigin.Begin);
 
         var content = new MultipartFormDataContent { { new StreamContent(memoryContentStream), "audio", name } };