Mixdowns use MP3

crsib · Jan 18, 2024 · 64364cf · 64364cf
1 parent bba5375
commit 64364cf
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 11 deletions.
diff --git a/libraries/lib-cloud-audiocom/ServiceConfig.cpp b/libraries/lib-cloud-audiocom/ServiceConfig.cpp
@@ -152,14 +152,19 @@ std::chrono::milliseconds ServiceConfig::GetProgressCallbackTimeout() const
    return std::chrono::seconds(3);
 }
 
-std::vector<std::string> ServiceConfig::GetPreferredAudioFormats() const
+std::vector<std::string>
+ServiceConfig::GetPreferredAudioFormats(bool preferLossless) const
 {
-   return { "audio/x-wavpack", "audio/x-flac", "audio/x-wav" };
+   if (preferLossless)
+      return { "audio/x-wavpack", "audio/x-flac", "audio/x-wav" };
+   else
+      return { "audio/mpeg" };
 }
 
-rapidjson::Document ServiceConfig::GetExportConfig(const std::string& mimeType) const
+rapidjson::Document
+ServiceConfig::GetExportConfig(const std::string& mimeType) const
 {
-   if(mimeType == "audio/x-wavpack")
+   if (mimeType == "audio/x-wavpack")
    {
       rapidjson::Document config;
       config.SetObject();
@@ -169,17 +174,27 @@ rapidjson::Document ServiceConfig::GetExportConfig(const std::string& mimeType)
       config.AddMember("hybrid_mode", false, config.GetAllocator());
       return config;
    }
-   if(mimeType == "audio/x-flac")
+   else if (mimeType == "audio/x-flac")
    {
       rapidjson::Document config;
       config.SetObject();
-      config.AddMember("bit_depth", rapidjson::Value(24), config.GetAllocator());
+      config.AddMember(
+         "bit_depth", rapidjson::Value(24), config.GetAllocator());
       config.AddMember("level", rapidjson::Value(5), config.GetAllocator());
    }
-   if(mimeType == "audio/x-wav")
+   else if (mimeType == "audio/x-wav")
    {
       return {};
    }
+   else if (mimeType == "audio/mpeg")
+   {
+      rapidjson::Document config;
+      config.SetObject();
+      config.AddMember("mode", rapidjson::Value("VBR"), config.GetAllocator());
+      config.AddMember("quality", rapidjson::Value(5), config.GetAllocator());
+      return config;
+   }
+
    throw std::invalid_argument("unknown mime-type");
 }
 

diff --git a/libraries/lib-cloud-audiocom/ServiceConfig.h b/libraries/lib-cloud-audiocom/ServiceConfig.h
@@ -42,7 +42,7 @@ class CLOUD_AUDIOCOM_API ServiceConfig final
    //! Timeout between progress callbacks
    std::chrono::milliseconds GetProgressCallbackTimeout() const;
    //! Preferred audio format
-   std::vector<std::string> GetPreferredAudioFormats() const;
+   std::vector<std::string> GetPreferredAudioFormats(bool preferLossless = true) const;
    //! Export configuration suitable for the mime type provided
    rapidjson::Document GetExportConfig(const std::string& exporterName) const;
    //! Return the mime type server should store the file. This is a requirement

diff --git a/libraries/lib-cloud-audiocom/sync/LocalProjectSnapshot.cpp b/libraries/lib-cloud-audiocom/sync/LocalProjectSnapshot.cpp
@@ -467,14 +467,14 @@ void LocalProjectSnapshot::OnSnapshotCreated(
          if (mProjectCloudExtension.NeedsMixdownSync())
          {
             mMixdownUploadInProgress.store(true, std::memory_order_release);
+
             mMixdownUploader = MixdownUploader::Upload(
                mCloudSyncUI, mServiceConfig, *project, mixdownUrls,
                [this](std::string, bool success)
                {
                   if (success)
                      mProjectCloudExtension.MixdownSynced();
 
-                  mMixdownUploader.reset();
                   mMixdownUploadInProgress.store(
                      false, std::memory_order_release);
                });

diff --git a/libraries/lib-cloud-audiocom/sync/MixdownUploader.cpp b/libraries/lib-cloud-audiocom/sync/MixdownUploader.cpp
@@ -272,7 +272,7 @@ void MixdownUploader::ExportProject()
    const auto& registry = ExportPluginRegistry::Get();
 
    for (const auto& preferredMimeType :
-        GetServiceConfig().GetPreferredAudioFormats())
+        GetServiceConfig().GetPreferredAudioFormats(false))
    {
       auto config = GetServiceConfig().GetExportConfig(preferredMimeType);
       ExportProcessor::Parameters parameters;
@@ -325,7 +325,10 @@ void MixdownUploader::UploadMixdown()
       [this](UploadResult result)
       {
          BasicUI::CallAfter([this, result = std::move(result)]
-                            { mCloudSyncUI.OnMixdownFinished(); });
+            {
+               mCloudSyncUI.OnMixdownFinished();
+               mOnComplete(result.ErrorMessage, result.Code == UploadResultCode::Success);
+            });
       },
       {});
 }