mirrors/alsa-tools
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-tools.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added --card and --iec958r (raw IEC958 PCM).

Browse source
This commit is contained in:
Jaroslav Kysela 2001-07-30 08:33:17 +00:00
parent c76b0f7815
commit 04255b61c5
3 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ac3dec/ac3dec.c
View file

@ -50,10 +50,12 @@ static void help(void)
printf(" -h,--help this help\n"); printf(" -h,--help this help\n");
printf(" -v,--version print version of this program\n"); printf(" -v,--version print version of this program\n");
printf(" -D,--device=NAME select PCM by NAME\n"); printf(" -D,--device=NAME select PCM by NAME\n");
printf(" -c,--card=ID select card for bellow modes\n");
printf(" -4,--4ch four channels mode\n"); printf(" -4,--4ch four channels mode\n");
printf(" -6,--6ch six channels mode\n"); printf(" -6,--6ch six channels mode\n");
printf(" -C,--iec958c raw IEC958 (S/PDIF) consumer mode\n"); printf(" -C,--iec958c raw IEC958 (S/PDIF) consumer mode\n");
printf(" -P,--iec958p raw IEC958 (S/PDIF) professional mode\n"); printf(" -P,--iec958p raw IEC958 (S/PDIF) professional mode\n");
printf(" -R,--iec958r raw IEC958 (S/PDIF) PCM\n");
printf(" -q,--quit quit mode\n"); printf(" -q,--quit quit mode\n");
} }
@ -98,9 +100,11 @@ int main(int argc,char *argv[])
{"device", 1, NULL, 'D'}, {"device", 1, NULL, 'D'},
{"4ch", 0, NULL, '4'}, {"4ch", 0, NULL, '4'},
{"6ch", 0, NULL, '6'}, {"6ch", 0, NULL, '6'},
{"card", 0, NULL, 'c'},
{"iec958c", 0, NULL, 'C'}, {"iec958c", 0, NULL, 'C'},
{"spdif", 0, NULL, 'C'}, {"spdif", 0, NULL, 'C'},
{"iec958p", 0, NULL, 'P'}, {"iec958p", 0, NULL, 'P'},
{"iec958r", 0, NULL, 'R'},
{"quit", 0, NULL, 'q'}, {"quit", 0, NULL, 'q'},
{NULL, 0, NULL, 0}, {NULL, 0, NULL, 0},
}; };
@ -114,6 +118,7 @@ int main(int argc,char *argv[])
ac3_config.flags = 0; ac3_config.flags = 0;
bzero(&out_config, sizeof(out_config)); bzero(&out_config, sizeof(out_config));
out_config.pcm_name = NULL; out_config.pcm_name = NULL;
out_config.card = NULL;
out_config.bits = 16; out_config.bits = 16;
out_config.rate = 48000; out_config.rate = 48000;
out_config.channels = 2; out_config.channels = 2;
@ -123,7 +128,7 @@ int main(int argc,char *argv[])
while (1) { while (1) {
int c; int c;
if ((c = getopt_long(argc, argv, "hvD:46CPq", long_option, NULL)) < 0) if ((c = getopt_long(argc, argv, "hvcD:46CPRq", long_option, NULL)) < 0)
break; break;
switch (c) { switch (c) {
case 'h': case 'h':
@ -132,6 +137,9 @@ int main(int argc,char *argv[])
case 'v': case 'v':
printf("ac3dec version " VERSION "\n"); printf("ac3dec version " VERSION "\n");
return 1; return 1;
case 'c':
out_config.card = strdup(optarg);
break;
case 'D': case 'D':
out_config.pcm_name = optarg; out_config.pcm_name = optarg;
break; break;
@ -151,6 +159,10 @@ int main(int argc,char *argv[])
ac3_config.num_output_ch = 2; ac3_config.num_output_ch = 2;
out_config.spdif = SPDIF_PRO; out_config.spdif = SPDIF_PRO;
break; break;
case 'R':
ac3_config.num_output_ch = 2;
out_config.spdif = SPDIF_PCM;
break;
case 'q': case 'q':
ac3_config.flags |= AC3_QUIET; ac3_config.flags |= AC3_QUIET;
out_config.quiet = 1; out_config.quiet = 1;
@ -181,7 +193,7 @@ int main(int argc,char *argv[])
optind++; optind++;
loop++; loop++;
} }
if (out_config.spdif == SPDIF_NONE) { if ((out_config.spdif == SPDIF_NONE) || (out_config.spdif == SPDIF_PCM)) {
ac3_frame_t *ac3_frame; ac3_frame_t *ac3_frame;
ac3_init(&ac3_config); ac3_init(&ac3_config);
ac3_frame = ac3_decode_frame(); ac3_frame = ac3_decode_frame();

11
ac3dec/output.c
View file

@ -65,21 +65,28 @@ int output_open(output_t *output)
s[2] = IEC958_AES2_PRO_WORDLEN_NOTID; s[2] = IEC958_AES2_PRO_WORDLEN_NOTID;
s[3] = 0; s[3] = 0;
} else { } else {
s[0] = (IEC958_AES0_NONAUDIO | s[0] = IEC958_AES0_CON_EMPHASIS_NONE;
IEC958_AES0_CON_EMPHASIS_NONE); if (output->spdif == SPDIF_CON)
s[0] |= IEC958_AES0_NONAUDIO;
s[1] = (IEC958_AES1_CON_ORIGINAL | s[1] = (IEC958_AES1_CON_ORIGINAL |
IEC958_AES1_CON_PCM_CODER); IEC958_AES1_CON_PCM_CODER);
s[2] = 0; s[2] = 0;
s[3] = IEC958_AES3_CON_FS_48000; s[3] = IEC958_AES3_CON_FS_48000;
} }
sprintf(devstr, "iec958:AES0=0x%x,AES1=0x%x,AES2=0x%x,AES3=0x%x", s[0], s[1], s[2], s[3]); sprintf(devstr, "iec958:AES0=0x%x,AES1=0x%x,AES2=0x%x,AES3=0x%x", s[0], s[1], s[2], s[3]);
if (out_config.card)
sprintf(devstr + strlen(devstr), ",CARD=%s", out_config.card);
} }
break; break;
case 4: case 4:
strcpy(devstr, "surround40"); strcpy(devstr, "surround40");
if (out_config.card)
sprintf(devstr + strlen(devstr), ",CARD=%s", out_config.card);
break; break;
case 6: case 6:
strcpy(devstr, "surround51"); strcpy(devstr, "surround51");
if (out_config.card)
sprintf(devstr + strlen(devstr), ",CARD=%s", out_config.card);
break; break;
default: default:
fprintf(stderr, "%d channels are not supported\n", output->channels); fprintf(stderr, "%d channels are not supported\n", output->channels);

3
ac3dec/output.h
View file

@ -26,11 +26,12 @@
typedef struct { typedef struct {
const char *pcm_name; const char *pcm_name;
char *card;
int bits; int bits;
int rate; int rate;
int channels; int channels;
int quiet: 1; int quiet: 1;
enum {SPDIF_NONE = 0, SPDIF_CON, SPDIF_PRO} spdif; enum {SPDIF_NONE = 0, SPDIF_CON, SPDIF_PRO, SPDIF_PCM} spdif;
} output_t; } output_t;
int output_open(output_t *output); int output_open(output_t *output);