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
6c831e04
Commit
6c831e04
authored
May 13, 2010
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/oss: 24 bit support via OSS4
Added #ifdefs on the macros AFMT_S24_NE and other OSS4 extensions.
parent
67c48f66
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
0 deletions
+35
-0
NEWS
NEWS
+1
-0
oss_plugin.c
src/output/oss_plugin.c
+34
-0
No files found.
NEWS
View file @
6c831e04
...
...
@@ -56,6 +56,7 @@ ver 0.16 (20??/??/??)
- jack: support more than two audio channels
- httpd: bind port when output is enabled
- httpd: added name/genre/website configuration
- oss: 24 bit support via OSS4
- wildcards allowed in audio_format configuration
- consistently lock audio output objects
* player:
...
...
src/output/oss_plugin.c
View file @
6c831e04
...
...
@@ -381,9 +381,25 @@ sample_format_to_oss(enum sample_format format)
return
AFMT_S16_NE
;
case
SAMPLE_FORMAT_S24
:
#ifdef AFMT_S24_PACKED
return
AFMT_S24_PACKED
;
#else
return
AFMT_QUERY
;
#endif
case
SAMPLE_FORMAT_S24_P32
:
#ifdef AFMT_S24_NE
return
AFMT_S24_NE
;
#else
return
AFMT_QUERY
;
#endif
case
SAMPLE_FORMAT_S32
:
#ifdef AFMT_S32_NE
return
AFMT_S32_NE
;
#else
return
AFMT_QUERY
;
#endif
}
return
AFMT_QUERY
;
...
...
@@ -403,6 +419,21 @@ sample_format_from_oss(int format)
case
AFMT_S16_NE
:
return
SAMPLE_FORMAT_S16
;
#ifdef AFMT_S24_PACKED
case
AFMT_S24_PACKED
:
return
SAMPLE_FORMAT_S24
;
#endif
#ifdef AFMT_S24_NE
case
AFMT_S24_NE
:
return
SAMPLE_FORMAT_S24_P32
;
#endif
#ifdef AFMT_S32_NE
case
AFMT_S32_NE
:
return
SAMPLE_FORMAT_S32
;
#endif
default:
return
SAMPLE_FORMAT_UNDEFINED
;
}
...
...
@@ -443,6 +474,9 @@ oss_setup_sample_format(int fd, struct audio_format *audio_format,
other formats supported by MPD */
static
const
enum
sample_format
sample_formats
[]
=
{
SAMPLE_FORMAT_S24_P32
,
SAMPLE_FORMAT_S32
,
SAMPLE_FORMAT_S24
,
SAMPLE_FORMAT_S16
,
SAMPLE_FORMAT_S8
,
SAMPLE_FORMAT_UNDEFINED
/* sentinel */
...
...
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