mirror of
https://github.com/k4yt3x/video2x.git
synced 2026-02-17 11:30:37 +08:00
Compare commits
7 Commits
6.0.0-beta
...
6.0.0-beta
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ebd5e8eb3d | ||
|
|
50d5cb16d1 | ||
|
|
8eac1a7393 | ||
|
|
f0f3166d92 | ||
|
|
482e82f9c4 | ||
|
|
58ea9e4b35 | ||
|
|
e077849a2c |
10
.github/FUNDING.yml
vendored
10
.github/FUNDING.yml
vendored
@@ -1,12 +1,2 @@
|
|||||||
# These are supported funding model platforms
|
|
||||||
|
|
||||||
github: k4yt3x
|
github: k4yt3x
|
||||||
patreon: k4yt3x
|
patreon: k4yt3x
|
||||||
open_collective: # Replace with a single Open Collective username
|
|
||||||
ko_fi: # Replace with a single Ko-fi username
|
|
||||||
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
|
||||||
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
|
||||||
liberapay: # Replace with a single Liberapay username
|
|
||||||
issuehunt: # Replace with a single IssueHunt username
|
|
||||||
otechie: # Replace with a single Otechie username
|
|
||||||
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
|
|
||||||
|
|||||||
@@ -28,6 +28,13 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release")
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Set global compile options for all targets
|
||||||
|
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
|
||||||
|
add_compile_options(/W4 /permissive-)
|
||||||
|
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
|
add_compile_options(-Wall -Wextra -Wpedantic -Wconversion -Wshadow)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Build options
|
# Build options
|
||||||
option(BUILD_SHARED_LIBS "Build libvideo2x as a shared library" ON)
|
option(BUILD_SHARED_LIBS "Build libvideo2x as a shared library" ON)
|
||||||
option(BUILD_VIDEO2X_CLI "Build the video2x executable" ON)
|
option(BUILD_VIDEO2X_CLI "Build the video2x executable" ON)
|
||||||
@@ -115,7 +122,6 @@ else()
|
|||||||
|
|
||||||
# OpenCV
|
# OpenCV
|
||||||
if (USE_SYSTEM_OPENCV)
|
if (USE_SYSTEM_OPENCV)
|
||||||
cmake_policy(SET CMP0146 OLD)
|
|
||||||
find_package(OpenCV REQUIRED)
|
find_package(OpenCV REQUIRED)
|
||||||
list(APPEND ALL_INCLUDE_DIRS ${OpenCV_INCLUDE_DIRS}/opencv2)
|
list(APPEND ALL_INCLUDE_DIRS ${OpenCV_INCLUDE_DIRS}/opencv2)
|
||||||
list(APPEND ALL_LIBRARIES opencv_core opencv_videoio)
|
list(APPEND ALL_LIBRARIES opencv_core opencv_videoio)
|
||||||
@@ -308,7 +314,6 @@ target_include_directories(libvideo2x PRIVATE
|
|||||||
|
|
||||||
# Compile options for the shared library
|
# Compile options for the shared library
|
||||||
target_compile_options(libvideo2x PRIVATE
|
target_compile_options(libvideo2x PRIVATE
|
||||||
-Wall
|
|
||||||
-fPIC
|
-fPIC
|
||||||
$<$<CONFIG:Release>:-Ofast>
|
$<$<CONFIG:Release>:-Ofast>
|
||||||
$<$<CONFIG:Debug>:-g -DDEBUG>
|
$<$<CONFIG:Debug>:-g -DDEBUG>
|
||||||
@@ -345,10 +350,7 @@ if (BUILD_VIDEO2X_CLI)
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Compile options for the executable
|
# Compile options for the executable
|
||||||
target_compile_options(video2x PRIVATE
|
target_compile_options(video2x PRIVATE $<$<CONFIG:Debug>:-g -DDEBUG>)
|
||||||
-Wall
|
|
||||||
$<$<CONFIG:Debug>:-g -DDEBUG>
|
|
||||||
)
|
|
||||||
|
|
||||||
# Link the executable with the shared library
|
# Link the executable with the shared library
|
||||||
target_link_libraries(video2x PRIVATE ${ALL_LIBRARIES} libvideo2x)
|
target_link_libraries(video2x PRIVATE ${ALL_LIBRARIES} libvideo2x)
|
||||||
|
|||||||
@@ -13,9 +13,9 @@
|
|||||||
|
|
||||||
## 🌟 Version 6.0.0 Preview
|
## 🌟 Version 6.0.0 Preview
|
||||||
|
|
||||||
**[Direct download link for Windows (Installer)](https://github.com/k4yt3x/video2x/releases/download/6.0.0-beta.3/video2x-qt6-windows-amd64-installer.exe)**
|
**[Direct download link for Windows (Installer)](https://github.com/k4yt3x/video2x/releases/download/6.0.0-beta.4/video2x-qt6-windows-amd64-installer.exe)**
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
Version 6.0.0 is a complete rewrite of this project in C/C++. It:
|
Version 6.0.0 is a complete rewrite of this project in C/C++. It:
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ class LibplaceboFilter : public Filter {
|
|||||||
LibplaceboFilter(int width, int height, const std::filesystem::path &shader_path);
|
LibplaceboFilter(int width, int height, const std::filesystem::path &shader_path);
|
||||||
|
|
||||||
// Destructor
|
// Destructor
|
||||||
virtual ~LibplaceboFilter();
|
virtual ~LibplaceboFilter() override;
|
||||||
|
|
||||||
// Initializes the filter with decoder and encoder contexts
|
// Initializes the filter with decoder and encoder contexts
|
||||||
int init(AVCodecContext *dec_ctx, AVCodecContext *enc_ctx, AVBufferRef *hw_ctx) override;
|
int init(AVCodecContext *dec_ctx, AVCodecContext *enc_ctx, AVBufferRef *hw_ctx) override;
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ class RealesrganFilter : public Filter {
|
|||||||
);
|
);
|
||||||
|
|
||||||
// Destructor
|
// Destructor
|
||||||
virtual ~RealesrganFilter();
|
virtual ~RealesrganFilter() override;
|
||||||
|
|
||||||
// Initializes the filter with decoder and encoder contexts
|
// Initializes the filter with decoder and encoder contexts
|
||||||
int init(AVCodecContext *dec_ctx, AVCodecContext *enc_ctx, AVBufferRef *hw_ctx) override;
|
int init(AVCodecContext *dec_ctx, AVCodecContext *enc_ctx, AVBufferRef *hw_ctx) override;
|
||||||
|
|||||||
2585
models/libplacebo/anime4k-a+a.glsl
Normal file
2585
models/libplacebo/anime4k-a+a.glsl
Normal file
File diff suppressed because it is too large
Load Diff
2585
models/libplacebo/anime4k-b+b.glsl
Normal file
2585
models/libplacebo/anime4k-b+b.glsl
Normal file
File diff suppressed because it is too large
Load Diff
2309
models/libplacebo/anime4k-b.glsl
Normal file
2309
models/libplacebo/anime4k-b.glsl
Normal file
File diff suppressed because it is too large
Load Diff
1711
models/libplacebo/anime4k-c+a.glsl
Normal file
1711
models/libplacebo/anime4k-c+a.glsl
Normal file
File diff suppressed because it is too large
Load Diff
1435
models/libplacebo/anime4k-c.glsl
Normal file
1435
models/libplacebo/anime4k-c.glsl
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,46 +0,0 @@
|
|||||||
#!/usr/bin/python
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
import shutil
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
import requests
|
|
||||||
|
|
||||||
ANIME4K_COMMIT = "master"
|
|
||||||
GITHUB_GLSL_ROOT = (
|
|
||||||
f"https://raw.githubusercontent.com/bloc97/Anime4K/{ANIME4K_COMMIT}/glsl"
|
|
||||||
)
|
|
||||||
SHADERS_DIR = Path(__file__).parent.parent / "data"
|
|
||||||
|
|
||||||
|
|
||||||
def download_and_combine_files():
|
|
||||||
|
|
||||||
modes = {
|
|
||||||
"ModeA": [
|
|
||||||
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Clamp_Highlights.glsl",
|
|
||||||
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Restore_CNN_VL.glsl",
|
|
||||||
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_Upscale_CNN_x2_VL.glsl",
|
|
||||||
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x2.glsl",
|
|
||||||
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x4.glsl",
|
|
||||||
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_Upscale_CNN_x2_M.glsl",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
for mode in modes:
|
|
||||||
file_contents = ""
|
|
||||||
for file in modes[mode]:
|
|
||||||
response = requests.get(file, timeout=5)
|
|
||||||
response.raise_for_status()
|
|
||||||
file_contents += response.text + "\n"
|
|
||||||
|
|
||||||
with (SHADERS_DIR / Path(f"Anime4K_{mode}.glsl")).open("w") as output_file:
|
|
||||||
output_file.write(file_contents)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
# clear shaders directory
|
|
||||||
if SHADERS_DIR.exists():
|
|
||||||
shutil.rmtree(SHADERS_DIR)
|
|
||||||
SHADERS_DIR.mkdir(exist_ok=True)
|
|
||||||
|
|
||||||
# download and combine shaders
|
|
||||||
download_and_combine_files()
|
|
||||||
86
scripts/download_merge_anime4k_glsl.py
Executable file
86
scripts/download_merge_anime4k_glsl.py
Executable file
@@ -0,0 +1,86 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
import shutil
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
import requests
|
||||||
|
|
||||||
|
ANIME4K_COMMIT = "master"
|
||||||
|
GITHUB_GLSL_ROOT = (
|
||||||
|
f"https://raw.githubusercontent.com/bloc97/Anime4K/{ANIME4K_COMMIT}/glsl"
|
||||||
|
)
|
||||||
|
SHADERS_DIR = Path(__file__).parent.parent / "models" / "libplacebo"
|
||||||
|
|
||||||
|
|
||||||
|
def download_and_combine_files():
|
||||||
|
modes = {
|
||||||
|
"a": [
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Clamp_Highlights.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Restore_CNN_VL.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_Upscale_CNN_x2_VL.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x2.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x4.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_Upscale_CNN_x2_M.glsl",
|
||||||
|
],
|
||||||
|
"b": [
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Clamp_Highlights.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Restore_CNN_Soft_VL.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_Upscale_CNN_x2_VL.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x2.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x4.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_Upscale_CNN_x2_M.glsl",
|
||||||
|
],
|
||||||
|
"c": [
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Clamp_Highlights.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale+Denoise/Anime4K_Upscale_Denoise_CNN_x2_VL.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x2.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x4.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_Upscale_CNN_x2_M.glsl",
|
||||||
|
],
|
||||||
|
"a+a": [
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Clamp_Highlights.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Restore_CNN_VL.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_Upscale_CNN_x2_VL.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Restore_CNN_M.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x2.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x4.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_Upscale_CNN_x2_M.glsl",
|
||||||
|
],
|
||||||
|
"b+b": [
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Clamp_Highlights.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Restore_CNN_Soft_VL.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_Upscale_CNN_x2_VL.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x2.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x4.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Restore_CNN_Soft_M.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_Upscale_CNN_x2_M.glsl",
|
||||||
|
],
|
||||||
|
"c+a": [
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Clamp_Highlights.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale+Denoise/Anime4K_Upscale_Denoise_CNN_x2_VL.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x2.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_AutoDownscalePre_x4.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Restore/Anime4K_Restore_CNN_M.glsl",
|
||||||
|
f"{GITHUB_GLSL_ROOT}/Upscale/Anime4K_Upscale_CNN_x2_M.glsl",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
||||||
|
for mode in modes:
|
||||||
|
file_contents = ""
|
||||||
|
for file in modes[mode]:
|
||||||
|
response = requests.get(file, timeout=5)
|
||||||
|
response.raise_for_status()
|
||||||
|
file_contents += response.text + "\n"
|
||||||
|
|
||||||
|
with (SHADERS_DIR / Path(f"anime4k-{mode}.glsl")).open("w") as output_file:
|
||||||
|
output_file.write(file_contents)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
# clear shaders directory
|
||||||
|
if SHADERS_DIR.exists():
|
||||||
|
shutil.rmtree(SHADERS_DIR)
|
||||||
|
SHADERS_DIR.mkdir(exist_ok=True)
|
||||||
|
|
||||||
|
# download and combine shaders
|
||||||
|
download_and_combine_files()
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
#include "conversions.h"
|
#include "conversions.h"
|
||||||
|
|
||||||
|
#include <cstddef>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
|
||||||
#include <spdlog/spdlog.h>
|
#include <spdlog/spdlog.h>
|
||||||
@@ -79,14 +80,16 @@ ncnn::Mat avframe_to_ncnn_mat(AVFrame *frame) {
|
|||||||
// Allocate a new ncnn::Mat and copy the data
|
// Allocate a new ncnn::Mat and copy the data
|
||||||
int width = converted_frame->width;
|
int width = converted_frame->width;
|
||||||
int height = converted_frame->height;
|
int height = converted_frame->height;
|
||||||
ncnn::Mat ncnn_image = ncnn::Mat(width, height, (size_t)3, 3); // BGR has 3 channels
|
ncnn::Mat ncnn_image = ncnn::Mat(width, height, static_cast<size_t>(3), 3);
|
||||||
|
|
||||||
// Manually copy the pixel data from AVFrame to the new ncnn::Mat
|
// Manually copy the pixel data from AVFrame to the new ncnn::Mat
|
||||||
const uint8_t *src_data = converted_frame->data[0];
|
const uint8_t *src_data = converted_frame->data[0];
|
||||||
for (int y = 0; y < height; y++) {
|
for (int y = 0; y < height; y++) {
|
||||||
uint8_t *dst_row = ncnn_image.row<uint8_t>(y);
|
uint8_t *dst_row = ncnn_image.row<uint8_t>(y);
|
||||||
const uint8_t *src_row = src_data + y * converted_frame->linesize[0];
|
const uint8_t *src_row = src_data + y * converted_frame->linesize[0];
|
||||||
memcpy(dst_row, src_row, width * 3); // Copy 3 channels (BGR) per pixel
|
|
||||||
|
// Copy 3 channels (BGR) per pixel
|
||||||
|
memcpy(dst_row, src_row, static_cast<size_t>(width) * 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If we allocated a converted frame, free it
|
// If we allocated a converted frame, free it
|
||||||
@@ -143,7 +146,9 @@ AVFrame *ncnn_mat_to_avframe(const ncnn::Mat &mat, AVPixelFormat pix_fmt) {
|
|||||||
for (int y = 0; y < mat.h; y++) {
|
for (int y = 0; y < mat.h; y++) {
|
||||||
uint8_t *dst_row = bgr_frame->data[0] + y * bgr_frame->linesize[0];
|
uint8_t *dst_row = bgr_frame->data[0] + y * bgr_frame->linesize[0];
|
||||||
const uint8_t *src_row = mat.row<const uint8_t>(y);
|
const uint8_t *src_row = mat.row<const uint8_t>(y);
|
||||||
memcpy(dst_row, src_row, mat.w * 3); // Copy 3 channels (BGR) per pixel
|
|
||||||
|
// Copy 3 channels (BGR) per pixel
|
||||||
|
memcpy(dst_row, src_row, static_cast<size_t>(mat.w) * 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Step 3: Convert the BGR frame to the desired pixel format
|
// Step 3: Convert the BGR frame to the desired pixel format
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
static enum AVPixelFormat hw_pix_fmt = AV_PIX_FMT_NONE;
|
static enum AVPixelFormat hw_pix_fmt = AV_PIX_FMT_NONE;
|
||||||
|
|
||||||
// Callback function to choose the hardware-accelerated pixel format
|
// Callback function to choose the hardware-accelerated pixel format
|
||||||
static enum AVPixelFormat get_hw_format(AVCodecContext *ctx, const enum AVPixelFormat *pix_fmts) {
|
static enum AVPixelFormat get_hw_format(AVCodecContext *_, const enum AVPixelFormat *pix_fmts) {
|
||||||
for (const enum AVPixelFormat *p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) {
|
for (const enum AVPixelFormat *p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) {
|
||||||
if (*p == hw_pix_fmt) {
|
if (*p == hw_pix_fmt) {
|
||||||
return *p;
|
return *p;
|
||||||
@@ -55,7 +55,8 @@ int init_decoder(
|
|||||||
const AVCodec *decoder = avcodec_find_decoder(video_stream->codecpar->codec_id);
|
const AVCodec *decoder = avcodec_find_decoder(video_stream->codecpar->codec_id);
|
||||||
if (!decoder) {
|
if (!decoder) {
|
||||||
spdlog::error(
|
spdlog::error(
|
||||||
"Failed to find decoder for codec ID {}", (int)video_stream->codecpar->codec_id
|
"Failed to find decoder for codec ID {}",
|
||||||
|
static_cast<int>(video_stream->codecpar->codec_id)
|
||||||
);
|
);
|
||||||
return AVERROR_DECODER_NOT_FOUND;
|
return AVERROR_DECODER_NOT_FOUND;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ int init_encoder(
|
|||||||
|
|
||||||
// Set the CRF and preset for any codecs that support it
|
// Set the CRF and preset for any codecs that support it
|
||||||
char crf_str[16];
|
char crf_str[16];
|
||||||
snprintf(crf_str, sizeof(crf_str), "%.f", encoder_config->crf);
|
snprintf(crf_str, sizeof(crf_str), "%.f", static_cast<double>(encoder_config->crf));
|
||||||
av_opt_set(codec_ctx->priv_data, "crf", crf_str, 0);
|
av_opt_set(codec_ctx->priv_data, "crf", crf_str, 0);
|
||||||
av_opt_set(codec_ctx->priv_data, "preset", encoder_config->preset, 0);
|
av_opt_set(codec_ctx->priv_data, "preset", encoder_config->preset, 0);
|
||||||
|
|
||||||
@@ -116,7 +116,8 @@ int init_encoder(
|
|||||||
|
|
||||||
if (encoder_config->copy_streams) {
|
if (encoder_config->copy_streams) {
|
||||||
// Allocate the stream map
|
// Allocate the stream map
|
||||||
*stream_map = (int *)av_malloc_array(ifmt_ctx->nb_streams, sizeof(**stream_map));
|
*stream_map =
|
||||||
|
reinterpret_cast<int *>(av_malloc_array(ifmt_ctx->nb_streams, sizeof(**stream_map)));
|
||||||
if (!*stream_map) {
|
if (!*stream_map) {
|
||||||
spdlog::error("Could not allocate stream mapping");
|
spdlog::error("Could not allocate stream mapping");
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
@@ -126,7 +127,7 @@ int init_encoder(
|
|||||||
(*stream_map)[vstream_idx] = stream_index++;
|
(*stream_map)[vstream_idx] = stream_index++;
|
||||||
|
|
||||||
// Loop through each stream in the input file
|
// Loop through each stream in the input file
|
||||||
for (int i = 0; i < ifmt_ctx->nb_streams; i++) {
|
for (int i = 0; i < static_cast<int>(ifmt_ctx->nb_streams); i++) {
|
||||||
AVStream *in_stream = ifmt_ctx->streams[i];
|
AVStream *in_stream = ifmt_ctx->streams[i];
|
||||||
AVCodecParameters *in_codecpar = in_stream->codecpar;
|
AVCodecParameters *in_codecpar = in_stream->codecpar;
|
||||||
|
|
||||||
@@ -142,21 +143,21 @@ int init_encoder(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create corresponding output stream
|
// Create corresponding output stream
|
||||||
AVStream *out_stream = avformat_new_stream(fmt_ctx, NULL);
|
AVStream *out_copied_stream = avformat_new_stream(fmt_ctx, NULL);
|
||||||
if (!out_stream) {
|
if (!out_copied_stream) {
|
||||||
spdlog::error("Failed allocating output stream");
|
spdlog::error("Failed allocating output stream");
|
||||||
return AVERROR_UNKNOWN;
|
return AVERROR_UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = avcodec_parameters_copy(out_stream->codecpar, in_codecpar);
|
ret = avcodec_parameters_copy(out_copied_stream->codecpar, in_codecpar);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
spdlog::error("Failed to copy codec parameters");
|
spdlog::error("Failed to copy codec parameters");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
out_stream->codecpar->codec_tag = 0;
|
out_copied_stream->codecpar->codec_tag = 0;
|
||||||
|
|
||||||
// Copy time base
|
// Copy time base
|
||||||
out_stream->time_base = in_stream->time_base;
|
out_copied_stream->time_base = in_stream->time_base;
|
||||||
|
|
||||||
(*stream_map)[i] = stream_index++;
|
(*stream_map)[i] = stream_index++;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
#include <spdlog/spdlog.h>
|
#include <spdlog/spdlog.h>
|
||||||
|
|
||||||
#if _WIN32
|
#if _WIN32
|
||||||
std::filesystem::path get_executable_directory() {
|
static std::filesystem::path get_executable_directory() {
|
||||||
std::vector<wchar_t> filepath(MAX_PATH);
|
std::vector<wchar_t> filepath(MAX_PATH);
|
||||||
|
|
||||||
// Get the executable path, expanding the buffer if necessary
|
// Get the executable path, expanding the buffer if necessary
|
||||||
@@ -36,7 +36,7 @@ std::filesystem::path get_executable_directory() {
|
|||||||
return execpath.parent_path();
|
return execpath.parent_path();
|
||||||
}
|
}
|
||||||
#else // _WIN32
|
#else // _WIN32
|
||||||
std::filesystem::path get_executable_directory() {
|
static std::filesystem::path get_executable_directory() {
|
||||||
std::error_code ec;
|
std::error_code ec;
|
||||||
std::filesystem::path filepath = std::filesystem::read_symlink("/proc/self/exe", ec);
|
std::filesystem::path filepath = std::filesystem::read_symlink("/proc/self/exe", ec);
|
||||||
|
|
||||||
|
|||||||
@@ -42,8 +42,9 @@ int LibplaceboFilter::init(AVCodecContext *dec_ctx, AVCodecContext *enc_ctx, AVB
|
|||||||
shader_full_path = shader_path;
|
shader_full_path = shader_path;
|
||||||
} else {
|
} else {
|
||||||
// Construct the fallback path using std::filesystem
|
// Construct the fallback path using std::filesystem
|
||||||
shader_full_path =
|
shader_full_path = find_resource_file(
|
||||||
find_resource_file(std::filesystem::path("models") / (shader_path.string() + ".glsl"));
|
std::filesystem::path("models") / "libplacebo" / (shader_path.string() + ".glsl")
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if the shader file exists
|
// Check if the shader file exists
|
||||||
@@ -56,7 +57,8 @@ int LibplaceboFilter::init(AVCodecContext *dec_ctx, AVCodecContext *enc_ctx, AVB
|
|||||||
in_time_base = dec_ctx->time_base;
|
in_time_base = dec_ctx->time_base;
|
||||||
out_time_base = enc_ctx->time_base;
|
out_time_base = enc_ctx->time_base;
|
||||||
|
|
||||||
return init_libplacebo(
|
// Initialize the libplacebo filter
|
||||||
|
int ret = init_libplacebo(
|
||||||
hw_ctx,
|
hw_ctx,
|
||||||
&filter_graph,
|
&filter_graph,
|
||||||
&buffersrc_ctx,
|
&buffersrc_ctx,
|
||||||
@@ -66,6 +68,14 @@ int LibplaceboFilter::init(AVCodecContext *dec_ctx, AVCodecContext *enc_ctx, AVB
|
|||||||
out_height,
|
out_height,
|
||||||
shader_full_path
|
shader_full_path
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Set these resources to nullptr since they are already freed by `avfilter_graph_free`
|
||||||
|
if (ret < 0) {
|
||||||
|
buffersrc_ctx = nullptr;
|
||||||
|
buffersink_ctx = nullptr;
|
||||||
|
filter_graph = nullptr;
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int LibplaceboFilter::process_frame(AVFrame *in_frame, AVFrame **out_frame) {
|
int LibplaceboFilter::process_frame(AVFrame *in_frame, AVFrame **out_frame) {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <cstdint>
|
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
#include <spdlog/spdlog.h>
|
#include <spdlog/spdlog.h>
|
||||||
@@ -30,7 +29,7 @@
|
|||||||
* @param[in] benchmark Flag to enable benchmarking mode
|
* @param[in] benchmark Flag to enable benchmarking mode
|
||||||
* @return int 0 on success, negative value on error
|
* @return int 0 on success, negative value on error
|
||||||
*/
|
*/
|
||||||
int process_frames(
|
static int process_frames(
|
||||||
EncoderConfig *encoder_config,
|
EncoderConfig *encoder_config,
|
||||||
VideoProcessingContext *proc_ctx,
|
VideoProcessingContext *proc_ctx,
|
||||||
AVFormatContext *ifmt_ctx,
|
AVFormatContext *ifmt_ctx,
|
||||||
@@ -54,7 +53,7 @@ int process_frames(
|
|||||||
spdlog::error("Failed to open video file with OpenCV");
|
spdlog::error("Failed to open video file with OpenCV");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
proc_ctx->total_frames = cap.get(cv::CAP_PROP_FRAME_COUNT);
|
proc_ctx->total_frames = static_cast<int64_t>(cap.get(cv::CAP_PROP_FRAME_COUNT));
|
||||||
cap.release();
|
cap.release();
|
||||||
|
|
||||||
// Check if the total number of frames is still 0
|
// Check if the total number of frames is still 0
|
||||||
@@ -208,7 +207,7 @@ end:
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Cleanup resources after processing the video
|
// Cleanup resources after processing the video
|
||||||
void cleanup(
|
static void cleanup(
|
||||||
AVFormatContext *ifmt_ctx,
|
AVFormatContext *ifmt_ctx,
|
||||||
AVFormatContext *ofmt_ctx,
|
AVFormatContext *ofmt_ctx,
|
||||||
AVCodecContext *dec_ctx,
|
AVCodecContext *dec_ctx,
|
||||||
@@ -219,27 +218,35 @@ void cleanup(
|
|||||||
) {
|
) {
|
||||||
if (ifmt_ctx) {
|
if (ifmt_ctx) {
|
||||||
avformat_close_input(&ifmt_ctx);
|
avformat_close_input(&ifmt_ctx);
|
||||||
|
ifmt_ctx = nullptr;
|
||||||
}
|
}
|
||||||
if (ofmt_ctx && !(ofmt_ctx->oformat->flags & AVFMT_NOFILE)) {
|
if (ofmt_ctx && !(ofmt_ctx->oformat->flags & AVFMT_NOFILE)) {
|
||||||
avio_closep(&ofmt_ctx->pb);
|
avio_closep(&ofmt_ctx->pb);
|
||||||
|
ofmt_ctx->pb = nullptr;
|
||||||
}
|
}
|
||||||
if (ofmt_ctx) {
|
if (ofmt_ctx) {
|
||||||
avformat_free_context(ofmt_ctx);
|
avformat_free_context(ofmt_ctx);
|
||||||
|
ofmt_ctx = nullptr;
|
||||||
}
|
}
|
||||||
if (dec_ctx) {
|
if (dec_ctx) {
|
||||||
avcodec_free_context(&dec_ctx);
|
avcodec_free_context(&dec_ctx);
|
||||||
|
dec_ctx = nullptr;
|
||||||
}
|
}
|
||||||
if (enc_ctx) {
|
if (enc_ctx) {
|
||||||
avcodec_free_context(&enc_ctx);
|
avcodec_free_context(&enc_ctx);
|
||||||
|
enc_ctx = nullptr;
|
||||||
}
|
}
|
||||||
if (hw_ctx) {
|
if (hw_ctx) {
|
||||||
av_buffer_unref(&hw_ctx);
|
av_buffer_unref(&hw_ctx);
|
||||||
|
hw_ctx = nullptr;
|
||||||
}
|
}
|
||||||
if (stream_map) {
|
if (stream_map) {
|
||||||
av_free(stream_map);
|
av_free(stream_map);
|
||||||
|
stream_map = nullptr;
|
||||||
}
|
}
|
||||||
if (filter) {
|
if (filter) {
|
||||||
delete filter;
|
delete filter;
|
||||||
|
filter = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -343,6 +350,11 @@ extern "C" int process_video(
|
|||||||
// Calculate the output dimensions based on the scaling factor
|
// Calculate the output dimensions based on the scaling factor
|
||||||
output_width = dec_ctx->width * filter_config->config.realesrgan.scaling_factor;
|
output_width = dec_ctx->width * filter_config->config.realesrgan.scaling_factor;
|
||||||
output_height = dec_ctx->height * filter_config->config.realesrgan.scaling_factor;
|
output_height = dec_ctx->height * filter_config->config.realesrgan.scaling_factor;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
spdlog::error("Unknown filter type");
|
||||||
|
cleanup(ifmt_ctx, ofmt_ctx, dec_ctx, enc_ctx, hw_ctx, stream_map, filter);
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
spdlog::info("Output video dimensions: {}x{}", output_width, output_height);
|
spdlog::info("Output video dimensions: {}x{}", output_width, output_height);
|
||||||
|
|
||||||
@@ -431,8 +443,7 @@ extern "C" int process_video(
|
|||||||
// Initialize the filter
|
// Initialize the filter
|
||||||
ret = filter->init(dec_ctx, enc_ctx, hw_ctx);
|
ret = filter->init(dec_ctx, enc_ctx, hw_ctx);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
av_strerror(ret, errbuf, sizeof(errbuf));
|
spdlog::error("Failed to initialize filter");
|
||||||
spdlog::error("Failed to initialize filter: {}", errbuf);
|
|
||||||
cleanup(ifmt_ctx, ofmt_ctx, dec_ctx, enc_ctx, hw_ctx, stream_map, filter);
|
cleanup(ifmt_ctx, ofmt_ctx, dec_ctx, enc_ctx, hw_ctx, stream_map, filter);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,16 +32,16 @@ RealesrganFilter::~RealesrganFilter() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int RealesrganFilter::init(AVCodecContext *dec_ctx, AVCodecContext *enc_ctx, AVBufferRef *hw_ctx) {
|
int RealesrganFilter::init(AVCodecContext *dec_ctx, AVCodecContext *enc_ctx, AVBufferRef *_) {
|
||||||
// Construct the model paths using std::filesystem
|
// Construct the model paths using std::filesystem
|
||||||
std::filesystem::path model_param_path;
|
std::filesystem::path model_param_path;
|
||||||
std::filesystem::path model_bin_path;
|
std::filesystem::path model_bin_path;
|
||||||
|
|
||||||
if (model) {
|
if (model) {
|
||||||
// Find the model paths by model name if provided
|
// Find the model paths by model name if provided
|
||||||
model_param_path = std::filesystem::path("models") /
|
model_param_path = std::filesystem::path("models") / "realesrgan" /
|
||||||
(std::string(model) + "-x" + std::to_string(scaling_factor) + ".param");
|
(std::string(model) + "-x" + std::to_string(scaling_factor) + ".param");
|
||||||
model_bin_path = std::filesystem::path("models") /
|
model_bin_path = std::filesystem::path("models") / "realesrgan" /
|
||||||
(std::string(model) + "-x" + std::to_string(scaling_factor) + ".bin");
|
(std::string(model) + "-x" + std::to_string(scaling_factor) + ".bin");
|
||||||
} else if (!custom_model_param_path.empty() && !custom_model_bin_path.empty()) {
|
} else if (!custom_model_param_path.empty() && !custom_model_bin_path.empty()) {
|
||||||
// Use the custom model paths if provided
|
// Use the custom model paths if provided
|
||||||
@@ -113,7 +113,7 @@ int RealesrganFilter::process_frame(AVFrame *in_frame, AVFrame **out_frame) {
|
|||||||
// Allocate space for ouptut ncnn::Mat
|
// Allocate space for ouptut ncnn::Mat
|
||||||
int output_width = in_mat.w * realesrgan->scale;
|
int output_width = in_mat.w * realesrgan->scale;
|
||||||
int output_height = in_mat.h * realesrgan->scale;
|
int output_height = in_mat.h * realesrgan->scale;
|
||||||
ncnn::Mat out_mat = ncnn::Mat(output_width, output_height, (size_t)3, 3);
|
ncnn::Mat out_mat = ncnn::Mat(output_width, output_height, static_cast<size_t>(3), 3);
|
||||||
|
|
||||||
ret = realesrgan->process(in_mat, out_mat);
|
ret = realesrgan->process(in_mat, out_mat);
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ void set_nonblocking_input(bool enable) {
|
|||||||
if (enable) {
|
if (enable) {
|
||||||
tcgetattr(STDIN_FILENO, &oldt);
|
tcgetattr(STDIN_FILENO, &oldt);
|
||||||
newt = oldt;
|
newt = oldt;
|
||||||
newt.c_lflag &= ~(ICANON | ECHO);
|
newt.c_lflag &= ~(tcflag_t)(ICANON | ECHO);
|
||||||
tcsetattr(STDIN_FILENO, TCSANOW, &newt);
|
tcsetattr(STDIN_FILENO, TCSANOW, &newt);
|
||||||
fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK);
|
fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK);
|
||||||
} else {
|
} else {
|
||||||
@@ -134,7 +134,9 @@ int is_valid_realesrgan_model(const char *model) {
|
|||||||
if (!model) {
|
if (!model) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
for (int i = 0; i < sizeof(valid_realesrgan_models) / sizeof(valid_realesrgan_models[0]); i++) {
|
for (unsigned long i = 0;
|
||||||
|
i < sizeof(valid_realesrgan_models) / sizeof(valid_realesrgan_models[0]);
|
||||||
|
i++) {
|
||||||
if (strcmp(model, valid_realesrgan_models[i]) == 0) {
|
if (strcmp(model, valid_realesrgan_models[i]) == 0) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -142,12 +144,11 @@ int is_valid_realesrgan_model(const char *model) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void print_help() {
|
void print_help(void) {
|
||||||
printf("Usage: video2x [OPTIONS]\n");
|
printf("Usage: video2x [OPTIONS]\n");
|
||||||
printf("\nOptions:\n");
|
printf("\nOptions:\n");
|
||||||
printf(
|
printf(" --loglevel Set log level \n");
|
||||||
" --loglevel Set log level (trace, debug, info, warn, error, critical, none)\n"
|
printf(" (trace, debug, info, warn, error, critical, none)\n");
|
||||||
);
|
|
||||||
printf(" --noprogress Do not display the progress bar\n");
|
printf(" --noprogress Do not display the progress bar\n");
|
||||||
printf(" -v, --version Print program version\n");
|
printf(" -v, --version Print program version\n");
|
||||||
printf(" -?, --help Display this help page\n");
|
printf(" -?, --help Display this help page\n");
|
||||||
@@ -167,7 +168,9 @@ void print_help() {
|
|||||||
printf(" -q, --crf Constant Rate Factor (default: 20.0)\n");
|
printf(" -q, --crf Constant Rate Factor (default: 20.0)\n");
|
||||||
|
|
||||||
printf("\nlibplacebo Options:\n");
|
printf("\nlibplacebo Options:\n");
|
||||||
printf(" -s, --shader Name or path to custom GLSL shader file\n");
|
printf(" -s, --shader Name or path of the GLSL shader file to use \n");
|
||||||
|
printf(" (built-in: 'anime4k-a', 'anime4k-b', 'anime4k-c',\n");
|
||||||
|
printf(" 'anime4k-a+a', 'anime4k-b+b', 'anime4k-c+a')\n");
|
||||||
printf(" -w, --width Output width\n");
|
printf(" -w, --width Output width\n");
|
||||||
printf(" -h, --height Output height\n");
|
printf(" -h, --height Output height\n");
|
||||||
|
|
||||||
@@ -177,7 +180,7 @@ void print_help() {
|
|||||||
printf(" -r, --scale Scaling factor (2, 3, or 4)\n");
|
printf(" -r, --scale Scaling factor (2, 3, or 4)\n");
|
||||||
|
|
||||||
printf("\nExamples Usage:\n");
|
printf("\nExamples Usage:\n");
|
||||||
printf(" video2x -i in.mp4 -o out.mp4 -f libplacebo -s anime4k-mode-a -w 3840 -h 2160\n");
|
printf(" video2x -i in.mp4 -o out.mp4 -f libplacebo -s anime4k-a+a -w 3840 -h 2160\n");
|
||||||
printf(" video2x -i in.mp4 -o out.mp4 -f realesrgan -m realesr-animevideov3 -r 4\n");
|
printf(" video2x -i in.mp4 -o out.mp4 -f realesrgan -m realesr-animevideov3 -r 4\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -245,7 +248,7 @@ void parse_arguments(int argc, char **argv, struct arguments *arguments) {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'q':
|
case 'q':
|
||||||
arguments->crf = atof(optarg);
|
arguments->crf = (float)atof(optarg);
|
||||||
if (arguments->crf < 0.0 || arguments->crf > 51.0) {
|
if (arguments->crf < 0.0 || arguments->crf > 51.0) {
|
||||||
fprintf(stderr, "Error: CRF must be between 0 and 51.\n");
|
fprintf(stderr, "Error: CRF must be between 0 and 51.\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
@@ -538,7 +541,7 @@ int main(int argc, char **argv) {
|
|||||||
proc_ctx.processed_frames,
|
proc_ctx.processed_frames,
|
||||||
proc_ctx.total_frames,
|
proc_ctx.total_frames,
|
||||||
proc_ctx.total_frames > 0
|
proc_ctx.total_frames > 0
|
||||||
? proc_ctx.processed_frames * 100.0 / proc_ctx.total_frames
|
? (double)proc_ctx.processed_frames * 100.0 / (double)proc_ctx.total_frames
|
||||||
: 0.0,
|
: 0.0,
|
||||||
time(NULL) - proc_ctx.start_time
|
time(NULL) - proc_ctx.start_time
|
||||||
);
|
);
|
||||||
@@ -578,7 +581,7 @@ int main(int argc, char **argv) {
|
|||||||
// Calculate statistics
|
// Calculate statistics
|
||||||
time_t time_elapsed = time(NULL) - proc_ctx.start_time;
|
time_t time_elapsed = time(NULL) - proc_ctx.start_time;
|
||||||
float average_speed_fps =
|
float average_speed_fps =
|
||||||
(float)proc_ctx.processed_frames / (time_elapsed > 0 ? time_elapsed : 1);
|
(float)proc_ctx.processed_frames / (time_elapsed > 0 ? (float)time_elapsed : 1);
|
||||||
|
|
||||||
// Print processing summary
|
// Print processing summary
|
||||||
printf("====== Video2X %s summary ======\n", arguments.benchmark ? "Benchmark" : "Processing");
|
printf("====== Video2X %s summary ======\n", arguments.benchmark ? "Benchmark" : "Processing");
|
||||||
|
|||||||
Reference in New Issue
Block a user