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

pcm/AudioCompress: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2023-03-13 11:56:06 +01:00
parent d712c3b408
commit 2d7068a09d
5 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/filter/plugins/NormalizeFilterPlugin.cxx
View File

@ -7,7 +7,7 @@
#include "filter/Prepared.hxx" #include "filter/Prepared.hxx"
#include "pcm/Buffer.hxx" #include "pcm/Buffer.hxx"
#include "pcm/AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "pcm/AudioCompress/compress.h" #include "pcm/Normalizer.hxx"
#include <string.h> #include <string.h>

17
src/pcm/AudioCompress/compress.c → src/pcm/Normalizer.cxx
View File

@ -1,13 +1,14 @@
// SPDX-License-Identifier: LGPL-2.1 // SPDX-License-Identifier: LGPL-2.1
// (c)2007 busybee (http://beesbuzz.biz/ // Copyright The Music Player Daemon Project
// Based on AudioCompress (c)2007 busybee (http://beesbuzz.biz/
#include "Normalizer.hxx"
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "compress.h"
/*** Default configuration stuff ***/ /*** Default configuration stuff ***/
#define TARGET 16384 /*!< Target level (on a scale of 0-32767) */ #define TARGET 16384 /*!< Target level (on a scale of 0-32767) */
@ -34,8 +35,8 @@ struct Compressor {
struct Compressor *Compressor_new(unsigned int history) struct Compressor *Compressor_new(unsigned int history)
{ {
struct Compressor *obj = malloc(sizeof(struct Compressor)); Compressor *obj = (Compressor *)malloc(sizeof(struct Compressor));
if (obj == NULL) if (obj == nullptr)
/* out of memory, not much we can do */ /* out of memory, not much we can do */
abort(); abort();
@ -43,7 +44,7 @@ struct Compressor *Compressor_new(unsigned int history)
obj->prefs.maxgain = GAINMAX; obj->prefs.maxgain = GAINMAX;
obj->prefs.smooth = GAINSMOOTH; obj->prefs.smooth = GAINSMOOTH;
obj->peaks = obj->gain = obj->clipped = NULL; obj->peaks = obj->gain = obj->clipped = nullptr;
obj->bufsz = 0; obj->bufsz = 0;
obj->pos = 0; obj->pos = 0;
@ -65,8 +66,8 @@ void Compressor_delete(struct Compressor *obj)
static int *resizeArray(int *data, int newsz, int oldsz) static int *resizeArray(int *data, int newsz, int oldsz)
{ {
data = realloc(data, newsz*sizeof(int)); data = (int *)realloc(data, newsz*sizeof(int));
if (data == NULL) if (data == nullptr)
/* out of memory, not much we can do */ /* out of memory, not much we can do */
abort(); abort();

18
src/pcm/AudioCompress/compress.h → src/pcm/Normalizer.hxx
View File

@ -1,10 +1,10 @@
// SPDX-License-Identifier: LGPL-2.1 // SPDX-License-Identifier: LGPL-2.1
// (c)2007 busybee (http://beesbuzz.biz/ // Copyright The Music Player Daemon Project
// Based on AudioCompress (c)2007 busybee (http://beesbuzz.biz/
#ifndef COMPRESS_H #pragma once
#define COMPRESS_H
#include <stdint.h> #include <cstdint>
//! Configuration values for the compressor object //! Configuration values for the compressor object
struct CompressorConfig { struct CompressorConfig {
@ -15,10 +15,6 @@ struct CompressorConfig {
struct Compressor; struct Compressor;
#ifdef __cplusplus
extern "C" {
#endif
//! Create a new compressor (use history value of 0 for default) //! Create a new compressor (use history value of 0 for default)
struct Compressor *Compressor_new(unsigned int history); struct Compressor *Compressor_new(unsigned int history);
@ -34,12 +30,6 @@ struct CompressorConfig *Compressor_getConfig(struct Compressor *);
//! Process 16-bit signed data //! Process 16-bit signed data
void Compressor_Process_int16(struct Compressor *, int16_t *data, unsigned int count); void Compressor_Process_int16(struct Compressor *, int16_t *data, unsigned int count);
#ifdef __cplusplus
}
#endif
//! TODO: Compressor_Process_int32, Compressor_Process_float, others as needed //! TODO: Compressor_Process_int32, Compressor_Process_float, others as needed
//! TODO: functions for getting at the peak/gain/clip history buffers (for monitoring) //! TODO: functions for getting at the peak/gain/clip history buffers (for monitoring)
#endif

2
src/pcm/meson.build
View File

@ -47,7 +47,7 @@ pcm_sources = [
'GlueResampler.cxx', 'GlueResampler.cxx',
'FallbackResampler.cxx', 'FallbackResampler.cxx',
'ConfiguredResampler.cxx', 'ConfiguredResampler.cxx',
'AudioCompress/compress.c', 'Normalizer.cxx',
'ReplayGainAnalyzer.cxx', 'ReplayGainAnalyzer.cxx',
'MixRampAnalyzer.cxx', 'MixRampAnalyzer.cxx',
'MixRampGlue.cxx', 'MixRampGlue.cxx',

2
test/run_normalize.cxx
View File

@ -7,7 +7,7 @@
* *
*/ */
#include "pcm/AudioCompress/compress.h" #include "pcm/Normalizer.hxx"
#include "pcm/AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "pcm/AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/PrintException.hxx" #include "util/PrintException.hxx"