mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

audio-dsp: use type-info to get channel names

Browse source
This commit is contained in:
Wim Taymans 2018-10-02 10:17:12 +02:00
parent eb765b26b3
commit 3d36755c4f
4 changed files with 8 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spa/include/spa/param/audio/type-info.h
View file

@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __SPA_AUDIO_RAW_TYPES_H__ #ifndef __SPA_AUDIO_TYPES_H__
#define __SPA_AUDIO_RAW_TYPES_H__ #define __SPA_AUDIO_TYPES_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

1
spa/include/spa/param/type-info.h
View file

@ -25,7 +25,6 @@ extern "C" {
#endif #endif
#include <spa/utils/defs.h> #include <spa/utils/defs.h>
#include <spa/utils/type-info.h>
#include <spa/param/props.h> #include <spa/param/props.h>
#include <spa/param/format.h> #include <spa/param/format.h>
#include <spa/node/io.h> #include <spa/node/io.h>

4
spa/include/spa/param/video/type-info.h
View file

@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __SPA_VIDEO_RAW_TYPES_H__ #ifndef __SPA_VIDEO_TYPES_H__
#define __SPA_VIDEO_RAW_TYPES_H__ #define __SPA_VIDEO_TYPES_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

46
src/modules/module-media-session/audio-dsp.c
View file

@ -28,6 +28,8 @@
#include <spa/node/node.h> #include <spa/node/node.h>
#include <spa/utils/hook.h> #include <spa/utils/hook.h>
#include <spa/param/audio/format-utils.h> #include <spa/param/audio/format-utils.h>
#include <spa/utils/type-info.h>
#include <spa/param/audio/type-info.h>
#include "pipewire/core.h" #include "pipewire/core.h"
#include "pipewire/link.h" #include "pipewire/link.h"
@ -144,47 +146,6 @@ static const struct pw_port_implementation port_implementation = {
.use_buffers = port_use_buffers, .use_buffers = port_use_buffers,
}; };
static const char *chmap_names[] =
{
"UNK", /**< unknown */
"NA", /**< unmapped */
"MONO", /**< mono */
"FL", /**< front left */
"FR", /**< front right */
"RL", /**< rear left */
"RR", /**< rear right */
"FC", /**< front center */
"LFE", /**< LFE */
"SL", /**< side left */
"SR", /**< side right */
"RC", /**< rear center */
"FLC", /**< front left center */
"FRC", /**< front right center */
"RLC", /**< rear left center */
"RRC", /**< rear right center */
"FLW", /**< front left wide */
"FRW", /**< front right wide */
"FLH", /**< front left high */
"FCH", /**< front center high */
"FRH", /**< front right high */
"TC", /**< top center */
"TFL", /**< top front left */
"TFR", /**< top front right */
"TFC", /**< top front center */
"TRL", /**< top rear left */
"TRR", /**< top rear right */
"TRC", /**< top rear center */
"TFLC", /**< top front left center */
"TFRC", /**< top front right center */
"TSL", /**< top side left */
"TSR", /**< top side right */
"LLFE", /**< left LFE */
"RLFE", /**< right LFE */
"BC", /**< bottom center */
"BLC", /**< bottom left center */
"BRC", /**< bottom right center */
};
static int make_channel_name(struct node *n, char *channel_name, int i, uint64_t channelmask) static int make_channel_name(struct node *n, char *channel_name, int i, uint64_t channelmask)
{ {
int j; int j;
@ -193,7 +154,8 @@ static int make_channel_name(struct node *n, char *channel_name, int i, uint64_t
for (j = 0; j < 64; j++) { for (j = 0; j < 64; j++) {
if (channelmask & (1LL << j)) { if (channelmask & (1LL << j)) {
if (i-- == 0) { if (i-- == 0) {
sprintf(channel_name, "%s", chmap_names[j]); sprintf(channel_name, "%s",
rindex(spa_type_audio_channel[j].name, ':')+1);
return 1; return 1;
} }
} }