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
13ad2b4d
Commit
13ad2b4d
authored
Oct 20, 2011
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pcm_mix: return bool, make unimplemented format non-fatal
Let the caller deal with a failure.
parent
d0193430
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
28 deletions
+43
-28
output_thread.c
src/output_thread.c
+6
-2
pcm_mix.c
src/pcm_mix.c
+32
-25
pcm_mix.h
src/pcm_mix.h
+5
-1
No files found.
src/output_thread.c
View file @
13ad2b4d
...
@@ -401,8 +401,12 @@ ao_filter_chunk(struct audio_output *ao, const struct music_chunk *chunk,
...
@@ -401,8 +401,12 @@ ao_filter_chunk(struct audio_output *ao, const struct music_chunk *chunk,
char
*
dest
=
pcm_buffer_get
(
&
ao
->
cross_fade_buffer
,
char
*
dest
=
pcm_buffer_get
(
&
ao
->
cross_fade_buffer
,
other_length
);
other_length
);
memcpy
(
dest
,
other_data
,
other_length
);
memcpy
(
dest
,
other_data
,
other_length
);
pcm_mix
(
dest
,
data
,
length
,
ao
->
in_audio_format
.
format
,
if
(
!
pcm_mix
(
dest
,
data
,
length
,
ao
->
in_audio_format
.
format
,
1
.
0
-
chunk
->
mix_ratio
);
1
.
0
-
chunk
->
mix_ratio
))
{
g_warning
(
"Cannot cross-fade format %s"
,
sample_format_to_string
(
ao
->
in_audio_format
.
format
));
return
NULL
;
}
data
=
dest
;
data
=
dest
;
length
=
other_length
;
length
=
other_length
;
...
...
src/pcm_mix.c
View file @
13ad2b4d
...
@@ -22,7 +22,6 @@
...
@@ -22,7 +22,6 @@
#include "pcm_volume.h"
#include "pcm_volume.h"
#include "pcm_utils.h"
#include "pcm_utils.h"
#include "audio_format.h"
#include "audio_format.h"
#include "mpd_error.h"
#include <glib.h>
#include <glib.h>
...
@@ -99,36 +98,41 @@ pcm_add_vol_32(int32_t *buffer1, const int32_t *buffer2,
...
@@ -99,36 +98,41 @@ pcm_add_vol_32(int32_t *buffer1, const int32_t *buffer2,
}
}
}
}
static
void
static
bool
pcm_add_vol
(
void
*
buffer1
,
const
void
*
buffer2
,
size_t
size
,
pcm_add_vol
(
void
*
buffer1
,
const
void
*
buffer2
,
size_t
size
,
int
vol1
,
int
vol2
,
int
vol1
,
int
vol2
,
enum
sample_format
format
)
enum
sample_format
format
)
{
{
switch
(
format
)
{
switch
(
format
)
{
case
SAMPLE_FORMAT_UNDEFINED
:
case
SAMPLE_FORMAT_S24
:
/* not implemented */
return
false
;
case
SAMPLE_FORMAT_S8
:
case
SAMPLE_FORMAT_S8
:
pcm_add_vol_8
((
int8_t
*
)
buffer1
,
(
const
int8_t
*
)
buffer2
,
pcm_add_vol_8
((
int8_t
*
)
buffer1
,
(
const
int8_t
*
)
buffer2
,
size
,
vol1
,
vol2
);
size
,
vol1
,
vol2
);
break
;
return
true
;
case
SAMPLE_FORMAT_S16
:
case
SAMPLE_FORMAT_S16
:
pcm_add_vol_16
((
int16_t
*
)
buffer1
,
(
const
int16_t
*
)
buffer2
,
pcm_add_vol_16
((
int16_t
*
)
buffer1
,
(
const
int16_t
*
)
buffer2
,
size
/
2
,
vol1
,
vol2
);
size
/
2
,
vol1
,
vol2
);
break
;
return
true
;
case
SAMPLE_FORMAT_S24_P32
:
case
SAMPLE_FORMAT_S24_P32
:
pcm_add_vol_24
((
int32_t
*
)
buffer1
,
(
const
int32_t
*
)
buffer2
,
pcm_add_vol_24
((
int32_t
*
)
buffer1
,
(
const
int32_t
*
)
buffer2
,
size
/
4
,
vol1
,
vol2
);
size
/
4
,
vol1
,
vol2
);
break
;
return
true
;
case
SAMPLE_FORMAT_S32
:
case
SAMPLE_FORMAT_S32
:
pcm_add_vol_32
((
int32_t
*
)
buffer1
,
(
const
int32_t
*
)
buffer2
,
pcm_add_vol_32
((
int32_t
*
)
buffer1
,
(
const
int32_t
*
)
buffer2
,
size
/
4
,
vol1
,
vol2
);
size
/
4
,
vol1
,
vol2
);
break
;
return
true
;
default:
MPD_ERROR
(
"format %s not supported by pcm_add_vol"
,
sample_format_to_string
(
format
));
}
}
/* unreachable */
assert
(
false
);
return
false
;
}
}
static
void
static
void
...
@@ -187,34 +191,39 @@ pcm_add_32(int32_t *buffer1, const int32_t *buffer2, unsigned num_samples)
...
@@ -187,34 +191,39 @@ pcm_add_32(int32_t *buffer1, const int32_t *buffer2, unsigned num_samples)
}
}
}
}
static
void
static
bool
pcm_add
(
void
*
buffer1
,
const
void
*
buffer2
,
size_t
size
,
pcm_add
(
void
*
buffer1
,
const
void
*
buffer2
,
size_t
size
,
enum
sample_format
format
)
enum
sample_format
format
)
{
{
switch
(
format
)
{
switch
(
format
)
{
case
SAMPLE_FORMAT_UNDEFINED
:
case
SAMPLE_FORMAT_S24
:
/* not implemented */
return
false
;
case
SAMPLE_FORMAT_S8
:
case
SAMPLE_FORMAT_S8
:
pcm_add_8
((
int8_t
*
)
buffer1
,
(
const
int8_t
*
)
buffer2
,
size
);
pcm_add_8
((
int8_t
*
)
buffer1
,
(
const
int8_t
*
)
buffer2
,
size
);
break
;
return
true
;
case
SAMPLE_FORMAT_S16
:
case
SAMPLE_FORMAT_S16
:
pcm_add_16
((
int16_t
*
)
buffer1
,
(
const
int16_t
*
)
buffer2
,
size
/
2
);
pcm_add_16
((
int16_t
*
)
buffer1
,
(
const
int16_t
*
)
buffer2
,
size
/
2
);
break
;
return
true
;
case
SAMPLE_FORMAT_S24_P32
:
case
SAMPLE_FORMAT_S24_P32
:
pcm_add_24
((
int32_t
*
)
buffer1
,
(
const
int32_t
*
)
buffer2
,
size
/
4
);
pcm_add_24
((
int32_t
*
)
buffer1
,
(
const
int32_t
*
)
buffer2
,
size
/
4
);
break
;
return
true
;
case
SAMPLE_FORMAT_S32
:
case
SAMPLE_FORMAT_S32
:
pcm_add_32
((
int32_t
*
)
buffer1
,
(
const
int32_t
*
)
buffer2
,
size
/
4
);
pcm_add_32
((
int32_t
*
)
buffer1
,
(
const
int32_t
*
)
buffer2
,
size
/
4
);
break
;
return
true
;
default:
MPD_ERROR
(
"format %s not supported by pcm_add"
,
sample_format_to_string
(
format
));
}
}
/* unreachable */
assert
(
false
);
return
false
;
}
}
void
bool
pcm_mix
(
void
*
buffer1
,
const
void
*
buffer2
,
size_t
size
,
pcm_mix
(
void
*
buffer1
,
const
void
*
buffer2
,
size_t
size
,
enum
sample_format
format
,
float
portion1
)
enum
sample_format
format
,
float
portion1
)
{
{
...
@@ -223,10 +232,8 @@ pcm_mix(void *buffer1, const void *buffer2, size_t size,
...
@@ -223,10 +232,8 @@ pcm_mix(void *buffer1, const void *buffer2, size_t size,
/* portion1 is between 0.0 and 1.0 for crossfading, MixRamp uses NaN
/* portion1 is between 0.0 and 1.0 for crossfading, MixRamp uses NaN
* to signal mixing rather than fading */
* to signal mixing rather than fading */
if
(
isnan
(
portion1
))
{
if
(
isnan
(
portion1
))
pcm_add
(
buffer1
,
buffer2
,
size
,
format
);
return
pcm_add
(
buffer1
,
buffer2
,
size
,
format
);
return
;
}
s
=
sin
(
M_PI_2
*
portion1
);
s
=
sin
(
M_PI_2
*
portion1
);
s
*=
s
;
s
*=
s
;
...
@@ -234,5 +241,5 @@ pcm_mix(void *buffer1, const void *buffer2, size_t size,
...
@@ -234,5 +241,5 @@ pcm_mix(void *buffer1, const void *buffer2, size_t size,
vol1
=
s
*
PCM_VOLUME_1
+
0
.
5
;
vol1
=
s
*
PCM_VOLUME_1
+
0
.
5
;
vol1
=
vol1
>
PCM_VOLUME_1
?
PCM_VOLUME_1
:
(
vol1
<
0
?
0
:
vol1
);
vol1
=
vol1
>
PCM_VOLUME_1
?
PCM_VOLUME_1
:
(
vol1
<
0
?
0
:
vol1
);
pcm_add_vol
(
buffer1
,
buffer2
,
size
,
vol1
,
PCM_VOLUME_1
-
vol1
,
format
);
return
pcm_add_vol
(
buffer1
,
buffer2
,
size
,
vol1
,
PCM_VOLUME_1
-
vol1
,
format
);
}
}
src/pcm_mix.h
View file @
13ad2b4d
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include "audio_format.h"
#include "audio_format.h"
#include <stdbool.h>
#include <stddef.h>
#include <stddef.h>
/*
/*
...
@@ -37,8 +38,11 @@
...
@@ -37,8 +38,11 @@
* @param portion1 a number between 0.0 and 1.0 specifying the portion
* @param portion1 a number between 0.0 and 1.0 specifying the portion
* of the first buffer in the mix; portion2 = (1.0 - portion1). The value
* of the first buffer in the mix; portion2 = (1.0 - portion1). The value
* NaN is used by the MixRamp code to specify that simple addition is required.
* NaN is used by the MixRamp code to specify that simple addition is required.
*
* @return true on success, false if the format is not supported
*/
*/
void
G_GNUC_WARN_UNUSED_RESULT
bool
pcm_mix
(
void
*
buffer1
,
const
void
*
buffer2
,
size_t
size
,
pcm_mix
(
void
*
buffer1
,
const
void
*
buffer2
,
size_t
size
,
enum
sample_format
format
,
float
portion1
);
enum
sample_format
format
,
float
portion1
);
...
...
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