aboutsummaryrefslogtreecommitdiffstats
path: root/src/pcm_channels.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/pcm_channels.c118
1 files changed, 66 insertions, 52 deletions
diff --git a/src/pcm_channels.c b/src/pcm_channels.c
index 34e72ca4e..ec2bd69a5 100644
--- a/src/pcm_channels.c
+++ b/src/pcm_channels.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -20,14 +20,16 @@
#include "config.h"
#include "pcm_channels.h"
#include "pcm_buffer.h"
+#include "pcm_utils.h"
#include <assert.h>
static void
-pcm_convert_channels_16_1_to_2(int16_t *dest, const int16_t *src,
- unsigned num_frames)
+pcm_convert_channels_16_1_to_2(int16_t *restrict dest,
+ const int16_t *restrict src,
+ const int16_t *restrict src_end)
{
- while (num_frames-- > 0) {
+ while (src < src_end) {
int16_t value = *src++;
*dest++ = value;
@@ -36,10 +38,11 @@ pcm_convert_channels_16_1_to_2(int16_t *dest, const int16_t *src,
}
static void
-pcm_convert_channels_16_2_to_1(int16_t *dest, const int16_t *src,
- unsigned num_frames)
+pcm_convert_channels_16_2_to_1(int16_t *restrict dest,
+ const int16_t *restrict src,
+ const int16_t *restrict src_end)
{
- while (num_frames-- > 0) {
+ while (src < src_end) {
int32_t a = *src++, b = *src++;
*dest++ = (a + b) / 2;
@@ -47,15 +50,16 @@ pcm_convert_channels_16_2_to_1(int16_t *dest, const int16_t *src,
}
static void
-pcm_convert_channels_16_n_to_2(int16_t *dest,
- unsigned src_channels, const int16_t *src,
- unsigned num_frames)
+pcm_convert_channels_16_n_to_2(int16_t *restrict dest,
+ unsigned src_channels,
+ const int16_t *restrict src,
+ const int16_t *restrict src_end)
{
unsigned c;
assert(src_channels > 0);
- while (num_frames-- > 0) {
+ while (src < src_end) {
int32_t sum = 0;
int16_t value;
@@ -71,23 +75,25 @@ pcm_convert_channels_16_n_to_2(int16_t *dest,
const int16_t *
pcm_convert_channels_16(struct pcm_buffer *buffer,
- uint8_t dest_channels,
- uint8_t src_channels, const int16_t *src,
+ unsigned dest_channels,
+ unsigned src_channels, const int16_t *src,
size_t src_size, size_t *dest_size_r)
{
- unsigned num_frames = src_size / src_channels / sizeof(*src);
- unsigned dest_size = num_frames * dest_channels * sizeof(*src);
- int16_t *dest = pcm_buffer_get(buffer, dest_size);
+ assert(src_size % (sizeof(*src) * src_channels) == 0);
+ size_t dest_size = src_size / src_channels * dest_channels;
*dest_size_r = dest_size;
+ int16_t *dest = pcm_buffer_get(buffer, dest_size);
+ const int16_t *src_end = pcm_end_pointer(src, src_size);
+
if (src_channels == 1 && dest_channels == 2)
- pcm_convert_channels_16_1_to_2(dest, src, num_frames);
+ pcm_convert_channels_16_1_to_2(dest, src, src_end);
else if (src_channels == 2 && dest_channels == 1)
- pcm_convert_channels_16_2_to_1(dest, src, num_frames);
+ pcm_convert_channels_16_2_to_1(dest, src, src_end);
else if (dest_channels == 2)
pcm_convert_channels_16_n_to_2(dest, src_channels, src,
- num_frames);
+ src_end);
else
return NULL;
@@ -95,10 +101,11 @@ pcm_convert_channels_16(struct pcm_buffer *buffer,
}
static void
-pcm_convert_channels_24_1_to_2(int32_t *dest, const int32_t *src,
- unsigned num_frames)
+pcm_convert_channels_24_1_to_2(int32_t *restrict dest,
+ const int32_t *restrict src,
+ const int32_t *restrict src_end)
{
- while (num_frames-- > 0) {
+ while (src < src_end) {
int32_t value = *src++;
*dest++ = value;
@@ -107,10 +114,11 @@ pcm_convert_channels_24_1_to_2(int32_t *dest, const int32_t *src,
}
static void
-pcm_convert_channels_24_2_to_1(int32_t *dest, const int32_t *src,
- unsigned num_frames)
+pcm_convert_channels_24_2_to_1(int32_t *restrict dest,
+ const int32_t *restrict src,
+ const int32_t *restrict src_end)
{
- while (num_frames-- > 0) {
+ while (src < src_end) {
int32_t a = *src++, b = *src++;
*dest++ = (a + b) / 2;
@@ -118,15 +126,16 @@ pcm_convert_channels_24_2_to_1(int32_t *dest, const int32_t *src,
}
static void
-pcm_convert_channels_24_n_to_2(int32_t *dest,
- unsigned src_channels, const int32_t *src,
- unsigned num_frames)
+pcm_convert_channels_24_n_to_2(int32_t *restrict dest,
+ unsigned src_channels,
+ const int32_t *restrict src,
+ const int32_t *restrict src_end)
{
unsigned c;
assert(src_channels > 0);
- while (num_frames-- > 0) {
+ while (src < src_end) {
int32_t sum = 0;
int32_t value;
@@ -142,23 +151,25 @@ pcm_convert_channels_24_n_to_2(int32_t *dest,
const int32_t *
pcm_convert_channels_24(struct pcm_buffer *buffer,
- uint8_t dest_channels,
- uint8_t src_channels, const int32_t *src,
+ unsigned dest_channels,
+ unsigned src_channels, const int32_t *src,
size_t src_size, size_t *dest_size_r)
{
- unsigned num_frames = src_size / src_channels / sizeof(*src);
- unsigned dest_size = num_frames * dest_channels * sizeof(*src);
- int32_t *dest = pcm_buffer_get(buffer, dest_size);
+ assert(src_size % (sizeof(*src) * src_channels) == 0);
+ size_t dest_size = src_size / src_channels * dest_channels;
*dest_size_r = dest_size;
+ int32_t *dest = pcm_buffer_get(buffer, dest_size);
+ const int32_t *src_end = pcm_end_pointer(src, src_size);
+
if (src_channels == 1 && dest_channels == 2)
- pcm_convert_channels_24_1_to_2(dest, src, num_frames);
+ pcm_convert_channels_24_1_to_2(dest, src, src_end);
else if (src_channels == 2 && dest_channels == 1)
- pcm_convert_channels_24_2_to_1(dest, src, num_frames);
+ pcm_convert_channels_24_2_to_1(dest, src, src_end);
else if (dest_channels == 2)
pcm_convert_channels_24_n_to_2(dest, src_channels, src,
- num_frames);
+ src_end);
else
return NULL;
@@ -167,16 +178,17 @@ pcm_convert_channels_24(struct pcm_buffer *buffer,
static void
pcm_convert_channels_32_1_to_2(int32_t *dest, const int32_t *src,
- unsigned num_frames)
+ const int32_t *src_end)
{
- pcm_convert_channels_24_1_to_2(dest, src, num_frames);
+ pcm_convert_channels_24_1_to_2(dest, src, src_end);
}
static void
-pcm_convert_channels_32_2_to_1(int32_t *dest, const int32_t *src,
- unsigned num_frames)
+pcm_convert_channels_32_2_to_1(int32_t *restrict dest,
+ const int32_t *restrict src,
+ const int32_t *restrict src_end)
{
- while (num_frames-- > 0) {
+ while (src < src_end) {
int64_t a = *src++, b = *src++;
*dest++ = (a + b) / 2;
@@ -186,13 +198,13 @@ pcm_convert_channels_32_2_to_1(int32_t *dest, const int32_t *src,
static void
pcm_convert_channels_32_n_to_2(int32_t *dest,
unsigned src_channels, const int32_t *src,
- unsigned num_frames)
+ const int32_t *src_end)
{
unsigned c;
assert(src_channels > 0);
- while (num_frames-- > 0) {
+ while (src < src_end) {
int64_t sum = 0;
int32_t value;
@@ -208,23 +220,25 @@ pcm_convert_channels_32_n_to_2(int32_t *dest,
const int32_t *
pcm_convert_channels_32(struct pcm_buffer *buffer,
- uint8_t dest_channels,
- uint8_t src_channels, const int32_t *src,
+ unsigned dest_channels,
+ unsigned src_channels, const int32_t *src,
size_t src_size, size_t *dest_size_r)
{
- unsigned num_frames = src_size / src_channels / sizeof(*src);
- unsigned dest_size = num_frames * dest_channels * sizeof(*src);
- int32_t *dest = pcm_buffer_get(buffer, dest_size);
+ assert(src_size % (sizeof(*src) * src_channels) == 0);
+ size_t dest_size = src_size / src_channels * dest_channels;
*dest_size_r = dest_size;
+ int32_t *dest = pcm_buffer_get(buffer, dest_size);
+ const int32_t *src_end = pcm_end_pointer(src, src_size);
+
if (src_channels == 1 && dest_channels == 2)
- pcm_convert_channels_32_1_to_2(dest, src, num_frames);
+ pcm_convert_channels_32_1_to_2(dest, src, src_end);
else if (src_channels == 2 && dest_channels == 1)
- pcm_convert_channels_32_2_to_1(dest, src, num_frames);
+ pcm_convert_channels_32_2_to_1(dest, src, src_end);
else if (dest_channels == 2)
pcm_convert_channels_32_n_to_2(dest, src_channels, src,
- num_frames);
+ src_end);
else
return NULL;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 06:27:55 +0000