OpenSourceJoker/video2x
3
0
Fork 0
mirror of https://github.com/k4yt3x/video2x.git synced 2024-12-28 06:59:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(video2x): fixed return code fetching

Browse Source 
Signed-off-by: k4yt3x <i@k4yt3x.com>
This commit is contained in:
k4yt3x 2024-11-02 00:00:00 +00:00
parent 9c491d4277
commit 406a97f360
No known key found for this signature in database
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/video2x.cpp
View File

@ -173,6 +173,7 @@ std::mutex proc_ctx_mutex;
// Wrapper function for video processing thread // Wrapper function for video processing thread
void process_video_thread( void process_video_thread(
Arguments *arguments, Arguments *arguments,
int *proc_ret,
AVHWDeviceType hw_device_type, AVHWDeviceType hw_device_type,
FilterConfig *filter_config, FilterConfig *filter_config,
EncoderConfig *encoder_config, EncoderConfig *encoder_config,
@ -188,7 +189,7 @@ void process_video_thread(
const char *out_fname = arguments->out_fname.c_str(); const char *out_fname = arguments->out_fname.c_str();
#endif #endif
int result = process_video( *proc_ret = process_video(
in_fname, in_fname,
out_fname, out_fname,
log_level, log_level,
@ -203,10 +204,6 @@ void process_video_thread(
std::lock_guard<std::mutex> lock(proc_ctx_mutex); std::lock_guard<std::mutex> lock(proc_ctx_mutex);
proc_ctx->completed = true; proc_ctx->completed = true;
} }
if (result != 0) {
spdlog::error("Video processing failed with error code: {}", result);
}
} }
#ifdef _WIN32 #ifdef _WIN32
@ -503,9 +500,10 @@ int main(int argc, char **argv) {
filter_config.config.realesrgan.tta_mode = false; filter_config.config.realesrgan.tta_mode = false;
filter_config.config.realesrgan.scaling_factor = arguments.scaling_factor; filter_config.config.realesrgan.scaling_factor = arguments.scaling_factor;
#ifdef _WIN32 #ifdef _WIN32
filter_config.config.realesrgan.model_path = arguments.model_path.c_str(); filter_config.config.realesrgan.model_name = arguments.model_path.c_str();
#else #else
filter_config.config.realesrgan.model_path = arguments.model_path.c_str(); filter_config.config.realesrgan.model_name = arguments.model_path.c_str();
filter_config.config.realesrgan.model_name = "realesr-animevideov4";
#endif #endif
} }
@ -551,8 +549,15 @@ int main(int argc, char **argv) {
av_log_set_callback(newline_safe_ffmpeg_log_callback); av_log_set_callback(newline_safe_ffmpeg_log_callback);
// Create a thread for video processing // Create a thread for video processing
int proc_ret = 0;
std::thread processing_thread( std::thread processing_thread(
process_video_thread, &arguments, hw_device_type, &filter_config, &encoder_config, &proc_ctx process_video_thread,
&arguments,
&proc_ret,
hw_device_type,
&filter_config,
&encoder_config,
&proc_ctx
); );
spdlog::info("Press SPACE to pause/resume, 'q' to abort."); spdlog::info("Press SPACE to pause/resume, 'q' to abort.");
@ -663,17 +668,16 @@ int main(int argc, char **argv) {
} }
// Print final message based on processing result // Print final message based on processing result
bool aborted, completed; bool aborted;
{ {
std::lock_guard<std::mutex> lock(proc_ctx_mutex); std::lock_guard<std::mutex> lock(proc_ctx_mutex);
aborted = proc_ctx.abort; aborted = proc_ctx.abort;
completed = proc_ctx.completed;
} }
if (aborted) { if (aborted) {
spdlog::warn("Video processing aborted"); spdlog::warn("Video processing aborted");
return 2; return 2;
} else if (!completed) { } else if (proc_ret != 0) {
spdlog::error("Video processing failed"); spdlog::error("Video processing failed with error code {}", proc_ret);
return 1; return 1;
} else { } else {
spdlog::info("Video processed successfully"); spdlog::info("Video processed successfully");