Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
25164969
Commit
25164969
authored
Mar 01, 2012
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
audio_format: add DSD sample format
Basic support for Direct Stream Digital. No conversion yet, and no decoder/output plugin support.
parent
3b565b5f
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
61 additions
and
0 deletions
+61
-0
audio_format.c
src/audio_format.c
+6
-0
audio_format.h
src/audio_format.h
+19
-0
audio_parser.c
src/audio_parser.c
+12
-0
flac_pcm.c
src/decoder/flac_pcm.c
+2
-0
alsa_output_plugin.c
src/output/alsa_output_plugin.c
+2
-0
oss_output_plugin.c
src/output/oss_output_plugin.c
+2
-0
pcm_byteswap.c
src/pcm_byteswap.c
+2
-0
pcm_convert.c
src/pcm_convert.c
+2
-0
pcm_format.c
src/pcm_format.c
+8
-0
pcm_mix.c
src/pcm_mix.c
+4
-0
pcm_volume.c
src/pcm_volume.c
+2
-0
No files found.
src/audio_format.c
View file @
25164969
...
...
@@ -71,6 +71,12 @@ sample_format_to_string(enum sample_format format)
case
SAMPLE_FORMAT_FLOAT
:
return
"f"
;
case
SAMPLE_FORMAT_DSD
:
return
"dsd"
;
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
return
"dsdl"
;
}
/* unreachable */
...
...
src/audio_format.h
View file @
25164969
...
...
@@ -49,6 +49,18 @@ enum sample_format {
* range is -1.0f to +1.0f.
*/
SAMPLE_FORMAT_FLOAT
,
/**
* Direct Stream Digital. 1-bit samples; each frame has one
* byte (8 samples) per channel.
*/
SAMPLE_FORMAT_DSD
,
/**
* Same as #SAMPLE_FORMAT_DSD, but the least significant bit
* comes first.
*/
SAMPLE_FORMAT_DSD_LSBFIRST
,
};
static
const
unsigned
MAX_CHANNELS
=
8
;
...
...
@@ -175,6 +187,8 @@ audio_valid_sample_format(enum sample_format format)
case
SAMPLE_FORMAT_S24_P32
:
case
SAMPLE_FORMAT_S32
:
case
SAMPLE_FORMAT_FLOAT
:
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
return
true
;
case
SAMPLE_FORMAT_UNDEFINED
:
...
...
@@ -251,6 +265,11 @@ sample_format_size(enum sample_format format)
case
SAMPLE_FORMAT_FLOAT
:
return
4
;
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
/* each frame has 8 samples per channel */
return
1
;
case
SAMPLE_FORMAT_UNDEFINED
:
return
0
;
}
...
...
src/audio_parser.c
View file @
25164969
...
...
@@ -87,6 +87,18 @@ parse_sample_format(const char *src, bool mask,
return
true
;
}
if
(
memcmp
(
src
,
"dsd"
,
3
)
==
0
)
{
if
(
src
[
3
]
==
'l'
)
{
*
sample_format_r
=
SAMPLE_FORMAT_DSD_LSBFIRST
;
*
endptr_r
=
src
+
4
;
}
else
{
*
sample_format_r
=
SAMPLE_FORMAT_DSD
;
*
endptr_r
=
src
+
3
;
}
return
true
;
}
value
=
strtoul
(
src
,
&
endptr
,
10
);
if
(
endptr
==
src
)
{
g_set_error
(
error_r
,
audio_parser_quark
(),
0
,
...
...
src/decoder/flac_pcm.c
View file @
25164969
...
...
@@ -103,6 +103,8 @@ flac_convert(void *dest,
case
SAMPLE_FORMAT_S24
:
case
SAMPLE_FORMAT_FLOAT
:
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
case
SAMPLE_FORMAT_UNDEFINED
:
/* unreachable */
assert
(
false
);
...
...
src/output/alsa_output_plugin.c
View file @
25164969
...
...
@@ -194,6 +194,8 @@ get_bitformat(enum sample_format sample_format)
{
switch
(
sample_format
)
{
case
SAMPLE_FORMAT_UNDEFINED
:
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
return
SND_PCM_FORMAT_UNKNOWN
;
case
SAMPLE_FORMAT_S8
:
...
...
src/output/oss_output_plugin.c
View file @
25164969
...
...
@@ -396,6 +396,8 @@ sample_format_to_oss(enum sample_format format)
switch
(
format
)
{
case
SAMPLE_FORMAT_UNDEFINED
:
case
SAMPLE_FORMAT_FLOAT
:
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
return
AFMT_QUERY
;
case
SAMPLE_FORMAT_S8
:
...
...
src/pcm_byteswap.c
View file @
25164969
...
...
@@ -74,6 +74,8 @@ pcm_byteswap(struct pcm_buffer *buffer, enum sample_format format,
return
NULL
;
case
SAMPLE_FORMAT_S8
:
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
return
src
;
case
SAMPLE_FORMAT_S16
:
...
...
src/pcm_convert.c
View file @
25164969
...
...
@@ -77,6 +77,8 @@ pcm_convert_channels(struct pcm_buffer *buffer, enum sample_format format,
case
SAMPLE_FORMAT_S8
:
case
SAMPLE_FORMAT_S24
:
case
SAMPLE_FORMAT_FLOAT
:
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
g_set_error
(
error_r
,
pcm_convert_quark
(),
0
,
"Channel conversion not implemented for format '%s'"
,
sample_format_to_string
(
format
));
...
...
src/pcm_format.c
View file @
25164969
...
...
@@ -147,6 +147,8 @@ pcm_convert_to_16(struct pcm_buffer *buffer, struct pcm_dither *dither,
switch
(
src_format
)
{
case
SAMPLE_FORMAT_UNDEFINED
:
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
break
;
case
SAMPLE_FORMAT_S8
:
...
...
@@ -265,6 +267,8 @@ pcm_convert_to_24(struct pcm_buffer *buffer,
switch
(
src_format
)
{
case
SAMPLE_FORMAT_UNDEFINED
:
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
break
;
case
SAMPLE_FORMAT_S8
:
...
...
@@ -389,6 +393,8 @@ pcm_convert_to_32(struct pcm_buffer *buffer,
switch
(
src_format
)
{
case
SAMPLE_FORMAT_UNDEFINED
:
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
break
;
case
SAMPLE_FORMAT_S8
:
...
...
@@ -524,6 +530,8 @@ pcm_convert_to_float(struct pcm_buffer *buffer,
{
switch
(
src_format
)
{
case
SAMPLE_FORMAT_UNDEFINED
:
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
break
;
case
SAMPLE_FORMAT_S8
:
...
...
src/pcm_mix.c
View file @
25164969
...
...
@@ -120,6 +120,8 @@ pcm_add_vol(void *buffer1, const void *buffer2, size_t size,
switch
(
format
)
{
case
SAMPLE_FORMAT_UNDEFINED
:
case
SAMPLE_FORMAT_S24
:
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
/* not implemented */
return
false
;
...
...
@@ -229,6 +231,8 @@ pcm_add(void *buffer1, const void *buffer2, size_t size,
switch
(
format
)
{
case
SAMPLE_FORMAT_UNDEFINED
:
case
SAMPLE_FORMAT_S24
:
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
/* not implemented */
return
false
;
...
...
src/pcm_volume.c
View file @
25164969
...
...
@@ -159,6 +159,8 @@ pcm_volume(void *buffer, size_t length,
switch
(
format
)
{
case
SAMPLE_FORMAT_UNDEFINED
:
case
SAMPLE_FORMAT_S24
:
case
SAMPLE_FORMAT_DSD
:
case
SAMPLE_FORMAT_DSD_LSBFIRST
:
/* not implemented */
return
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment