pcm/PcmChannels: use the SampleTraits library
This commit is contained in:
Max Kellermann
parent
36e3fda554
commit
71b47ae3ef
@ -20,6 +20,8 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "PcmChannels.hxx"
|
#include "PcmChannels.hxx"
|
||||||
#include "PcmBuffer.hxx"
|
#include "PcmBuffer.hxx"
|
||||||
|
#include "Traits.hxx"
|
||||||
|
#include "AudioFormat.hxx"
|
||||||
#include "util/ConstBuffer.hxx"
|
#include "util/ConstBuffer.hxx"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
@ -37,40 +39,79 @@ MonoToStereo(D dest, S src, S end)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
template<SampleFormat F, class Traits=SampleTraits<F>>
|
||||||
pcm_convert_channels_16_2_to_1(int16_t *gcc_restrict dest,
|
static typename Traits::value_type
|
||||||
const int16_t *gcc_restrict src,
|
StereoToMono(typename Traits::value_type _a,
|
||||||
const int16_t *gcc_restrict src_end)
|
typename Traits::value_type _b)
|
||||||
{
|
{
|
||||||
while (src < src_end) {
|
typename Traits::long_type a(_a);
|
||||||
int32_t a = *src++, b = *src++;
|
typename Traits::long_type b(_b);
|
||||||
|
|
||||||
*dest++ = (a + b) / 2;
|
return typename Traits::value_type((a + b) / 2);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
template<SampleFormat F, class Traits=SampleTraits<F>>
|
||||||
pcm_convert_channels_16_n_to_2(int16_t *gcc_restrict dest,
|
static typename Traits::pointer_type
|
||||||
unsigned src_channels,
|
StereoToMono(typename Traits::pointer_type dest,
|
||||||
const int16_t *gcc_restrict src,
|
typename Traits::const_pointer_type src,
|
||||||
const int16_t *gcc_restrict src_end)
|
typename Traits::const_pointer_type end)
|
||||||
{
|
{
|
||||||
unsigned c;
|
while (src != end) {
|
||||||
|
const auto a = *src++;
|
||||||
|
const auto b = *src++;
|
||||||
|
|
||||||
assert(src_channels > 0);
|
*dest++ = StereoToMono<F, Traits>(a, b);
|
||||||
|
}
|
||||||
|
|
||||||
while (src < src_end) {
|
return dest;
|
||||||
int32_t sum = 0;
|
}
|
||||||
int16_t value;
|
|
||||||
|
|
||||||
for (c = 0; c < src_channels; ++c)
|
template<SampleFormat F, class Traits=SampleTraits<F>>
|
||||||
|
static typename Traits::pointer_type
|
||||||
|
NToStereo(typename Traits::pointer_type dest,
|
||||||
|
unsigned src_channels,
|
||||||
|
typename Traits::const_pointer_type src,
|
||||||
|
typename Traits::const_pointer_type end)
|
||||||
|
{
|
||||||
|
assert((end - src) % src_channels == 0);
|
||||||
|
|
||||||
|
while (src != end) {
|
||||||
|
typename Traits::long_type sum = *src++;
|
||||||
|
for (unsigned c = 1; c < src_channels; ++c)
|
||||||
sum += *src++;
|
sum += *src++;
|
||||||
value = sum / (int)src_channels;
|
|
||||||
|
|
||||||
/* XXX this is actually only mono ... */
|
typename Traits::value_type value(sum / int(src_channels));
|
||||||
|
|
||||||
|
/* TODO: this is actually only mono ... */
|
||||||
*dest++ = value;
|
*dest++ = value;
|
||||||
*dest++ = value;
|
*dest++ = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return dest;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<SampleFormat F, class Traits=SampleTraits<F>>
|
||||||
|
static ConstBuffer<typename Traits::value_type>
|
||||||
|
ConvertChannels(PcmBuffer &buffer,
|
||||||
|
unsigned dest_channels,
|
||||||
|
unsigned src_channels,
|
||||||
|
ConstBuffer<typename Traits::value_type> src)
|
||||||
|
{
|
||||||
|
assert(src.size % src_channels == 0);
|
||||||
|
|
||||||
|
const size_t dest_size = src.size / src_channels * dest_channels;
|
||||||
|
auto dest = buffer.GetT<typename Traits::value_type>(dest_size);
|
||||||
|
|
||||||
|
if (src_channels == 1 && dest_channels == 2)
|
||||||
|
MonoToStereo(dest, src.begin(), src.end());
|
||||||
|
else if (src_channels == 2 && dest_channels == 1)
|
||||||
|
StereoToMono<F>(dest, src.begin(), src.end());
|
||||||
|
else if (dest_channels == 2)
|
||||||
|
NToStereo<F>(dest, src_channels, src.begin(), src.end());
|
||||||
|
else
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
|
return { dest, dest_size };
|
||||||
}
|
}
|
||||||
|
|
||||||
ConstBuffer<int16_t>
|
ConstBuffer<int16_t>
|
||||||
@ -79,58 +120,8 @@ pcm_convert_channels_16(PcmBuffer &buffer,
|
|||||||
unsigned src_channels,
|
unsigned src_channels,
|
||||||
ConstBuffer<int16_t> src)
|
ConstBuffer<int16_t> src)
|
||||||
{
|
{
|
||||||
assert(src.size % src_channels == 0);
|
return ConvertChannels<SampleFormat::S16>(buffer, dest_channels,
|
||||||
|
src_channels, src);
|
||||||
const size_t dest_size = src.size / src_channels * dest_channels;
|
|
||||||
int16_t *dest = buffer.GetT<int16_t>(dest_size);
|
|
||||||
|
|
||||||
if (src_channels == 1 && dest_channels == 2)
|
|
||||||
MonoToStereo(dest, src.begin(), src.end());
|
|
||||||
else if (src_channels == 2 && dest_channels == 1)
|
|
||||||
pcm_convert_channels_16_2_to_1(dest, src.begin(), src.end());
|
|
||||||
else if (dest_channels == 2)
|
|
||||||
pcm_convert_channels_16_n_to_2(dest, src_channels,
|
|
||||||
src.begin(), src.end());
|
|
||||||
else
|
|
||||||
return nullptr;
|
|
||||||
|
|
||||||
return { dest, dest_size };
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
pcm_convert_channels_24_2_to_1(int32_t *gcc_restrict dest,
|
|
||||||
const int32_t *gcc_restrict src,
|
|
||||||
const int32_t *gcc_restrict src_end)
|
|
||||||
{
|
|
||||||
while (src < src_end) {
|
|
||||||
int32_t a = *src++, b = *src++;
|
|
||||||
|
|
||||||
*dest++ = (a + b) / 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
pcm_convert_channels_24_n_to_2(int32_t *gcc_restrict dest,
|
|
||||||
unsigned src_channels,
|
|
||||||
const int32_t *gcc_restrict src,
|
|
||||||
const int32_t *gcc_restrict src_end)
|
|
||||||
{
|
|
||||||
unsigned c;
|
|
||||||
|
|
||||||
assert(src_channels > 0);
|
|
||||||
|
|
||||||
while (src < src_end) {
|
|
||||||
int32_t sum = 0;
|
|
||||||
int32_t value;
|
|
||||||
|
|
||||||
for (c = 0; c < src_channels; ++c)
|
|
||||||
sum += *src++;
|
|
||||||
value = sum / (int)src_channels;
|
|
||||||
|
|
||||||
/* XXX this is actually only mono ... */
|
|
||||||
*dest++ = value;
|
|
||||||
*dest++ = value;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ConstBuffer<int32_t>
|
ConstBuffer<int32_t>
|
||||||
@ -139,57 +130,8 @@ pcm_convert_channels_24(PcmBuffer &buffer,
|
|||||||
unsigned src_channels,
|
unsigned src_channels,
|
||||||
ConstBuffer<int32_t> src)
|
ConstBuffer<int32_t> src)
|
||||||
{
|
{
|
||||||
assert(src.size % src_channels == 0);
|
return ConvertChannels<SampleFormat::S24_P32>(buffer, dest_channels,
|
||||||
|
src_channels, src);
|
||||||
size_t dest_size = src.size / src_channels * dest_channels;
|
|
||||||
int32_t *dest = buffer.GetT<int32_t>(dest_size);
|
|
||||||
|
|
||||||
if (src_channels == 1 && dest_channels == 2)
|
|
||||||
MonoToStereo(dest, src.begin(), src.end());
|
|
||||||
else if (src_channels == 2 && dest_channels == 1)
|
|
||||||
pcm_convert_channels_24_2_to_1(dest, src.begin(), src.end());
|
|
||||||
else if (dest_channels == 2)
|
|
||||||
pcm_convert_channels_24_n_to_2(dest, src_channels,
|
|
||||||
src.begin(), src.end());
|
|
||||||
else
|
|
||||||
return nullptr;
|
|
||||||
|
|
||||||
return { dest, dest_size };
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
pcm_convert_channels_32_2_to_1(int32_t *gcc_restrict dest,
|
|
||||||
const int32_t *gcc_restrict src,
|
|
||||||
const int32_t *gcc_restrict src_end)
|
|
||||||
{
|
|
||||||
while (src < src_end) {
|
|
||||||
int64_t a = *src++, b = *src++;
|
|
||||||
|
|
||||||
*dest++ = (a + b) / 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
pcm_convert_channels_32_n_to_2(int32_t *dest,
|
|
||||||
unsigned src_channels, const int32_t *src,
|
|
||||||
const int32_t *src_end)
|
|
||||||
{
|
|
||||||
unsigned c;
|
|
||||||
|
|
||||||
assert(src_channels > 0);
|
|
||||||
|
|
||||||
while (src < src_end) {
|
|
||||||
int64_t sum = 0;
|
|
||||||
int32_t value;
|
|
||||||
|
|
||||||
for (c = 0; c < src_channels; ++c)
|
|
||||||
sum += *src++;
|
|
||||||
value = sum / (int64_t)src_channels;
|
|
||||||
|
|
||||||
/* XXX this is actually only mono ... */
|
|
||||||
*dest++ = value;
|
|
||||||
*dest++ = value;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ConstBuffer<int32_t>
|
ConstBuffer<int32_t>
|
||||||
@ -198,57 +140,8 @@ pcm_convert_channels_32(PcmBuffer &buffer,
|
|||||||
unsigned src_channels,
|
unsigned src_channels,
|
||||||
ConstBuffer<int32_t> src)
|
ConstBuffer<int32_t> src)
|
||||||
{
|
{
|
||||||
assert(src.size % src_channels == 0);
|
return ConvertChannels<SampleFormat::S32>(buffer, dest_channels,
|
||||||
|
src_channels, src);
|
||||||
size_t dest_size = src.size / src_channels * dest_channels;
|
|
||||||
int32_t *dest = buffer.GetT<int32_t>(dest_size);
|
|
||||||
|
|
||||||
if (src_channels == 1 && dest_channels == 2)
|
|
||||||
MonoToStereo(dest, src.begin(), src.end());
|
|
||||||
else if (src_channels == 2 && dest_channels == 1)
|
|
||||||
pcm_convert_channels_32_2_to_1(dest, src.begin(), src.end());
|
|
||||||
else if (dest_channels == 2)
|
|
||||||
pcm_convert_channels_32_n_to_2(dest, src_channels,
|
|
||||||
src.begin(), src.end());
|
|
||||||
else
|
|
||||||
return nullptr;
|
|
||||||
|
|
||||||
return { dest, dest_size };
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
pcm_convert_channels_float_2_to_1(float *gcc_restrict dest,
|
|
||||||
const float *gcc_restrict src,
|
|
||||||
const float *gcc_restrict src_end)
|
|
||||||
{
|
|
||||||
while (src < src_end) {
|
|
||||||
double a = *src++, b = *src++;
|
|
||||||
|
|
||||||
*dest++ = (a + b) / 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
pcm_convert_channels_float_n_to_2(float *dest,
|
|
||||||
unsigned src_channels, const float *src,
|
|
||||||
const float *src_end)
|
|
||||||
{
|
|
||||||
unsigned c;
|
|
||||||
|
|
||||||
assert(src_channels > 0);
|
|
||||||
|
|
||||||
while (src < src_end) {
|
|
||||||
double sum = 0;
|
|
||||||
float value;
|
|
||||||
|
|
||||||
for (c = 0; c < src_channels; ++c)
|
|
||||||
sum += *src++;
|
|
||||||
value = sum / (double)src_channels;
|
|
||||||
|
|
||||||
/* XXX this is actually only mono ... */
|
|
||||||
*dest++ = value;
|
|
||||||
*dest++ = value;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ConstBuffer<float>
|
ConstBuffer<float>
|
||||||
@ -257,21 +150,6 @@ pcm_convert_channels_float(PcmBuffer &buffer,
|
|||||||
unsigned src_channels,
|
unsigned src_channels,
|
||||||
ConstBuffer<float> src)
|
ConstBuffer<float> src)
|
||||||
{
|
{
|
||||||
assert(src.size % src_channels == 0);
|
return ConvertChannels<SampleFormat::FLOAT>(buffer, dest_channels,
|
||||||
|
src_channels, src);
|
||||||
size_t dest_size = src.size / src_channels * dest_channels;
|
|
||||||
float *dest = buffer.GetT<float>(dest_size);
|
|
||||||
|
|
||||||
if (src_channels == 1 && dest_channels == 2)
|
|
||||||
MonoToStereo(dest, src.begin(), src.end());
|
|
||||||
else if (src_channels == 2 && dest_channels == 1)
|
|
||||||
pcm_convert_channels_float_2_to_1(dest,
|
|
||||||
src.begin(), src.end());
|
|
||||||
else if (dest_channels == 2)
|
|
||||||
pcm_convert_channels_float_n_to_2(dest, src_channels,
|
|
||||||
src.begin(), src.end());
|
|
||||||
else
|
|
||||||
return nullptr;
|
|
||||||
|
|
||||||
return { dest, dest_size };
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user