Skip to content

Commit

Permalink
update some var to const
Browse files Browse the repository at this point in the history
  • Loading branch information
dnjulek committed Nov 21, 2023
1 parent c24a247 commit 5c09e29
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 19 deletions.
4 changes: 2 additions & 2 deletions build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
.paths = .{""},
.dependencies = .{
.vapoursynth = .{
.url = "https://github.com/dnjulek/vapoursynth-zig/archive/refs/heads/main.tar.gz",
.hash = "1220c0d6693bb36620e36486150e357a6606a808fb4735af0d04f902ebfe19a37081",
.url = "https://github.com/dnjulek/vapoursynth-zig/archive/11809b4e8047c15fa5de10a3c3ae15d1546630ea.tar.gz",
.hash = "12208a2b305e3a3cfb509f56320d839d1a7706946ca2baa099088361a71e899461d6",
},
},
}
23 changes: 12 additions & 11 deletions src/chromanr.zig
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ const ChromanrData = struct {

export fn chromanrGetFrame(n: c_int, activation_reason: ar, instance_data: ?*anyopaque, frame_data: ?*?*anyopaque, frame_ctx: ?*vs.FrameContext, core: ?*vs.Core, vsapi: ?*const vs.API) callconv(.C) ?*const vs.Frame {
_ = frame_data;
var d: *ChromanrData = @ptrCast(@alignCast(instance_data));
const d: *ChromanrData = @ptrCast(@alignCast(instance_data));

if (activation_reason == ar.Initial) {
vsapi.?.requestFrameFilter.?(n, d.node, frame_ctx);
} else if (activation_reason == ar.AllFramesReady) {
const src = vsapi.?.getFrameFilter.?(n, d.node, frame_ctx);
var dst = vsapi.?.newVideoFrame.?(vsapi.?.getVideoFrameFormat.?(src), vsapi.?.getFrameWidth.?(src, 0), vsapi.?.getFrameHeight.?(src, 0), src, core);
var srcpy: [*]const u8 = vsapi.?.getReadPtr.?(src, 0);
var srcpu: [*]const u8 = vsapi.?.getReadPtr.?(src, 1);
var srcpv: [*]const u8 = vsapi.?.getReadPtr.?(src, 2);
const dst = vsapi.?.newVideoFrame.?(vsapi.?.getVideoFrameFormat.?(src), vsapi.?.getFrameWidth.?(src, 0), vsapi.?.getFrameHeight.?(src, 0), src, core);
const srcpy: [*]const u8 = vsapi.?.getReadPtr.?(src, 0);
const srcpu: [*]const u8 = vsapi.?.getReadPtr.?(src, 1);
const srcpv: [*]const u8 = vsapi.?.getReadPtr.?(src, 2);
var dstpy: [*]u8 = vsapi.?.getWritePtr.?(dst, 0);
var dstpu: [*]u8 = vsapi.?.getWritePtr.?(dst, 1);
var dstpv: [*]u8 = vsapi.?.getWritePtr.?(dst, 2);
const dstpu: [*]u8 = vsapi.?.getWritePtr.?(dst, 1);
const dstpv: [*]u8 = vsapi.?.getWritePtr.?(dst, 2);
const stridey: usize = @intCast(vsapi.?.getStride.?(src, 0));
const strideu: usize = @intCast(vsapi.?.getStride.?(src, 1));
const stridev: usize = @intCast(vsapi.?.getStride.?(src, 2));
Expand Down Expand Up @@ -125,7 +125,7 @@ export fn chromanrGetFrame(n: c_int, activation_reason: ar, instance_data: ?*any

export fn chromanrFree(instance_data: ?*anyopaque, core: ?*vs.Core, vsapi: ?*const vs.API) callconv(.C) void {
_ = core;
var d: *ChromanrData = @ptrCast(@alignCast(instance_data));
const d: *ChromanrData = @ptrCast(@alignCast(instance_data));
vsapi.?.freeNode.?(d.node);
allocator.destroy(d);
}
Expand Down Expand Up @@ -196,7 +196,7 @@ export fn chromanrCreate(in: ?*const vs.Map, out: ?*vs.Map, user_data: ?*anyopaq
d.steph = math.lossyCast(usize, _steph);
}

var distance = vsapi.?.mapGetInt.?(in, "distance", 0, &err);
const distance = vsapi.?.mapGetInt.?(in, "distance", 0, &err);
d.use_euclidean = (distance == 1);
if (err != 0) {
d.use_euclidean = false;
Expand Down Expand Up @@ -260,7 +260,7 @@ export fn chromanrCreate(in: ?*const vs.Map, out: ?*vs.Map, user_data: ?*anyopaq
return;
}

var data: *ChromanrData = allocator.create(ChromanrData) catch unreachable;
const data: *ChromanrData = allocator.create(ChromanrData) catch unreachable;
data.* = d;

var deps = [_]vs.FilterDependency{
Expand All @@ -269,7 +269,8 @@ export fn chromanrCreate(in: ?*const vs.Map, out: ?*vs.Map, user_data: ?*anyopaq
.requestPattern = rp.StrictSpatial,
},
};
vsapi.?.createVideoFilter.?(out, "chromanr", vi, chromanrGetFrame, chromanrFree, fm.Parallel, &deps, 1, data, core);

vsapi.?.createVideoFilter.?(out, "chromanr", vi, chromanrGetFrame, chromanrFree, fm.Parallel, &deps, deps.len, data, core);
}

export fn VapourSynthPluginInit2(plugin: *vs.Plugin, vspapi: *const vs.PLUGINAPI) void {
Expand Down
12 changes: 6 additions & 6 deletions src/int_process.zig
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ pub inline fn process(
var y: usize = 0;

while (y < h) : (y += 1) {
var in_yptr: [*]const T = @ptrCast(@alignCast(srcpy + ((stridey * y) << cssh)));
var in_uptr: [*]const T = @ptrCast(@alignCast(srcpu + strideu * y));
var in_vptr: [*]const T = @ptrCast(@alignCast(srcpv + stridev * y));
const in_yptr: [*]const T = @ptrCast(@alignCast(srcpy + ((stridey * y) << cssh)));
const in_uptr: [*]const T = @ptrCast(@alignCast(srcpu + strideu * y));
const in_vptr: [*]const T = @ptrCast(@alignCast(srcpv + stridev * y));
const yystart: usize = y -| sizeh;
const yystop: usize = @min(h - 1, y + sizeh);
x = 0;
Expand All @@ -54,9 +54,9 @@ pub inline fn process(
var yy = yystart;

while (yy <= yystop) : (yy += steph) {
var in_yptr2: [*]const T = @ptrCast(@alignCast(srcpy + ((stridey * yy) << cssh)));
var in_uptr2: [*]const T = @ptrCast(@alignCast(srcpu + strideu * yy));
var in_vptr2: [*]const T = @ptrCast(@alignCast(srcpv + stridev * yy));
const in_yptr2: [*]const T = @ptrCast(@alignCast(srcpy + ((stridey * yy) << cssh)));
const in_uptr2: [*]const T = @ptrCast(@alignCast(srcpu + strideu * yy));
const in_vptr2: [*]const T = @ptrCast(@alignCast(srcpv + stridev * yy));

var xx = xxstart;
while (xx <= xxstop) : (xx += stepw) {
Expand Down

0 comments on commit 5c09e29

Please sign in to comment.