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

AudioFormat: move enum SampleFormat to pcm/SampleFormat.hxx

Browse Source
This commit is contained in:
Max Kellermann 2017-01-17 11:02:11 +01:00
parent f85f25ba82
commit de3e0585f1
19 changed files with 191 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -542,6 +542,7 @@ libpcm_a_SOURCES = \
src/CheckAudioFormat.cxx src/CheckAudioFormat.hxx \
src/AudioFormat.cxx src/AudioFormat.hxx \
src/AudioParser.cxx src/AudioParser.hxx \
src/pcm/SampleFormat.cxx src/pcm/SampleFormat.hxx \
src/pcm/Traits.hxx \
src/pcm/Interleave.cxx src/pcm/Interleave.hxx \
src/pcm/PcmBuffer.cxx src/pcm/PcmBuffer.hxx \

31
src/AudioFormat.cxx
View File

@ -40,37 +40,6 @@ AudioFormat::ApplyMask(AudioFormat mask)
assert(IsValid());
}
const char *
sample_format_to_string(SampleFormat format)
{
switch (format) {
case SampleFormat::UNDEFINED:
return "?";
case SampleFormat::S8:
return "8";
case SampleFormat::S16:
return "16";
case SampleFormat::S24_P32:
return "24";
case SampleFormat::S32:
return "32";
case SampleFormat::FLOAT:
return "f";
case SampleFormat::DSD:
return "dsd";
}
/* unreachable */
assert(false);
gcc_unreachable();
}
const char *
audio_format_to_string(const AudioFormat af,
struct audio_format_string *s)

99
src/AudioFormat.hxx
View File

@ -20,48 +20,12 @@
#ifndef MPD_AUDIO_FORMAT_HXX
#define MPD_AUDIO_FORMAT_HXX
#include "pcm/SampleFormat.hxx"
#include "Compiler.h"
#include <stdint.h>
#include <assert.h>
#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
/* on WIN32, "FLOAT" is already defined, and this triggers -Wshadow */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#endif
enum class SampleFormat : uint8_t {
UNDEFINED = 0,
S8,
S16,
/**
* Signed 24 bit integer samples, packed in 32 bit integers
* (the most significant byte is filled with the sign bit).
*/
S24_P32,
S32,
/**
* 32 bit floating point samples in the host's format. The
* range is -1.0f to +1.0f.
*/
FLOAT,
/**
* Direct Stream Digital. 1-bit samples; each frame has one
* byte (8 samples) per channel.
*/
DSD,
};
#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
#pragma GCC diagnostic pop
#endif
static constexpr unsigned MAX_CHANNELS = 8;
/**
@ -201,28 +165,6 @@ audio_valid_sample_rate(unsigned sample_rate)
return sample_rate > 0 && sample_rate < (1 << 30);
}
/**
* Checks whether the sample format is valid.
*/
static inline bool
audio_valid_sample_format(SampleFormat format)
{
switch (format) {
case SampleFormat::S8:
case SampleFormat::S16:
case SampleFormat::S24_P32:
case SampleFormat::S32:
case SampleFormat::FLOAT:
case SampleFormat::DSD:
return true;
case SampleFormat::UNDEFINED:
break;
}
return false;
}
/**
* Checks whether the number of channels is valid.
*/
@ -258,34 +200,6 @@ AudioFormat::IsMaskValid() const
(channels == 0 || audio_valid_channel_count(channels));
}
gcc_const
static inline unsigned
sample_format_size(SampleFormat format)
{
switch (format) {
case SampleFormat::S8:
return 1;
case SampleFormat::S16:
return 2;
case SampleFormat::S24_P32:
case SampleFormat::S32:
case SampleFormat::FLOAT:
return 4;
case SampleFormat::DSD:
/* each frame has 8 samples per channel */
return 1;
case SampleFormat::UNDEFINED:
return 0;
}
assert(false);
gcc_unreachable();
}
inline unsigned
AudioFormat::GetSampleSize() const
{
@ -304,17 +218,6 @@ AudioFormat::GetTimeToSize() const
return sample_rate * GetFrameSize();
}
/**
* Renders a #SampleFormat enum into a string, e.g. for printing it
* in a log file.
*
* @param format a #SampleFormat enum value
* @return the string
*/
gcc_pure gcc_malloc
const char *
sample_format_to_string(SampleFormat format);
/**
* Renders the #AudioFormat object into a string, e.g. for printing
* it in a log file.

2
src/pcm/ChannelsConverter.hxx
View File

@ -21,7 +21,7 @@
#define MPD_PCM_CHANNELS_CONVERTER_HXX
#include "check.h"
#include "AudioFormat.hxx"
#include "SampleFormat.hxx"
#include "PcmBuffer.hxx"
#ifndef NDEBUG

2
src/pcm/FormatConverter.hxx
View File

@ -21,7 +21,7 @@
#define MPD_PCM_FORMAT_CONVERTER_HXX
#include "check.h"
#include "AudioFormat.hxx"
#include "SampleFormat.hxx"
#include "PcmBuffer.hxx"
#include "PcmDither.hxx"

2
src/pcm/Order.hxx
View File

@ -21,7 +21,7 @@
#define MPD_PCM_ORDER_HXX
#include "check.h"
#include "AudioFormat.hxx"
#include "SampleFormat.hxx"
class PcmBuffer;
template<typename T> struct ConstBuffer;

1
src/pcm/PcmConvert.cxx
View File

@ -20,7 +20,6 @@
#include "config.h"
#include "PcmConvert.hxx"
#include "ConfiguredResampler.hxx"
#include "AudioFormat.hxx"
#include "util/ConstBuffer.hxx"
#include <assert.h>

1
src/pcm/PcmExport.cxx
View File

@ -19,6 +19,7 @@
#include "config.h"
#include "PcmExport.hxx"
#include "AudioFormat.hxx"
#include "Order.hxx"
#include "PcmPack.hxx"
#include "util/ByteReverse.hxx"

3
src/pcm/PcmExport.hxx
View File

@ -21,10 +21,11 @@
#define PCM_EXPORT_HXX
#include "check.h"
#include "SampleFormat.hxx"
#include "PcmBuffer.hxx"
#include "AudioFormat.hxx"
template<typename T> struct ConstBuffer;
struct AudioFormat;
/**
* An object that handles export of PCM samples to some instance

2
src/pcm/PcmFormat.hxx
View File

@ -20,7 +20,7 @@
#ifndef MPD_PCM_FORMAT_HXX
#define MPD_PCM_FORMAT_HXX
#include "AudioFormat.hxx"
#include "SampleFormat.hxx"
#include <stdint.h>

1
src/pcm/PcmMix.cxx
View File

@ -21,7 +21,6 @@
#include "PcmMix.hxx"
#include "Volume.hxx"
#include "PcmUtils.hxx"
#include "AudioFormat.hxx"
#include "Traits.hxx"
#include "util/Clamp.hxx"

2
src/pcm/PcmMix.hxx
View File

@ -20,7 +20,7 @@
#ifndef MPD_PCM_MIX_HXX
#define MPD_PCM_MIX_HXX
#include "AudioFormat.hxx"
#include "SampleFormat.hxx"
#include "Compiler.h"
#include <stddef.h>

51
src/pcm/SampleFormat.cxx Normal file
View File

@ -0,0 +1,51 @@
/*
* Copyright 2003-2017 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "SampleFormat.hxx"
const char *
sample_format_to_string(SampleFormat format)
{
switch (format) {
case SampleFormat::UNDEFINED:
return "?";
case SampleFormat::S8:
return "8";
case SampleFormat::S16:
return "16";
case SampleFormat::S24_P32:
return "24";
case SampleFormat::S32:
return "32";
case SampleFormat::FLOAT:
return "f";
case SampleFormat::DSD:
return "dsd";
}
/* unreachable */
assert(false);
gcc_unreachable();
}

126
src/pcm/SampleFormat.hxx Normal file
View File

@ -0,0 +1,126 @@
/*
* Copyright 2003-2017 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_PCM_SAMPLE_FORMAT_HXX
#define MPD_PCM_SAMPLE_FORMAT_HXX
#include "Compiler.h"
#include <assert.h>
#include <stdint.h>
#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
/* on WIN32, "FLOAT" is already defined, and this triggers -Wshadow */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#endif
enum class SampleFormat : uint8_t {
UNDEFINED = 0,
S8,
S16,
/**
* Signed 24 bit integer samples, packed in 32 bit integers
* (the most significant byte is filled with the sign bit).
*/
S24_P32,
S32,
/**
* 32 bit floating point samples in the host's format. The
* range is -1.0f to +1.0f.
*/
FLOAT,
/**
* Direct Stream Digital. 1-bit samples; each frame has one
* byte (8 samples) per channel.
*/
DSD,
};
#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
#pragma GCC diagnostic pop
#endif
/**
* Checks whether the sample format is valid.
*/
static inline bool
audio_valid_sample_format(SampleFormat format)
{
switch (format) {
case SampleFormat::S8:
case SampleFormat::S16:
case SampleFormat::S24_P32:
case SampleFormat::S32:
case SampleFormat::FLOAT:
case SampleFormat::DSD:
return true;
case SampleFormat::UNDEFINED:
break;
}
return false;
}
gcc_const
static inline unsigned
sample_format_size(SampleFormat format)
{
switch (format) {
case SampleFormat::S8:
return 1;
case SampleFormat::S16:
return 2;
case SampleFormat::S24_P32:
case SampleFormat::S32:
case SampleFormat::FLOAT:
return 4;
case SampleFormat::DSD:
/* each frame has 8 samples per channel */
return 1;
case SampleFormat::UNDEFINED:
return 0;
}
assert(false);
gcc_unreachable();
}
/**
* Renders a #SampleFormat enum into a string, e.g. for printing it
* in a log file.
*
* @param format a #SampleFormat enum value
* @return the string
*/
gcc_pure gcc_malloc
const char *
sample_format_to_string(SampleFormat format);
#endif

2
src/pcm/Silence.cxx
View File

@ -19,7 +19,7 @@
#include "config.h"
#include "Silence.hxx"
#include "AudioFormat.hxx"
#include "SampleFormat.hxx"
#include "util/WritableBuffer.hxx"
#include <string.h>

2
src/pcm/Traits.hxx
View File

@ -21,7 +21,7 @@
#define MPD_PCM_TRAITS_HXX
#include "check.h"
#include "AudioFormat.hxx"
#include "SampleFormat.hxx"
#include <stdint.h>
#include <stddef.h>

2
src/pcm/Volume.hxx
View File

@ -20,7 +20,7 @@
#ifndef MPD_PCM_VOLUME_HXX
#define MPD_PCM_VOLUME_HXX
#include "AudioFormat.hxx"
#include "SampleFormat.hxx"
#include "PcmBuffer.hxx"
#include "PcmDither.hxx"

1
test/read_tags.cxx
View File

@ -23,7 +23,6 @@
#include "decoder/DecoderPlugin.hxx"
#include "input/Init.hxx"
#include "input/InputStream.hxx"
#include "AudioFormat.hxx"
#include "tag/TagHandler.hxx"
#include "tag/Generic.hxx"
#include "fs/Path.hxx"

2
test/test_pcm_format.cxx
View File

@ -24,7 +24,7 @@
#include "pcm/PcmDither.hxx"
#include "pcm/PcmUtils.hxx"
#include "pcm/PcmBuffer.hxx"
#include "AudioFormat.hxx"
#include "pcm/SampleFormat.hxx"
void
PcmFormatTest::TestFormat8to16()