claunia/cuetools.net
1
0
Fork 0
mirror of https://github.com/claunia/cuetools.net.git synced 2025-12-16 18:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

WavPackWriter: support multichannel audio, channelMask

Browse Source
This commit is contained in:
Grigory Chudov
2013-04-14 17:17:47 -04:00
parent 563f066646
commit e480b1612e
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CUETools.Codecs.WavPack/CUETools.Codecs.WavPack.cpp
View File

@@ -110,7 +110,8 @@ namespace CUETools { namespace Codecs { namespace WavPack {
pcm = gcnew AudioPCMConfig(
WavpackGetBitsPerSample(_wpc),
WavpackGetNumChannels(_wpc),
(int)WavpackGetSampleRate(_wpc));
(int)WavpackGetSampleRate(_wpc),
(AudioPCMConfig::SpeakerConfig)WavpackGetChannelMask(_wpc));
_sampleCount = WavpackGetNumSamples(_wpc);
_sampleOffset = 0;
}
@@ -342,8 +343,6 @@ namespace CUETools { namespace Codecs { namespace WavPack {
{
_settings = settings;
if (_settings->PCM->ChannelCount != 1 && _settings->PCM->ChannelCount != 2)
throw gcnew Exception("Only stereo and mono audio formats are allowed.");
if (_settings->PCM->BitsPerSample < 16 || _settings->PCM->BitsPerSample > 24)
throw gcnew Exception("Bits per sample must be 16..24.");
@@ -474,7 +473,7 @@ namespace CUETools { namespace Codecs { namespace WavPack {
config.bits_per_sample = _settings->PCM->BitsPerSample;
config.bytes_per_sample = (_settings->PCM->BitsPerSample + 7) / 8;
config.num_channels = _settings->PCM->ChannelCount;
config.channel_mask = 5 - _settings->PCM->ChannelCount;
config.channel_mask = (int32_t)_settings->PCM->ChannelMask;
config.sample_rate = _settings->PCM->SampleRate;
Int32 _compressionMode = _settings->EncoderModeIndex;
if (_compressionMode == 0) config.flags |= CONFIG_FAST_FLAG;