[xiph-commits] r16815 - trunk/vorbis-tools/oggenc

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-01-25 23:20:43 -0800 (Mon, 25 Jan 2010)
New Revision: 16815

Modified:
   trunk/vorbis-tools/oggenc/audio.c
Log:
Add warnings to AIFF[-C] transcode when speaker mapping is impossible



Modified: trunk/vorbis-tools/oggenc/audio.c
===================================================================
--- trunk/vorbis-tools/oggenc/audio.c	2010-01-26 07:09:24 UTC (rev 16814)
+++ trunk/vorbis-tools/oggenc/audio.c	2010-01-26 07:20:43 UTC (rev 16815)
@@ -231,6 +231,17 @@
     return 1;
 }
 
+static int aiff_permute_matrix[6][6] = 
+{
+  {0},              /* 1.0 mono   */
+  {0,1},            /* 2.0 stereo */
+  {0,2,1},          /* 3.0 channel ('wide') stereo */
+  {0,1,2,3},        /* 4.0 discrete quadraphonic (WARN) */
+  {0,2,1,3,4},      /* 5.0 surround (WARN) */
+  {0,1,2,3,4,5},    /* 5.1 surround (WARN)*/
+};
+
+
 int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
 {
     int aifc; /* AIFC or AIFF? */
@@ -333,14 +344,23 @@
         aiff->samplesize = format.samplesize;
         aiff->totalsamples = format.totalframes;
 
+        if(aiff->channels>3)
+          fprintf(stderr,"WARNING: AIFF[-C] files with greater than three channels use\n"
+                  "speaker locations incompatable with Vorbis suppound definitions.\n"
+                  "Not performaing channel location mapping.\n");
+
         opt->readdata = (void *)aiff;
 
         aiff->channel_permute = malloc(aiff->channels * sizeof(int));
-        /* Use a default 1-1 mapping, not sure what the spec says */
-        for (i=0; i < aiff->channels; i++)
-            aiff->channel_permute[i] = i;
+        if (aiff->channels <= 6)
+            /* Where we know the mappings, use them. */
+            memcpy(aiff->channel_permute, aiff_permute_matrix[aiff->channels-1], 
+                    sizeof(int) * aiff->channels);
+        else
+            /* Use a default 1-1 mapping */
+            for (i=0; i < aiff->channels; i++)
+                aiff->channel_permute[i] = i;
 
-
         seek_forward(in, format.offset); /* Swallow some data */
         return 1;
     }
@@ -549,9 +569,7 @@
         wav->totalsamples = opt->total_samples_per_channel;
 
         opt->readdata = (void *)wav;
-        
-        /* TODO: Read the extended wav header to get this right in weird cases,
-         * and/or error out if neccesary. Suck. */
+
         wav->channel_permute = malloc(wav->channels * sizeof(int));
         if (wav->channels <= 8)
             /* Where we know the mappings, use them. */
@@ -590,7 +608,7 @@
 
     realsamples = bytes_read/(sampbyte*f->channels);
     f->samplesread += realsamples;
-        
+
     if(f->samplesize==8)
     {
         unsigned char *bufu = (unsigned char *)buf;