comparison data/fileio/test/EncodingTest.h @ 1699:ad33d6c10738 single-point

Merge from default branch

 // test of audio codecs.
 
 #include "../AudioFileReaderFactory.h"
 #include "../AudioFileReader.h"
 #include "../WavFileWriter.h"
+
+#include "UnsupportedFormat.h"
 
 #include <cmath>
 
 #include <QObject>
 #include <QtTest>

 
         // Ensure that we can open all the files
         
         QFETCH(QString, audiofile);
 
+        QStringList fileAndExt = audiofile.split(".");
+        QString extension = fileAndExt[1];
+
         if (!AudioFileReaderFactory::isSupported(encodingDir + "/" +
                                                  audiofile)) {
+            if (isLegitimatelyUnsupported(extension)) {
 #if ( QT_VERSION >= 0x050000 )
-            QSKIP("Known unsupported file, skipping");
+                QSKIP("Known unsupported file, skipping");
 #else
-            QSKIP("Known unsupported file, skipping", SkipSingle);
-#endif
+                QSKIP("Known unsupported file, skipping", SkipSingle);
+#endif
+            }
         }            
         
         AudioFileReaderFactory::Parameters params;
         AudioFileReader *reader =
             AudioFileReaderFactory::createReader

         // that the title matches whatever is in our mapping structure
         // defined at the top
         
         QFETCH(QString, audiofile);
 
+        QStringList fileAndExt = audiofile.split(".");
+        QString file = fileAndExt[0];
+        QString extension = fileAndExt[1];
+
         AudioFileReaderFactory::Parameters params;
         AudioFileReader *reader =
             AudioFileReaderFactory::createReader
             (encodingDir + "/" + audiofile, params);
 
         if (!reader) {
+            if (isLegitimatelyUnsupported(extension)) {
 #if ( QT_VERSION >= 0x050000 )
-            QSKIP("Unsupported file, skipping");
+                QSKIP("Unsupported file, skipping");
 #else
-            QSKIP("Unsupported file, skipping", SkipSingle);
-#endif
-        }
-
-        QStringList fileAndExt = audiofile.split(".");
-        QString file = fileAndExt[0];
-        QString extension = fileAndExt[1];
+                QSKIP("Unsupported file, skipping", SkipSingle);
+#endif
+            }
+        }
+
+        QVERIFY(reader != nullptr);
 
         if (extension == "wav") {
 
             // Nothing
             
             delete reader;
 
         } else {
 
-//#if (!defined (HAVE_OGGZ) || !defined(HAVE_FISHSOUND))
-//            if (extension == "ogg") {
-//                QSKIP("Lack native Ogg Vorbis reader, so won't be getting metadata");
-//            }
-//#endif
-            
             auto blah = reader->getInterleavedFrames(0, 10);
             
             QString title = reader->getTitle();
             QVERIFY(title != QString());
 

 
         if (extension == "wav") {
             return;
         }
 
-//#if (!defined (HAVE_OGGZ) || !defined(HAVE_FISHSOUND))
-//        if (extension == "ogg") {
-//            QSKIP("Lack native Ogg Vorbis reader, so won't be getting metadata");
-//        }
-//#endif
-
         AudioFileReaderFactory::Parameters params;
         AudioFileReader *reader =
             AudioFileReaderFactory::createReader
             (encodingDir + "/" + audiofile, params);
         
         if (!reader) {
+            if (isLegitimatelyUnsupported(extension)) {
 #if ( QT_VERSION >= 0x050000 )
-            QSKIP("Unsupported file, skipping");
+                QSKIP("Unsupported file, skipping");
 #else
-            QSKIP("Unsupported file, skipping", SkipSingle);
-#endif
-        }
+                QSKIP("Unsupported file, skipping", SkipSingle);
+#endif
+            }
+        }
+
+        QVERIFY(reader != nullptr);
 
         QString title = reader->getTitle();
         QVERIFY(title != QString());
 
         for (int useTemporary = 0; useTemporary <= 1; ++useTemporary) {