Add AudioSampleFormat to SoundTrackFormat

Author: bakajikara

src/framework/audio/common/audiotypes.h

@@ -105,21 +105,47 @@ enum class SoundTrackType {
     WAV
 };
 
+enum class AudioSampleFormat {
+    Undefined = 0,
+    Int16,
+    Int24,
+    Float32
+};
+
 struct SoundTrackFormat {
     SoundTrackType type = SoundTrackType::Undefined;
     OutputSpec outputSpec;
+    AudioSampleFormat sampleFormat = AudioSampleFormat::Undefined;
     int bitRate = 0;
 
     bool operator==(const SoundTrackFormat& other) const
     {
         return type == other.type
                && outputSpec == other.outputSpec
+               && sampleFormat == other.sampleFormat
                && bitRate == other.bitRate;
     }
 
     bool isValid() const
     {
-        return type != SoundTrackType::Undefined && outputSpec.isValid();
+        if (!outputSpec.isValid()) {
+            return false;
+        }
+
+        switch (type) {
+        case SoundTrackType::WAV:
+        case SoundTrackType::FLAC:
+            // For lossless/uncompressed, sample format must be defined
+            return sampleFormat != AudioSampleFormat::Undefined;
+
+        case SoundTrackType::MP3:
+        case SoundTrackType::OGG:
+            // For lossy, bitrate must be positive
+            return bitRate > 0;
+
+        default:
+            return false;
+        }
     }
 };
 

src/framework/audio/common/rpc/rpcpacker.h

@@ -63,6 +63,8 @@ void unpack_custom(muse::msgpack::UnPacker& p, muse::audio::SoundPreset& value);
 
 void pack_custom(muse::msgpack::Packer& p, const muse::audio::SoundTrackType& value);
 void unpack_custom(muse::msgpack::UnPacker& p, muse::audio::SoundTrackType& value);
+void pack_custom(muse::msgpack::Packer& p, const muse::audio::AudioSampleFormat& value);
+void unpack_custom(muse::msgpack::UnPacker& p, muse::audio::AudioSampleFormat& value);
 void pack_custom(muse::msgpack::Packer& p, const muse::audio::SoundTrackFormat& value);
 void unpack_custom(muse::msgpack::UnPacker& p, muse::audio::SoundTrackFormat& value);
 
@@ -259,14 +261,26 @@ inline void unpack_custom(muse::msgpack::UnPacker& p, muse::audio::SoundTrackTyp
     value = static_cast<muse::audio::SoundTrackType>(type);
 }
 
+inline void pack_custom(muse::msgpack::Packer& p, const muse::audio::AudioSampleFormat& value)
+{
+    p.process(static_cast<int>(value));
+}
+
+inline void unpack_custom(muse::msgpack::UnPacker& p, muse::audio::AudioSampleFormat& value)
+{
+    int format = 0;
+    p.process(format);
+    value = static_cast<muse::audio::AudioSampleFormat>(format);
+}
+
 inline void pack_custom(muse::msgpack::Packer& p, const muse::audio::SoundTrackFormat& value)
 {
-    p.process(value.type, value.outputSpec, value.bitRate);
+    p.process(value.type, value.outputSpec, value.sampleFormat, value.bitRate);
 }
 
 inline void unpack_custom(muse::msgpack::UnPacker& p, muse::audio::SoundTrackFormat& value)
 {
-    p.process(value.type, value.outputSpec, value.bitRate);
+    p.process(value.type, value.outputSpec, value.sampleFormat, value.bitRate);
 }
 
 inline void pack_custom(muse::msgpack::Packer& p, const muse::audio::AudioSignalVal& value)

src/importexport/audioexport/internal/flacwriter.cpp

@@ -37,7 +37,8 @@ muse::Ret FlacWriter::write(notation::INotationPtr notation, muse::io::IODevice&
             configuration()->exportBufferSize(),
             2 /* audioChannelsNumber */
         },
-        128 /* bitRate */
+        AudioSampleFormat::Int16,
+        0 /* bitRate */
     };
 
     return doWriteAndWait(notation, destinationDevice, format);

src/importexport/audioexport/internal/mp3writer.cpp

@@ -37,6 +37,7 @@ Ret Mp3Writer::write(notation::INotationPtr notation, io::IODevice& destinationD
             configuration()->exportBufferSize(),
             2 /* audioChannelsNumber */
         },
+        AudioSampleFormat::Undefined,
         configuration()->exportMp3Bitrate()
     };
 

src/importexport/audioexport/internal/oggwriter.cpp

@@ -38,6 +38,7 @@ Ret OggWriter::write(notation::INotationPtr notation, io::IODevice& destinationD
             configuration()->exportBufferSize(),
             2 /* audioChannelsNumber */
         },
+        AudioSampleFormat::Undefined,
         128 /* bitRate */
     };
 

src/importexport/audioexport/internal/wavewriter.cpp

@@ -37,6 +37,7 @@ Ret WaveWriter::write(notation::INotationPtr notation, io::IODevice& destination
             configuration()->exportBufferSize(),
             2 /* audioChannelsNumber */
         },
+        AudioSampleFormat::Float32,
         0 /* bitRate */
     };