Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

don't remove underlying VideoStream file when doing save() #3883

Merged
merged 5 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## [Unreleased]

- Don't remove underlying VideoStream file when doing save() [#3883](https://github.com/MakieOrg/Makie.jl/pull/3883).
- Fix label/legend for plotlist [#4079](https://github.com/MakieOrg/Makie.jl/pull/4079).
- Fix wrong order for colors in RPRMakie [#4098](https://github.com/MakieOrg/Makie.jl/pull/4098).
- Fixed incorrect distance calculation in `pick_closest` in WGLMakie [#4082](https://github.com/MakieOrg/Makie.jl/pull/4082).
Expand Down
14 changes: 12 additions & 2 deletions CairoMakie/test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,25 @@ end
N = 3
points = Observable(Point2f[])
f, ax, pl = scatter(points, axis=(type=Axis, aspect=DataAspect(), limits=(0.4, N + 0.6, 0.4, N + 0.6),), figure=(size=(600, 800),))

vio = Makie.VideoStream(f; format="mp4", px_per_unit=2.0, backend=CairoMakie)
tmp_path = vio.path

@test vio.screen isa CairoMakie.Screen{CairoMakie.IMAGE}
@test size(vio.screen) == size(f.scene) .* 2
@test vio.screen.device_scaling_factor == 2.0

Makie.recordframe!(vio)
save("test.mp4", vio)
@test isfile("test.mp4") # Make sure no error etc
rm("test.mp4")
save("test_2.mkv", vio)
save("test_3.mp4", vio)
# make sure all files are correctly saved:
@test all(isfile, ["test.mp4", "test_2.mkv", "test_3.mp4"])
@test filesize("test.mp4") == filesize("test_3.mp4") > 3000
@test filesize("test.mp4") != filesize("test_2.mkv") > 3000
rm.(["test.mp4", "test_2.mkv", "test_3.mp4"])
finalize(vio); yield()
@test !isfile(tmp_path)
end

@testset "plotlist no ambiguity (#4038)" begin
Expand Down
9 changes: 6 additions & 3 deletions src/ffmpeg-util.jl
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
end


struct VideoStream
mutable struct VideoStream
io::Base.PipeEndpoint
process::Base.Process
screen::MakieScreen
Expand Down Expand Up @@ -229,7 +229,11 @@
vso = VideoStreamOptions(format, framerate, compression, profile, pixel_format, loop, loglevel, "pipe:0", true)
cmd = to_ffmpeg_cmd(vso, xdim, ydim)
process = open(`$(FFMPEG_jll.ffmpeg()) $cmd $path`, "w")
return VideoStream(process.in, process, screen, buffer, abspath(path), vso)
result = VideoStream(process.in, process, screen, buffer, abspath(path), vso)
finalizer(result) do x
@async rm(x.path; force=true)

Check warning on line 234 in src/ffmpeg-util.jl

View check run for this annotation

Codecov / codecov/patch

src/ffmpeg-util.jl#L232-L234

Added lines #L232 - L234 were not covered by tests
end
return result

Check warning on line 236 in src/ffmpeg-util.jl

View check run for this annotation

Codecov / codecov/patch

src/ffmpeg-util.jl#L236

Added line #L236 was not covered by tests
end

"""
Expand Down Expand Up @@ -267,7 +271,6 @@
else
cp(io.path, path; force=true)
end
rm(io.path)
return path
end

Expand Down
Loading