shweet/anm2ed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

windows moment

Browse Source
This commit is contained in:
shweet
2025-12-17 23:09:58 -05:00
parent 119bbc4081
commit 0ba585511c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/render.cpp
View File

@@ -16,8 +16,8 @@ using namespace glm;
namespace anm2ed namespace anm2ed
{ {
bool animation_render(const std::string& ffmpegPath, const std::string& path, std::vector<Texture>& frames, bool animation_render(const std::filesystem::path& ffmpegPath, const std::filesystem::path& path,
AudioStream& audioStream, render::Type type, ivec2 size, int fps) std::vector<Texture>& frames, AudioStream& audioStream, render::Type type, ivec2 size, int fps)
{ {
if (frames.empty() || size.x <= 0 || size.y <= 0 || fps <= 0 || ffmpegPath.empty() || path.empty()) return false; if (frames.empty() || size.x <= 0 || size.y <= 0 || fps <= 0 || ffmpegPath.empty() || path.empty()) return false;
@@ -38,7 +38,7 @@ namespace anm2ed
if (type != render::GIF && !audioStream.stream.empty() && audioStream.spec.freq > 0 && if (type != render::GIF && !audioStream.stream.empty() && audioStream.spec.freq > 0 &&
audioStream.spec.channels > 0) audioStream.spec.channels > 0)
{ {
audioPath = std::filesystem::temp_directory_path() / std::format("{}.f32", path); audioPath = std::filesystem::temp_directory_path() / std::format("{}.f32", path.string());
std::ofstream audioFile(audioPath, std::ios::binary); std::ofstream audioFile(audioPath, std::ios::binary);
@@ -71,8 +71,8 @@ namespace anm2ed
} }
} }
command = std::format("\"{0}\" -y -f rawvideo -pix_fmt rgba -s {1}x{2} -r {3} -i pipe:0", ffmpegPath, size.x, command = std::format("\"{0}\" -y -f rawvideo -pix_fmt rgba -s {1}x{2} -r {3} -i pipe:0", ffmpegPath.string(),
size.y, fps); size.x, size.y, fps);
if (!audioInputArguments.empty()) command += " " + audioInputArguments; if (!audioInputArguments.empty()) command += " " + audioInputArguments;
@@ -82,18 +82,18 @@ namespace anm2ed
command += command +=
" -lavfi \"split[s0][s1];[s0]palettegen=stats_mode=full[p];[s1][p]paletteuse=dither=floyd_steinberg\"" " -lavfi \"split[s0][s1];[s0]palettegen=stats_mode=full[p];[s1][p]paletteuse=dither=floyd_steinberg\""
" -loop 0"; " -loop 0";
command += std::format(" \"{}\"", path); command += std::format(" \"{}\"", path.string());
break; break;
case render::WEBM: case render::WEBM:
command += " -c:v libvpx-vp9 -crf 30 -b:v 0 -pix_fmt yuva420p -row-mt 1 -threads 0 -speed 2 -auto-alt-ref 0"; command += " -c:v libvpx-vp9 -crf 30 -b:v 0 -pix_fmt yuva420p -row-mt 1 -threads 0 -speed 2 -auto-alt-ref 0";
if (!audioOutputArguments.empty()) command += " " + audioOutputArguments; if (!audioOutputArguments.empty()) command += " " + audioOutputArguments;
command += std::format(" \"{}\"", path); command += std::format(" \"{}\"", path.string());
break; break;
case render::MP4: case render::MP4:
command += " -vf \"format=yuv420p,scale=trunc(iw/2)*2:trunc(ih/2)*2\" -c:v libx265 -crf 20 -preset slow" command += " -vf \"format=yuv420p,scale=trunc(iw/2)*2:trunc(ih/2)*2\" -c:v libx265 -crf 20 -preset slow"
" -tag:v hvc1 -movflags +faststart"; " -tag:v hvc1 -movflags +faststart";
if (!audioOutputArguments.empty()) command += " " + audioOutputArguments; if (!audioOutputArguments.empty()) command += " " + audioOutputArguments;
command += std::format(" \"{}\"", path); command += std::format(" \"{}\"", path.string());
break; break;
default: default:
return false; return false;

4
src/render.h
View File

@@ -36,6 +36,6 @@ namespace anm2ed::render
namespace anm2ed namespace anm2ed
{ {
std::filesystem::path ffmpeg_log_path(); std::filesystem::path ffmpeg_log_path();
bool animation_render(const std::string&, const std::string&, std::vector<resource::Texture>&, AudioStream&, bool animation_render(const std::filesystem::path&, const std::filesystem::path&, std::vector<resource::Texture>&,
render::Type, glm::ivec2, int); AudioStream&, render::Type, glm::ivec2, int);
} }