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
32fd264f
Commit
32fd264f
authored
Jul 15, 2006
by
Avuton Olrich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[CLEANUP] Fix indentation to be like the rest of
the repository git-svn-id:
https://svn.musicpd.org/mpd/trunk@4348
09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent
3ad41fdd
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
62 additions
and
58 deletions
+62
-58
audioOutput_mvp.c
src/audioOutputs/audioOutput_mvp.c
+62
-58
No files found.
src/audioOutputs/audioOutput_mvp.c
View file @
32fd264f
...
...
@@ -45,7 +45,7 @@ typedef struct {
unsigned
long
stream_decode_type
;
unsigned
long
sample_rate
;
unsigned
long
bit_rate
;
unsigned
long
raw
[
64
/
sizeof
(
unsigned
long
)];
unsigned
long
raw
[
64
/
sizeof
(
unsigned
long
)];
}
aud_status_t
;
#define MVP_SET_AUD_STOP _IOW('a',1,int)
...
...
@@ -69,33 +69,34 @@ typedef struct {
#define MVP_SET_AUD_DAC_CLK _IOW('a',27,int)
#define MVP_GET_AUD_REGS _IOW('a',28,aud_ctl_regs_t*)
typedef
struct
_MvpData
{
int
fd
;
}
MvpData
;
static
int
pcmfrequencies
[][
3
]
=
{
{
9
,
8000
,
32000
},
{
10
,
11025
,
44100
},
{
11
,
12000
,
48000
},
{
1
,
16000
,
32000
},
{
2
,
22050
,
44100
},
{
3
,
24000
,
48000
},
{
5
,
32000
,
32000
},
{
0
,
44100
,
44100
},
{
7
,
48000
,
48000
},
{
13
,
64000
,
32000
},
{
14
,
88200
,
44100
},
{
15
,
96000
,
48000
}};
static
int
numfrequencies
=
sizeof
(
pcmfrequencies
)
/
12
;
static
int
mvp_testDefault
()
{
{
9
,
8000
,
32000
},
{
10
,
11025
,
44100
},
{
11
,
12000
,
48000
},
{
1
,
16000
,
32000
},
{
2
,
22050
,
44100
},
{
3
,
24000
,
48000
},
{
5
,
32000
,
32000
},
{
0
,
44100
,
44100
},
{
7
,
48000
,
48000
},
{
13
,
64000
,
32000
},
{
14
,
88200
,
44100
},
{
15
,
96000
,
48000
}
};
static
int
numfrequencies
=
sizeof
(
pcmfrequencies
)
/
12
;
static
int
mvp_testDefault
()
{
int
fd
;
fd
=
open
(
"/dev/adec_pcm"
,
O_WRONLY
);
if
(
fd
)
{
if
(
fd
)
{
close
(
fd
);
return
0
;
}
...
...
@@ -106,20 +107,24 @@ static int mvp_testDefault() {
return
-
1
;
}
static
int
mvp_initDriver
(
AudioOutput
*
audioOutput
,
ConfigParam
*
param
)
{
MvpData
*
md
=
malloc
(
sizeof
(
MvpData
));
static
int
mvp_initDriver
(
AudioOutput
*
audioOutput
,
ConfigParam
*
param
)
{
MvpData
*
md
=
malloc
(
sizeof
(
MvpData
));
md
->
fd
=
-
1
;
audioOutput
->
data
=
md
;
return
0
;
}
static
void
mvp_finishDriver
(
AudioOutput
*
audioOutput
)
{
static
void
mvp_finishDriver
(
AudioOutput
*
audioOutput
)
{
MvpData
*
md
=
audioOutput
->
data
;
free
(
md
);
}
static
int
mvp_setPcmParams
(
MvpData
*
md
,
unsigned
long
rate
,
int
channels
,
int
big_endian
,
int
bits
){
static
int
mvp_setPcmParams
(
MvpData
*
md
,
unsigned
long
rate
,
int
channels
,
int
big_endian
,
int
bits
)
{
int
iloop
;
int
mix
[
5
];
...
...
@@ -150,32 +155,29 @@ static int mvp_setPcmParams(MvpData *md, unsigned long rate, int channels, int b
/*
* if there is an exact match for the frequency, use it.
*/
for
(
iloop
=
0
;
iloop
<
numfrequencies
;
iloop
++
)
{
if
(
rate
==
pcmfrequencies
[
iloop
][
1
])
{
for
(
iloop
=
0
;
iloop
<
numfrequencies
;
iloop
++
)
{
if
(
rate
==
pcmfrequencies
[
iloop
][
1
])
{
mix
[
2
]
=
pcmfrequencies
[
iloop
][
0
];
break
;
}
}
if
(
iloop
>=
numfrequencies
)
{
ERROR
(
"Can not find suitable output frequency for %ld
\n
"
,
rate
);
ERROR
(
"Can not find suitable output frequency for %ld
\n
"
,
rate
);
return
-
1
;
}
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_FORMAT
,
&
mix
)
<
0
){
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_FORMAT
,
&
mix
)
<
0
)
{
ERROR
(
"Can not set audio format
\n
"
);
return
-
1
;
}
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_SYNC
,
2
)
!=
0
)
{
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_SYNC
,
2
)
!=
0
)
{
ERROR
(
"Can not set audio sync
\n
"
);
return
-
1
;
}
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_PLAY
,
0
)
<
0
){
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_PLAY
,
0
)
<
0
)
{
ERROR
(
"Can not set audio play mode
\n
"
);
return
-
1
;
}
...
...
@@ -183,56 +185,59 @@ static int mvp_setPcmParams(MvpData *md, unsigned long rate, int channels, int b
return
0
;
}
static
int
mvp_openDevice
(
AudioOutput
*
audioOutput
)
{
int
ret
=
-
1
;
long
long
int
stc
=
0
;
MvpData
*
md
=
audioOutput
->
data
;
AudioFormat
*
audioFormat
=
&
audioOutput
->
outAudioFormat
;
MvpData
*
md
=
audioOutput
->
data
;
AudioFormat
*
audioFormat
=
&
audioOutput
->
outAudioFormat
;
int
mix
[
5
]
=
{
0
,
2
,
7
,
1
,
0
};
if
((
md
->
fd
=
open
(
"/dev/adec_pcm"
,
O_RDWR
|
O_NONBLOCK
))
<
0
){
if
((
md
->
fd
=
open
(
"/dev/adec_pcm"
,
O_RDWR
|
O_NONBLOCK
))
<
0
)
{
ERROR
(
"Error opening /dev/adec_pcm: %s
\n
"
,
strerror
(
errno
));
return
-
1
;
}
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_SRC
,
1
)
<
0
)
{
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_SRC
,
1
)
<
0
)
{
ERROR
(
"Error setting audio source: %s
\n
"
,
strerror
(
errno
));
return
-
1
;
}
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_STREAMTYPE
,
0
)
<
0
)
{
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_STREAMTYPE
,
0
)
<
0
)
{
ERROR
(
"Error setting audio streamtype: %s
\n
"
,
strerror
(
errno
));
return
-
1
;
}
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_FORMAT
,
&
mix
)
<
0
)
{
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_FORMAT
,
&
mix
)
<
0
)
{
ERROR
(
"Error setting audio format: %s
\n
"
,
strerror
(
errno
));
return
-
1
;
}
ioctl
(
md
->
fd
,
MVP_SET_AUD_STC
,
&
stc
);
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_BYPASS
,
1
)
<
0
)
{
if
(
ioctl
(
md
->
fd
,
MVP_SET_AUD_BYPASS
,
1
)
<
0
)
{
ERROR
(
"Error setting audio streamtype: %s
\n
"
,
strerror
(
errno
));
return
-
1
;
}
#ifdef WORDS_BIGENDIAN
mvp_setPcmParams
(
md
,
audioFormat
->
sampleRate
,
audioFormat
->
channels
,
0
,
audioFormat
->
bits
);
mvp_setPcmParams
(
md
,
audioFormat
->
sampleRate
,
audioFormat
->
channels
,
0
,
audioFormat
->
bits
);
#else
mvp_setPcmParams
(
md
,
audioFormat
->
sampleRate
,
audioFormat
->
channels
,
1
,
audioFormat
->
bits
);
mvp_setPcmParams
(
md
,
audioFormat
->
sampleRate
,
audioFormat
->
channels
,
1
,
audioFormat
->
bits
);
#endif
audioOutput
->
open
=
1
;
return
0
;
}
static
void
mvp_closeDevice
(
AudioOutput
*
audioOutput
)
{
MvpData
*
md
=
audioOutput
->
data
;
if
(
md
->
fd
>=
0
)
close
(
md
->
fd
);
static
void
mvp_closeDevice
(
AudioOutput
*
audioOutput
)
{
MvpData
*
md
=
audioOutput
->
data
;
if
(
md
->
fd
>=
0
)
close
(
md
->
fd
);
md
->
fd
=
-
1
;
audioOutput
->
open
=
0
;
}
static
void
mvp_dropBufferedAudio
(
AudioOutput
*
audioOutput
)
{
MvpData
*
md
=
audioOutput
->
data
;
if
(
md
->
fd
>=
0
){
static
void
mvp_dropBufferedAudio
(
AudioOutput
*
audioOutput
)
{
MvpData
*
md
=
audioOutput
->
data
;
if
(
md
->
fd
>=
0
)
{
ioctl
(
md
->
fd
,
MVP_SET_AUD_RESET
,
0x11
);
close
(
md
->
fd
);
md
->
fd
=
-
1
;
...
...
@@ -240,19 +245,20 @@ static void mvp_dropBufferedAudio(AudioOutput * audioOutput) {
}
}
static
int
mvp_playAudio
(
AudioOutput
*
audioOutput
,
char
*
playChunk
,
int
size
)
static
int
mvp_playAudio
(
AudioOutput
*
audioOutput
,
char
*
playChunk
,
int
size
)
{
MvpData
*
md
=
audioOutput
->
data
;
MvpData
*
md
=
audioOutput
->
data
;
int
ret
;
/* reopen the device since it was closed by dropBufferedAudio */
if
(
md
->
fd
<
0
)
mvp_openDevice
(
audioOutput
);
if
(
md
->
fd
<
0
)
mvp_openDevice
(
audioOutput
);
while
(
size
>
0
)
{
ret
=
write
(
md
->
fd
,
playChunk
,
size
);
if
(
ret
<
0
)
{
if
(
errno
==
EINTR
)
continue
;
if
(
ret
<
0
)
{
if
(
errno
==
EINTR
)
continue
;
ERROR
(
"closing mvp PCM device due to write error: "
"%s
\n
"
,
strerror
(
errno
));
mvp_closeDevice
(
audioOutput
);
...
...
@@ -264,8 +270,7 @@ static int mvp_playAudio(AudioOutput * audioOutput, char * playChunk,
return
0
;
}
AudioOutputPlugin
mvpPlugin
=
{
AudioOutputPlugin
mvpPlugin
=
{
"mvp"
,
mvp_testDefault
,
mvp_initDriver
,
...
...
@@ -280,5 +285,4 @@ AudioOutputPlugin mvpPlugin =
#else
/* HAVE_MVP */
DISABLED_AUDIO_OUTPUT_PLUGIN
(
mvpPlugin
)
#endif
/* HAVE_MVP */
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