Raise warning instead of error if file has no audio stream

Fixes #138
complexlogic · Feb 8, 2025 · 909d3fa · 909d3fa
1 parent c62a63c
commit 909d3fa
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/src/scan.cpp b/src/scan.cpp
@@ -177,10 +177,20 @@ bool ScanJob::scan(std::mutex *ffmpeg_mutex)
                 }
             }
         }
+        ScanReturn ret;
+        std::vector<int> remove;
         for (Track &track : tracks) {
-            error = !track.scan(config, ffmpeg_mutex);
-            if (error)
+            ret = track.scan(config, ffmpeg_mutex);
+            if (ret == ScanReturn::ERROR) {
+                error = true;
                 return false;
+            }
+            else if (ret == ScanReturn::NO_STREAM)
+                remove.push_back(&track - &tracks[0]);
+        }
+        for (auto it = remove.rbegin(); it != remove.rend(); ++it) {
+            tracks.erase(tracks.begin() + *it);
+            nb_files--;
         }
         calculate_loudness();
     }
@@ -189,12 +199,12 @@ bool ScanJob::scan(std::mutex *ffmpeg_mutex)
     return true;
 }
 
-bool ScanJob::Track::scan(const Config &config, std::mutex *m)
+ScanReturn ScanJob::Track::scan(const Config &config, std::mutex *m)
 {
     ProgressBar progress_bar;
     int rc, stream_id = -1;
     uint8_t *swr_out_data[1];
-    bool ret = false;
+    ScanReturn ret = ScanReturn::ERROR;
     bool repeat = false;
     int peak_mode;
     double time_base;
@@ -253,7 +263,8 @@ bool ScanJob::Track::scan(const Config &config, std::mutex *m)
     stream_id = av_find_best_stream(format_ctx, AVMEDIA_TYPE_AUDIO, -1, -1, &codec, 0);
     if (stream_id < 0) {
         if (!multithread)
-            output_error("Could not find audio stream");
+            output_warn("Could not find audio stream\n");
+        ret = ScanReturn::NO_STREAM;
         goto end;
     }
     stream = format_ctx->streams[stream_id];
@@ -448,7 +459,7 @@ bool ScanJob::Track::scan(const Config &config, std::mutex *m)
     if (output_progress)
         progress_bar.complete();
 
-    ret = true;
+    ret = ScanReturn::SUCCESS;
 end:
     av_packet_free(&packet);
     av_frame_free(&frame);

diff --git a/src/scan.hpp b/src/scan.hpp
@@ -35,6 +35,12 @@ struct ScanResult {
 	double album_loudness;
 };
 
+enum class ScanReturn {
+	ERROR,
+	NO_STREAM,
+	SUCCESS
+};
+
 struct ScanData {
     size_t files = 0;
 	size_t skipped = 0;
@@ -62,7 +68,7 @@ class ScanJob {
 			bool aclip = false;
 
 			Track(const std::filesystem::path &path, FileType type) : path(path), type(type), ebur128(nullptr, free_ebur128) {};
-			bool scan(const Config &config, std::mutex *ffmpeg_mutex);
+			ScanReturn scan(const Config &config, std::mutex *ffmpeg_mutex);
 			void calculate_loudness(const Config &config);
 		};