oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm_dither: renamed struct pcm_dither_24 to struct pcm_dither

Browse Source 
There is nothing 24 bit specific in the pcm_dither_24 struct.  Since
we want to reuse the struct for 32 bit dithering, let's drop the "_24"
suffix from the struct name.
This commit is contained in:
Max Kellermann 2009-03-02 16:37:05 +01:00
parent d9c1434298
commit 78e08f655a
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pcm_convert.h
View File

@ -33,7 +33,7 @@ struct audio_format;
struct pcm_convert_state { struct pcm_convert_state {
struct pcm_resample_state resample; struct pcm_resample_state resample;
struct pcm_dither_24 dither; struct pcm_dither dither;
/** the buffer for converting the sample format */ /** the buffer for converting the sample format */
struct pcm_buffer format_buffer; struct pcm_buffer format_buffer;

4
src/pcm_dither.c
View File

@ -20,7 +20,7 @@
#include "pcm_prng.h" #include "pcm_prng.h"
static int16_t static int16_t
pcm_dither_sample_24_to_16(int32_t sample, struct pcm_dither_24 *dither) pcm_dither_sample_24_to_16(int32_t sample, struct pcm_dither *dither)
{ {
int32_t output, rnd; int32_t output, rnd;
@ -69,7 +69,7 @@ pcm_dither_sample_24_to_16(int32_t sample, struct pcm_dither_24 *dither)
} }
void void
pcm_dither_24_to_16(struct pcm_dither_24 *dither, pcm_dither_24_to_16(struct pcm_dither *dither,
int16_t *dest, const int32_t *src, int16_t *dest, const int32_t *src,
unsigned num_samples) unsigned num_samples)
{ {

6
src/pcm_dither.h
View File

@ -21,20 +21,20 @@
#include <stdint.h> #include <stdint.h>
struct pcm_dither_24 { struct pcm_dither {
int32_t error[3]; int32_t error[3];
int32_t random; int32_t random;
}; };
static inline void static inline void
pcm_dither_24_init(struct pcm_dither_24 *dither) pcm_dither_24_init(struct pcm_dither *dither)
{ {
dither->error[0] = dither->error[1] = dither->error[2] = 0; dither->error[0] = dither->error[1] = dither->error[2] = 0;
dither->random = 0; dither->random = 0;
} }
void void
pcm_dither_24_to_16(struct pcm_dither_24 *dither, pcm_dither_24_to_16(struct pcm_dither *dither,
int16_t *dest, const int32_t *src, int16_t *dest, const int32_t *src,
unsigned num_samples); unsigned num_samples);

4
src/pcm_format.c
View File

@ -33,7 +33,7 @@ pcm_convert_8_to_16(int16_t *out, const int8_t *in,
} }
static void static void
pcm_convert_24_to_16(struct pcm_dither_24 *dither, pcm_convert_24_to_16(struct pcm_dither *dither,
int16_t *out, const int32_t *in, int16_t *out, const int32_t *in,
unsigned num_samples) unsigned num_samples)
{ {
@ -41,7 +41,7 @@ pcm_convert_24_to_16(struct pcm_dither_24 *dither,
} }
const int16_t * const int16_t *
pcm_convert_to_16(struct pcm_buffer *buffer, struct pcm_dither_24 *dither, pcm_convert_to_16(struct pcm_buffer *buffer, struct pcm_dither *dither,
uint8_t bits, const void *src, uint8_t bits, const void *src,
size_t src_size, size_t *dest_size_r) size_t src_size, size_t *dest_size_r)
{ {

7
src/pcm_format.h
View File

@ -23,14 +23,14 @@
#include <stddef.h> #include <stddef.h>
struct pcm_buffer; struct pcm_buffer;
struct pcm_dither_24; struct pcm_dither;
/** /**
* Converts PCM samples to 16 bit. If the source format is 24 bit, * Converts PCM samples to 16 bit. If the source format is 24 bit,
* then dithering is applied. * then dithering is applied.
* *
* @param buffer a pcm_buffer object * @param buffer a pcm_buffer object
* @param dither a pcm_dither_24 object for 24-to-16 conversion * @param dither a pcm_dither object for 24-to-16 conversion
* @param bits the number of in the source buffer * @param bits the number of in the source buffer
* @param src the source PCM buffer * @param src the source PCM buffer
* @param src_size the size of #src in bytes * @param src_size the size of #src in bytes
@ -38,7 +38,7 @@ struct pcm_dither_24;
* @return the destination buffer * @return the destination buffer
*/ */
const int16_t * const int16_t *
pcm_convert_to_16(struct pcm_buffer *buffer, struct pcm_dither_24 *dither, pcm_convert_to_16(struct pcm_buffer *buffer, struct pcm_dither *dither,
uint8_t bits, const void *src, uint8_t bits, const void *src,
size_t src_size, size_t *dest_size_r); size_t src_size, size_t *dest_size_r);
@ -46,7 +46,6 @@ pcm_convert_to_16(struct pcm_buffer *buffer, struct pcm_dither_24 *dither,
* Converts PCM samples to 24 bit (32 bit alignment). * Converts PCM samples to 24 bit (32 bit alignment).
* *
* @param buffer a pcm_buffer object * @param buffer a pcm_buffer object
* @param dither a pcm_dither_24 object for 24-to-16 conversion
* @param bits the number of in the source buffer * @param bits the number of in the source buffer
* @param src the source PCM buffer * @param src the source PCM buffer
* @param src_size the size of #src in bytes * @param src_size the size of #src in bytes