Added parameter validation and test cases for raw audio format options

Author: chrisn

src/AudioFileReader.cpp

@@ -35,3 +35,5 @@ AudioFileReader::AudioFileReader()
 AudioFileReader::~AudioFileReader()
 {
 }
+
+//------------------------------------------------------------------------------

src/AudioFileReader.h

@@ -31,7 +31,7 @@ class AudioProcessor;
 //------------------------------------------------------------------------------
 
 class AudioFileReader
-{ 
+{
     public:
         AudioFileReader();
         virtual ~AudioFileReader();

src/FileFormat.cpp

@@ -1,6 +1,6 @@
 //------------------------------------------------------------------------------
 //
-// Copyright 2023 BBC Research and Development
+// Copyright 2024 BBC Research and Development
 //
 // Author: Chris Needham
 //
@@ -49,11 +49,11 @@ FileFormat fromString(const std::string& name)
         { "ogg",  FileFormat::Ogg  },
         { "oga",  FileFormat::Ogg  },
         { "opus", FileFormat::Opus },
+        { "raw",  FileFormat::Raw  },
         { "dat",  FileFormat::Dat  },
         { "json", FileFormat::Json },
         { "txt",  FileFormat::Txt  },
-        { "png",  FileFormat::Png  },
-        { "raw",  FileFormat::Raw  }
+        { "png",  FileFormat::Png  }
     };
 
     const auto i = map.find(key);
@@ -95,6 +95,10 @@ std::string toString(FileFormat file_format)
             str = "opus";
             break;
 
+        case FileFormat::Raw:
+            str = "raw";
+            break;
+
         case FileFormat::Dat:
             str = "dat";
             break;
@@ -111,10 +115,6 @@ std::string toString(FileFormat file_format)
             str = "png";
             break;
 
-        case FileFormat::Raw:
-            str = "raw";
-            break;
-
         default:
             throwError("Unknown file format");
             break;

src/FileFormat.h

@@ -1,6 +1,6 @@
 //------------------------------------------------------------------------------
 //
-// Copyright 2021 BBC Research and Development
+// Copyright 2024 BBC Research and Development
 //
 // Author: Chris Needham
 //
@@ -39,11 +39,11 @@ namespace FileFormat {
         Flac,
         Ogg,
         Opus,
+        Raw,
         Dat,
         Json,
         Txt,
-        Png,
-        Raw
+        Png
     };
 
     FileFormat fromString(const std::string& name);

src/OptionHandler.cpp

@@ -1,6 +1,6 @@
 //------------------------------------------------------------------------------
 //
-// Copyright 2013-2023 BBC Research and Development
+// Copyright 2013-2024 BBC Research and Development
 //
 // Author: Chris Needham
 //
@@ -51,50 +51,6 @@
 
 //------------------------------------------------------------------------------
 
-static std::string getFileExtension(const boost::filesystem::path& filename)
-{
-    std::string extension = filename.extension().string();
-
-    // Remove leading "."
-    if (!extension.empty()) {
-        extension.erase(0, 1);
-    }
-
-    return extension;
-}
-
-//------------------------------------------------------------------------------
-
-static FileFormat::FileFormat getFormatFromFileExtension(
-    const boost::filesystem::path& filename)
-{
-    return FileFormat::fromString(getFileExtension(filename));
-}
-
-//------------------------------------------------------------------------------
-
-static FileFormat::FileFormat getInputFormat(
-    const Options& options,
-    const boost::filesystem::path& filename)
-{
-    return options.hasInputFormat() ?
-        FileFormat::fromString(options.getInputFormat()) :
-        getFormatFromFileExtension(filename);
-}
-
-//------------------------------------------------------------------------------
-
-static FileFormat::FileFormat getOutputFormat(
-    const Options& options,
-    const boost::filesystem::path& filename)
-{
-    return options.hasOutputFormat() ?
-        FileFormat::fromString(options.getOutputFormat()) :
-        getFormatFromFileExtension(filename);
-}
-
-//------------------------------------------------------------------------------
-
 static std::unique_ptr<AudioFileReader> createAudioFileReader(
     const boost::filesystem::path& input_filename,
     const FileFormat::FileFormat input_format,
@@ -113,14 +69,13 @@ static std::unique_ptr<AudioFileReader> createAudioFileReader(
     }
     else if (input_format == FileFormat::Raw) {
         SndFileAudioFileReader* sndfile_audio_file_reader = new SndFileAudioFileReader;
+        reader.reset(sndfile_audio_file_reader);
 
         sndfile_audio_file_reader->configure(
             options.getRawAudioChannels(),
             options.getRawAudioSampleRate(),
             options.getRawAudioFormat()
         );
-
-        reader.reset(sndfile_audio_file_reader);
     }
     else {
         throwError("Unknown file type: %1%", input_filename);
@@ -184,7 +139,7 @@ static std::pair<bool, double> getDuration(
     const Options& options)
 {
     bool verbose = !options.getQuiet();
-    
+
     std::unique_ptr<AudioFileReader> audio_file_reader(
         createAudioFileReader(input_filename, input_format, options)
     );
@@ -736,17 +691,17 @@ bool OptionHandler::run(const Options& options)
     bool success = true;
 
     try {
-        const boost::filesystem::path input_filename =
+        const boost::filesystem::path& input_filename =
             options.getInputFilename();
 
-        const boost::filesystem::path output_filename =
+        const boost::filesystem::path& output_filename =
             options.getOutputFilename();
 
         const FileFormat::FileFormat input_format =
-            getInputFormat(options, input_filename);
+            options.getInputFormat();
 
         const FileFormat::FileFormat output_format =
-            getOutputFormat(options, output_filename);
+            options.getOutputFormat();
 
         if (shouldConvertAudioFormat(input_format, output_format)) {
             success = convertAudioFormat(