[llvm-commits] [test-suite] r169926 - in /test-suite/trunk/MultiSource/Applications/ALAC: decode/alacconvert-decode.reference_output decode/main.cpp encode/main.cpp

[Michael Gottesman]

Author: mgottesman
Date: Tue Dec 11 16:42:01 2012
New Revision: 169926

URL: http://llvm.org/viewvc/llvm-project?rev=169926&view=rev
Log:
Change main.cpp to assume that an input wav file => output caff and vis-a-versa. Also make reference output correct.

Modified:
    test-suite/trunk/MultiSource/Applications/ALAC/decode/alacconvert-decode.reference_output
    test-suite/trunk/MultiSource/Applications/ALAC/decode/main.cpp
    test-suite/trunk/MultiSource/Applications/ALAC/encode/main.cpp

Modified: test-suite/trunk/MultiSource/Applications/ALAC/decode/alacconvert-decode.reference_output
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ALAC/decode/alacconvert-decode.reference_output?rev=169926&r1=169925&r2=169926&view=diff
==============================================================================
Binary files test-suite/trunk/MultiSource/Applications/ALAC/decode/alacconvert-decode.reference_output (original) and test-suite/trunk/MultiSource/Applications/ALAC/decode/alacconvert-decode.reference_output Tue Dec 11 16:42:01 2012 differ

Modified: test-suite/trunk/MultiSource/Applications/ALAC/decode/main.cpp
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ALAC/decode/main.cpp?rev=169926&r1=169925&r2=169926&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/ALAC/decode/main.cpp (original)
+++ test-suite/trunk/MultiSource/Applications/ALAC/decode/main.cpp Tue Dec 11 16:42:01 2012
@@ -161,9 +161,9 @@
         }
       else
         {
-          // decoding
-          GetOutputFileType(outputFileName, &outputFileType);
-            
+          // decoding          
+          outputFileType = inputFileType == kFileTypeWAV? kFileTypeCAFF : kFileTypeWAV;
+          
           if (outputFileType == kFileTypeWAV && outputFormat.mChannelsPerFrame > 2)
             {
               // we don't support WAVE because we don't want to reinterleave on output 
@@ -709,24 +709,6 @@
   return 0;
 }
 
-void GetOutputFileType(char * outputFileName, uint32_t * outputFileType)
-{
-  char * typeStr = strrchr(outputFileName, '.');
-    
-  *outputFileType = kFileTypeCAFF;
-
-  if (typeStr != NULL)
-    {
-      if (strlen(typeStr) == 4)
-        {
-          if (strcmp(typeStr, ".wav") == 0)
-            {
-              *outputFileType = kFileTypeWAV;
-            }
-        }
-    }
-}
-
 ALACChannelLayoutTag GetALACChannelLayoutTag(uint32_t inChannelsPerFrame)
 {
   return ALACChannelLayoutTags[inChannelsPerFrame - 1];

Modified: test-suite/trunk/MultiSource/Applications/ALAC/encode/main.cpp
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ALAC/encode/main.cpp?rev=169926&r1=169925&r2=169926&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/ALAC/encode/main.cpp (original)
+++ test-suite/trunk/MultiSource/Applications/ALAC/encode/main.cpp Tue Dec 11 16:42:01 2012
@@ -161,9 +161,9 @@
         }
       else
         {
-          // decoding
-          GetOutputFileType(outputFileName, &outputFileType);
-            
+          // decoding          
+          outputFileType = inputFileType == kFileTypeWAV? kFileTypeCAFF : kFileTypeWAV;
+          
           if (outputFileType == kFileTypeWAV && outputFormat.mChannelsPerFrame > 2)
             {
               // we don't support WAVE because we don't want to reinterleave on output 
@@ -709,24 +709,6 @@
   return 0;
 }
 
-void GetOutputFileType(char * outputFileName, uint32_t * outputFileType)
-{
-  char * typeStr = strrchr(outputFileName, '.');
-    
-  *outputFileType = kFileTypeCAFF;
-
-  if (typeStr != NULL)
-    {
-      if (strlen(typeStr) == 4)
-        {
-          if (strcmp(typeStr, ".wav") == 0)
-            {
-              *outputFileType = kFileTypeWAV;
-            }
-        }
-    }
-}
-
 ALACChannelLayoutTag GetALACChannelLayoutTag(uint32_t inChannelsPerFrame)
 {
   return ALACChannelLayoutTags[inChannelsPerFrame - 1];