ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Audio: port to the new Utility::Path, including the plugins. 

Again an unatomic exists() + read() replaced with a more robust
Path::read() that returns an Optional.
pull/556/head
Vladimír Vondruš 4 years ago
parent
05c0a01b94
commit
ac75f0b67a
3 changed files with 51 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/Magnum/Audio/AbstractImporter.cpp
  2. 12
      src/Magnum/Audio/Test/AbstractImporterTest.cpp
  3. 64
      src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp

13
src/Magnum/Audio/AbstractImporter.cpp
Unescape View File

@ -27,9 +27,12 @@
#include <Corrade/Containers/Array.h> #include <Corrade/Containers/Array.h>
#include <Corrade/Containers/EnumSet.hpp> #include <Corrade/Containers/EnumSet.hpp>
#include <Corrade/Containers/Optional.h>
#include <Corrade/Containers/String.h>
#include <Corrade/Containers/StringStl.h> /** @todo remove once PluginManager is <string>-free */
#include <Corrade/Utility/Assert.h> #include <Corrade/Utility/Assert.h>
#include <Corrade/Utility/DebugStl.h> #include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/Directory.h> #include <Corrade/Utility/Path.h>
#ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
#include "Magnum/Audio/configure.h" #include "Magnum/Audio/configure.h"
@ -47,9 +50,10 @@ std::string AbstractImporter::pluginInterface() {
#ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
std::vector<std::string> AbstractImporter::pluginSearchPaths() { std::vector<std::string> AbstractImporter::pluginSearchPaths() {
const Containers::Optional<Containers::String> libraryLocation = Utility::Path::libraryLocation(&pluginInterface);
return PluginManager::implicitPluginSearchPaths( return PluginManager::implicitPluginSearchPaths(
#ifndef MAGNUM_BUILD_STATIC #ifndef MAGNUM_BUILD_STATIC
Utility::Directory::libraryLocation(&pluginInterface), libraryLocation ? *libraryLocation : Containers::String{},
#else #else
{}, {},
#endif #endif
@ -96,12 +100,13 @@ void AbstractImporter::doOpenFile(const std::string& filename) {
CORRADE_ASSERT(features() & ImporterFeature::OpenData, "Audio::AbstractImporter::openFile(): not implemented", ); CORRADE_ASSERT(features() & ImporterFeature::OpenData, "Audio::AbstractImporter::openFile(): not implemented", );
/* Open file */ /* Open file */
if(!Utility::Directory::exists(filename)) { const Containers::Optional<Containers::Array<char>> data = Utility::Path::read(filename);
if(!data) {
Error() << "Audio::AbstractImporter::openFile(): cannot open file" << filename; Error() << "Audio::AbstractImporter::openFile(): cannot open file" << filename;
return; return;
} }
doOpenData(Utility::Directory::read(filename)); doOpenData(*data);
} }
void AbstractImporter::close() { void AbstractImporter::close() {

12
src/Magnum/Audio/Test/AbstractImporterTest.cpp
Unescape View File

@ -25,10 +25,13 @@
#include <sstream> #include <sstream>
#include <Corrade/Containers/Array.h> #include <Corrade/Containers/Array.h>
#include <Corrade/Containers/String.h>
#include <Corrade/Containers/StringStl.h> /** @todo remove once AbstractImporter is <string>-free */
#include <Corrade/TestSuite/Tester.h> #include <Corrade/TestSuite/Tester.h>
#include <Corrade/TestSuite/Compare/Container.h> #include <Corrade/TestSuite/Compare/Container.h>
#include <Corrade/TestSuite/Compare/String.h>
#include <Corrade/Utility/DebugStl.h> #include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/Directory.h> #include <Corrade/Utility/Path.h>
#include "Magnum/Audio/AbstractImporter.h" #include "Magnum/Audio/AbstractImporter.h"
#include "Magnum/Audio/BufferFormat.h" #include "Magnum/Audio/BufferFormat.h"
@ -155,7 +158,7 @@ void AbstractImporterTest::openFileAsData() {
/* doOpenFile() should call doOpenData() */ /* doOpenFile() should call doOpenData() */
CORRADE_VERIFY(!importer.isOpened()); CORRADE_VERIFY(!importer.isOpened());
importer.openFile(Utility::Directory::join(AUDIO_TEST_DIR, "file.bin")); importer.openFile(Utility::Path::join(AUDIO_TEST_DIR, "file.bin"));
CORRADE_VERIFY(importer.isOpened()); CORRADE_VERIFY(importer.isOpened());
importer.close(); importer.close();
@ -184,7 +187,10 @@ void AbstractImporterTest::openFileAsDataNotFound() {
CORRADE_VERIFY(!importer.openFile("nonexistent.bin")); CORRADE_VERIFY(!importer.openFile("nonexistent.bin"));
CORRADE_VERIFY(!importer.isOpened()); CORRADE_VERIFY(!importer.isOpened());
CORRADE_COMPARE(out.str(), "Audio::AbstractImporter::openFile(): cannot open file nonexistent.bin\n"); /* There's an error from Path::read() before */
CORRADE_COMPARE_AS(out.str(),
"\nAudio::AbstractImporter::openFile(): cannot open file nonexistent.bin\n",
TestSuite::Compare::StringHasSuffix);
} }
void AbstractImporterTest::openFileNotImplemented() { void AbstractImporterTest::openFileNotImplemented() {

64
src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp
Unescape View File

@ -26,10 +26,12 @@
#include <sstream> #include <sstream>
#include <Corrade/Containers/Array.h> #include <Corrade/Containers/Array.h>
#include <Corrade/Containers/String.h>
#include <Corrade/Containers/StringStl.h> /** @todo remove once AbstractImporter is <string>-free */
#include <Corrade/TestSuite/Tester.h> #include <Corrade/TestSuite/Tester.h>
#include <Corrade/TestSuite/Compare/Container.h> #include <Corrade/TestSuite/Compare/Container.h>
#include <Corrade/Utility/DebugStl.h> #include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/Directory.h> #include <Corrade/Utility/Path.h>
#include "Magnum/Audio/AbstractImporter.h" #include "Magnum/Audio/AbstractImporter.h"
@ -144,7 +146,7 @@ void WavImporterTest::wrongSignature() {
Error redirectError{&out}; Error redirectError{&out};
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "wrongSignature.wav"))); CORRADE_VERIFY(!importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "wrongSignature.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): the file signature is invalid\n"); CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): the file signature is invalid\n");
} }
@ -153,7 +155,7 @@ void WavImporterTest::unsupportedFormat() {
Error redirectError{&out}; Error redirectError{&out};
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "unsupportedFormat.wav"))); CORRADE_VERIFY(!importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "unsupportedFormat.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat::AdPcm\n"); CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat::AdPcm\n");
} }
@ -162,7 +164,7 @@ void WavImporterTest::unsupportedChannelCount() {
Error redirectError{&out}; Error redirectError{&out};
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "unsupportedChannelCount.wav"))); CORRADE_VERIFY(!importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "unsupportedChannelCount.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): PCM with unsupported channel count 6 with 8 bits per sample\n"); CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): PCM with unsupported channel count 6 with 8 bits per sample\n");
} }
@ -171,7 +173,7 @@ void WavImporterTest::invalidPadding() {
Error redirectError{&out}; Error redirectError{&out};
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "invalidPadding.wav"))); CORRADE_VERIFY(!importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "invalidPadding.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): the file has improper size, expected 66 but got 73\n"); CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): the file has improper size, expected 66 but got 73\n");
} }
@ -180,7 +182,7 @@ void WavImporterTest::invalidLength() {
Error redirectError{&out}; Error redirectError{&out};
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "invalidLength.wav"))); CORRADE_VERIFY(!importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "invalidLength.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): the file has improper size, expected 160844 but got 80444\n"); CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): the file has improper size, expected 160844 but got 80444\n");
} }
@ -189,13 +191,13 @@ void WavImporterTest::invalidDataChunk() {
Error redirectError{&out}; Error redirectError{&out};
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "invalidDataChunk.wav"))); CORRADE_VERIFY(!importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "invalidDataChunk.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): the file contains no data chunk\n"); CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): the file contains no data chunk\n");
} }
void WavImporterTest::invalidFactChunk() { void WavImporterTest::invalidFactChunk() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "invalidFactChunk.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "invalidFactChunk.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::Mono16); CORRADE_COMPARE(importer->format(), BufferFormat::Mono16);
CORRADE_COMPARE(importer->frequency(), 22050); CORRADE_COMPARE(importer->frequency(), 22050);
@ -210,7 +212,7 @@ void WavImporterTest::zeroSamples() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
/* No error should happen, it should just give an empty buffer back */ /* No error should happen, it should just give an empty buffer back */
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "zeroSamples.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "zeroSamples.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::Mono16); CORRADE_COMPARE(importer->format(), BufferFormat::Mono16);
CORRADE_COMPARE(importer->frequency(), 22050); CORRADE_COMPARE(importer->frequency(), 22050);
CORRADE_VERIFY(importer->data().empty()); CORRADE_VERIFY(importer->data().empty());
@ -221,13 +223,13 @@ void WavImporterTest::mono4() {
Error redirectError{&out}; Error redirectError{&out};
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "mono4.wav"))); CORRADE_VERIFY(!importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "mono4.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat::AdPcm\n"); CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat::AdPcm\n");
} }
void WavImporterTest::mono8() { void WavImporterTest::mono8() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "mono8.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "mono8.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::Mono8); CORRADE_COMPARE(importer->format(), BufferFormat::Mono8);
CORRADE_COMPARE(importer->frequency(), 22050); CORRADE_COMPARE(importer->frequency(), 22050);
@ -240,7 +242,7 @@ void WavImporterTest::mono8() {
void WavImporterTest::mono8junk() { void WavImporterTest::mono8junk() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "mono8junk.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "mono8junk.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::Mono8); CORRADE_COMPARE(importer->format(), BufferFormat::Mono8);
CORRADE_COMPARE(importer->frequency(), 22050); CORRADE_COMPARE(importer->frequency(), 22050);
@ -252,7 +254,7 @@ void WavImporterTest::mono8junk() {
void WavImporterTest::mono8ALaw() { void WavImporterTest::mono8ALaw() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "mono8ALaw.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "mono8ALaw.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::MonoALaw); CORRADE_COMPARE(importer->format(), BufferFormat::MonoALaw);
CORRADE_COMPARE(importer->frequency(), 8000); CORRADE_COMPARE(importer->frequency(), 8000);
@ -265,7 +267,7 @@ void WavImporterTest::mono8ALaw() {
void WavImporterTest::mono8MuLaw() { void WavImporterTest::mono8MuLaw() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "mono8MuLaw.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "mono8MuLaw.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::MonoMuLaw); CORRADE_COMPARE(importer->format(), BufferFormat::MonoMuLaw);
CORRADE_COMPARE(importer->frequency(), 8000); CORRADE_COMPARE(importer->frequency(), 8000);
@ -278,7 +280,7 @@ void WavImporterTest::mono8MuLaw() {
void WavImporterTest::mono16() { void WavImporterTest::mono16() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "mono16.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "mono16.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::Mono16); CORRADE_COMPARE(importer->format(), BufferFormat::Mono16);
CORRADE_COMPARE(importer->frequency(), 44000); CORRADE_COMPARE(importer->frequency(), 44000);
@ -290,7 +292,7 @@ void WavImporterTest::mono16() {
void WavImporterTest::mono16BigEndian() { void WavImporterTest::mono16BigEndian() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "mono16be.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "mono16be.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::Mono16); CORRADE_COMPARE(importer->format(), BufferFormat::Mono16);
CORRADE_COMPARE(importer->frequency(), 44000); CORRADE_COMPARE(importer->frequency(), 44000);
@ -305,13 +307,13 @@ void WavImporterTest::stereo4() {
Error redirectError{&out}; Error redirectError{&out};
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo4.wav"))); CORRADE_VERIFY(!importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo4.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat::AdPcm\n"); CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat::AdPcm\n");
} }
void WavImporterTest::stereo8() { void WavImporterTest::stereo8() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo8.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo8.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::Stereo8); CORRADE_COMPARE(importer->format(), BufferFormat::Stereo8);
CORRADE_COMPARE(importer->frequency(), 96000); CORRADE_COMPARE(importer->frequency(), 96000);
@ -323,7 +325,7 @@ void WavImporterTest::stereo8() {
void WavImporterTest::stereo8ALaw() { void WavImporterTest::stereo8ALaw() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo8ALaw.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo8ALaw.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::StereoALaw); CORRADE_COMPARE(importer->format(), BufferFormat::StereoALaw);
CORRADE_COMPARE(importer->frequency(), 8000); CORRADE_COMPARE(importer->frequency(), 8000);
@ -336,7 +338,7 @@ void WavImporterTest::stereo8ALaw() {
void WavImporterTest::stereo8MuLaw() { void WavImporterTest::stereo8MuLaw() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo8MuLaw.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo8MuLaw.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::StereoMuLaw); CORRADE_COMPARE(importer->format(), BufferFormat::StereoMuLaw);
CORRADE_COMPARE(importer->frequency(), 8000); CORRADE_COMPARE(importer->frequency(), 8000);
@ -352,13 +354,13 @@ void WavImporterTest::stereo12() {
Error redirectError{&out}; Error redirectError{&out};
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo12.wav"))); CORRADE_VERIFY(!importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo12.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): PCM with unsupported channel count 2 with 12 bits per sample\n"); CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): PCM with unsupported channel count 2 with 12 bits per sample\n");
} }
void WavImporterTest::stereo16() { void WavImporterTest::stereo16() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo16.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo16.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::Stereo16); CORRADE_COMPARE(importer->format(), BufferFormat::Stereo16);
CORRADE_COMPARE(importer->frequency(), 44100); CORRADE_COMPARE(importer->frequency(), 44100);
@ -373,7 +375,7 @@ void WavImporterTest::stereo24() {
Error redirectError{&out}; Error redirectError{&out};
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo24.wav"))); CORRADE_VERIFY(!importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo24.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): PCM with unsupported channel count 2 with 24 bits per sample\n"); CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): PCM with unsupported channel count 2 with 24 bits per sample\n");
} }
@ -382,13 +384,13 @@ void WavImporterTest::stereo32() {
Error redirectError{&out}; Error redirectError{&out};
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo32.wav"))); CORRADE_VERIFY(!importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo32.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): PCM with unsupported channel count 2 with 32 bits per sample\n"); CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): PCM with unsupported channel count 2 with 32 bits per sample\n");
} }
void WavImporterTest::mono32f() { void WavImporterTest::mono32f() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "mono32f.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "mono32f.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::MonoFloat); CORRADE_COMPARE(importer->format(), BufferFormat::MonoFloat);
CORRADE_COMPARE(importer->frequency(), 48000); CORRADE_COMPARE(importer->frequency(), 48000);
@ -401,7 +403,7 @@ void WavImporterTest::mono32f() {
void WavImporterTest::mono32fBigEndian() { void WavImporterTest::mono32fBigEndian() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "mono32fbe.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "mono32fbe.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::MonoFloat); CORRADE_COMPARE(importer->format(), BufferFormat::MonoFloat);
CORRADE_COMPARE(importer->frequency(), 48000); CORRADE_COMPARE(importer->frequency(), 48000);
@ -413,7 +415,7 @@ void WavImporterTest::mono32fBigEndian() {
void WavImporterTest::stereo32f() { void WavImporterTest::stereo32f() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo32f.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo32f.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::StereoFloat); CORRADE_COMPARE(importer->format(), BufferFormat::StereoFloat);
CORRADE_COMPARE(importer->frequency(), 44100); CORRADE_COMPARE(importer->frequency(), 44100);
@ -426,7 +428,7 @@ void WavImporterTest::stereo32f() {
void WavImporterTest::stereo64f() { void WavImporterTest::stereo64f() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo64f.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo64f.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::StereoDouble); CORRADE_COMPARE(importer->format(), BufferFormat::StereoDouble);
CORRADE_COMPARE(importer->frequency(), 8000); CORRADE_COMPARE(importer->frequency(), 8000);
@ -440,7 +442,7 @@ void WavImporterTest::stereo64f() {
void WavImporterTest::stereo64fBigEndian() { void WavImporterTest::stereo64fBigEndian() {
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo64fbe.wav"))); CORRADE_VERIFY(importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "stereo64fbe.wav")));
CORRADE_COMPARE(importer->format(), BufferFormat::StereoDouble); CORRADE_COMPARE(importer->format(), BufferFormat::StereoDouble);
CORRADE_COMPARE(importer->frequency(), 8000); CORRADE_COMPARE(importer->frequency(), 8000);
@ -456,7 +458,7 @@ void WavImporterTest::surround51Channel16() {
Error redirectError{&out}; Error redirectError{&out};
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "surround51Channel16.wav"))); CORRADE_VERIFY(!importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "surround51Channel16.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat::Extensible\n"); CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat::Extensible\n");
} }
@ -465,7 +467,7 @@ void WavImporterTest::surround71Channel24() {
Error redirectError{&out}; Error redirectError{&out};
Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter"); Containers::Pointer<AbstractImporter> importer = _manager.instantiate("WavAudioImporter");
CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(WAVAUDIOIMPORTER_TEST_DIR, "surround71Channel24.wav"))); CORRADE_VERIFY(!importer->openFile(Utility::Path::join(WAVAUDIOIMPORTER_TEST_DIR, "surround71Channel24.wav")));
CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat::Extensible\n"); CORRADE_COMPARE(out.str(), "Audio::WavImporter::openData(): unsupported format Audio::WavAudioFormat::Extensible\n");
} }

Write Preview
Loading…
Cancel
Save