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

diff --git a/ac3dec/ac3dec.c b/ac3dec/ac3dec.c
index 443005cd799f5fc50d8fdfd63e466c3efc17eb51..155bdf1d278351a53fefba066dd2ee6b3ece6ab1 100644 (file)
--- a/ac3dec/ac3dec.c
+++ b/ac3dec/ac3dec.c
@@ -50,10 +50,12 @@ static void help(void)
        printf("  -h,--help         this help\n");
        printf("  -v,--version      print version of this program\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("  -6,--6ch          six channels mode\n");
        printf("  -C,--iec958c      raw IEC958 (S/PDIF) consumer 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");
 }
 
@@ -98,9 +100,11 @@ int main(int argc,char *argv[])
                {"device", 1, NULL, 'D'},
                {"4ch", 0, NULL, '4'},
                {"6ch", 0, NULL, '6'},
+               {"card", 0, NULL, 'c'},
                {"iec958c", 0, NULL, 'C'},
                {"spdif", 0, NULL, 'C'},
                {"iec958p", 0, NULL, 'P'},
+               {"iec958r", 0, NULL, 'R'},
                {"quit", 0, NULL, 'q'},
                {NULL, 0, NULL, 0},
        };
@@ -114,6 +118,7 @@ int main(int argc,char *argv[])
        ac3_config.flags = 0;
        bzero(&out_config, sizeof(out_config));
        out_config.pcm_name = NULL;
+       out_config.card = NULL;
        out_config.bits = 16;
        out_config.rate = 48000;
        out_config.channels = 2;
@@ -123,7 +128,7 @@ int main(int argc,char *argv[])
        while (1) {
                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;
                switch (c) {
                case 'h':
@@ -132,6 +137,9 @@ int main(int argc,char *argv[])
                case 'v':
                        printf("ac3dec version " VERSION "\n");
                        return 1;
+               case 'c':
+                       out_config.card = strdup(optarg);
+                       break;
                case 'D':
                        out_config.pcm_name = optarg;
                        break;
@@ -151,6 +159,10 @@ int main(int argc,char *argv[])
                        ac3_config.num_output_ch = 2;
                        out_config.spdif = SPDIF_PRO;
                        break;
+               case 'R':
+                       ac3_config.num_output_ch = 2;
+                       out_config.spdif = SPDIF_PCM;
+                       break;
                case 'q':
                        ac3_config.flags |= AC3_QUIET;
                        out_config.quiet = 1;
@@ -181,7 +193,7 @@ int main(int argc,char *argv[])
                        optind++;
                        loop++;
                }
-               if (out_config.spdif == SPDIF_NONE) {
+               if ((out_config.spdif == SPDIF_NONE) || (out_config.spdif == SPDIF_PCM)) {
                        ac3_frame_t *ac3_frame;
                        ac3_init(&ac3_config);
                        ac3_frame = ac3_decode_frame();

diff --git a/ac3dec/output.c b/ac3dec/output.c
index c30f99324f67ff8a1f194b61fe845c868cb8da3a..d611fe6f1397e83aad697d2054213a59a6cd48e1 100644 (file)
--- a/ac3dec/output.c
+++ b/ac3dec/output.c
@@ -65,21 +65,28 @@ int output_open(output_t *output)
                                        s[2] = IEC958_AES2_PRO_WORDLEN_NOTID;
                                        s[3] = 0;
                                } else {
-                                       s[0] = (IEC958_AES0_NONAUDIO |
-                                               IEC958_AES0_CON_EMPHASIS_NONE);
+                                       s[0] = IEC958_AES0_CON_EMPHASIS_NONE;
+                                       if (output->spdif == SPDIF_CON)
+                                               s[0] |= IEC958_AES0_NONAUDIO;
                                        s[1] = (IEC958_AES1_CON_ORIGINAL |
                                                IEC958_AES1_CON_PCM_CODER);
                                        s[2] = 0;
                                        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]);
+                               if (out_config.card)
+                                       sprintf(devstr + strlen(devstr), ",CARD=%s", out_config.card);
                        }
                        break;
                case 4:
                        strcpy(devstr, "surround40");
+                       if (out_config.card)
+                               sprintf(devstr + strlen(devstr), ",CARD=%s", out_config.card);
                        break;
                case 6:
                        strcpy(devstr, "surround51");
+                       if (out_config.card)
+                               sprintf(devstr + strlen(devstr), ",CARD=%s", out_config.card);
                        break;
                default:
                        fprintf(stderr, "%d channels are not supported\n", output->channels);

diff --git a/ac3dec/output.h b/ac3dec/output.h
index 495d55ae370e9fa714f088ce12654ab45c65dd6d..1087a733a22aa0fb70317e1fd7f02ae83aba688d 100644 (file)
--- a/ac3dec/output.h
+++ b/ac3dec/output.h
@@ -26,11 +26,12 @@
 
 typedef struct {
        const char *pcm_name;
+       char *card;
        int bits;
        int rate;
        int channels;
        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;
 
 int output_open(output_t *output);