Compare commits
No commits in common. "main" and "fix-flake" have entirely different histories.
9 changed files with 260 additions and 434 deletions
523
Cargo.lock
generated
523
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
11
Cargo.toml
11
Cargo.toml
|
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
name = "servicepoint-cli"
|
||||
description = "A command line interface for the ServicePoint display."
|
||||
version = "0.4.1"
|
||||
version = "0.4.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.80.0"
|
||||
publish = true
|
||||
|
|
@ -17,11 +17,14 @@ clap = { version = "4.5", features = ["derive"] }
|
|||
env_logger = "0.11"
|
||||
log = "0.4"
|
||||
scap = "0.0.8"
|
||||
image = "0.25"
|
||||
image = "0.25.5"
|
||||
fast_image_resize = { version = "5.1", features = ["image"] }
|
||||
tungstenite = "0.26"
|
||||
ffmpeg-next = "7.1"
|
||||
servicepoint = "0.15.1"
|
||||
ffmpeg-next = "7.1.0"
|
||||
|
||||
[dependencies.servicepoint]
|
||||
package = "servicepoint"
|
||||
version = "0.14.1"
|
||||
|
||||
[profile.release]
|
||||
lto = true # Enable link-time optimization
|
||||
|
|
|
|||
|
|
@ -21,9 +21,14 @@ If you have set your PATH to include the ~/.cargo/bin, you can now run `servicep
|
|||
## Running with nix
|
||||
|
||||
```shell
|
||||
# from CCCB Forgejo
|
||||
nix run git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git -- <args>
|
||||
|
||||
# from GitHub mirror
|
||||
nix run github:kaesaecracker/servicepoint-cli -- <args>
|
||||
```
|
||||
|
||||
|
||||
## Running a debug build
|
||||
|
||||
```shell
|
||||
|
|
|
|||
83
flake.lock
generated
83
flake.lock
generated
|
|
@ -1,40 +1,17 @@
|
|||
{
|
||||
"nodes": {
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"naersk",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1752475459,
|
||||
"narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763384566,
|
||||
"narHash": "sha256-r+wgI+WvNaSdxQmqaM58lVNvJYJ16zoq+tKN20cLst4=",
|
||||
"lastModified": 1745925850,
|
||||
"narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "naersk",
|
||||
"rev": "d4155d6ebb70fbe2314959842f744aa7cabbbf6a",
|
||||
"rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -45,11 +22,11 @@
|
|||
},
|
||||
"nix-filter": {
|
||||
"locked": {
|
||||
"lastModified": 1757882181,
|
||||
"narHash": "sha256-+cCxYIh2UNalTz364p+QYmWHs0P+6wDhiWR4jDIKQIU=",
|
||||
"lastModified": 1731533336,
|
||||
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
|
||||
"owner": "numtide",
|
||||
"repo": "nix-filter",
|
||||
"rev": "59c44d1909c72441144b93cf0f054be7fe764de5",
|
||||
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -60,16 +37,16 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1764677808,
|
||||
"narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=",
|
||||
"lastModified": 1746183838,
|
||||
"narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1aab89277eb2d87823d5b69bae631a2496cff57a",
|
||||
"rev": "bf3287dac860542719fe7554e21e686108716879",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.11",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -78,45 +55,7 @@
|
|||
"inputs": {
|
||||
"naersk": "naersk",
|
||||
"nix-filter": "nix-filter",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1752428706,
|
||||
"narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "591e3b7624be97e4443ea7b5542c191311aa141d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-lang",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762938485,
|
||||
"narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
34
flake.nix
34
flake.nix
|
|
@ -2,36 +2,23 @@
|
|||
description = "Flake for command line interface of the ServicePoint display.";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||
nix-filter.url = "github:numtide/nix-filter";
|
||||
naersk = {
|
||||
url = "github:nix-community/naersk";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
treefmt-nix = {
|
||||
url = "github:numtide/treefmt-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{
|
||||
inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
naersk,
|
||||
nix-filter,
|
||||
treefmt-nix,
|
||||
}:
|
||||
let
|
||||
lib = nixpkgs.lib;
|
||||
treefmt-config = {
|
||||
projectRootFile = "flake.nix";
|
||||
programs = {
|
||||
nixfmt.enable = true;
|
||||
keep-sorted.enable = true;
|
||||
rustfmt.enable = true;
|
||||
};
|
||||
};
|
||||
supported-systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
|
|
@ -44,7 +31,6 @@
|
|||
system:
|
||||
f rec {
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
treefmt-eval = treefmt-nix.lib.evalModule pkgs treefmt-config;
|
||||
inherit system;
|
||||
}
|
||||
);
|
||||
|
|
@ -56,7 +42,7 @@
|
|||
naersk' = pkgs.callPackage naersk { };
|
||||
in
|
||||
rec {
|
||||
servicepoint-cli = naersk'.buildPackage {
|
||||
servicepoint-cli = naersk'.buildPackage rec {
|
||||
src = nix-filter.lib.filter {
|
||||
root = ./.;
|
||||
include = [
|
||||
|
|
@ -77,7 +63,7 @@
|
|||
[
|
||||
xe
|
||||
xz
|
||||
ffmpeg_6-headless.dev
|
||||
ffmpeg-headless
|
||||
]
|
||||
++ lib.optionals pkgs.stdenv.isLinux (
|
||||
with pkgs;
|
||||
|
|
@ -94,14 +80,6 @@
|
|||
|
||||
legacyPackages = packages;
|
||||
|
||||
nixosModules.default = {
|
||||
nixpkgs.overlays = [ self.overlays.default ];
|
||||
};
|
||||
|
||||
overlays.default = final: prev: {
|
||||
servicepoint-cli = self.legacyPackages."${prev.system}".servicepoint-cli;
|
||||
};
|
||||
|
||||
devShells = forAllSystems (
|
||||
{
|
||||
pkgs,
|
||||
|
|
@ -128,12 +106,10 @@
|
|||
];
|
||||
LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath (builtins.concatMap (d: d.buildInputs) inputsFrom)}";
|
||||
RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
|
||||
RUST_LOG = "all";
|
||||
RUST_BACKTRACE = "1";
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
formatter = forAllSystems ({ treefmt-eval, ... }: treefmt-eval.config.build.wrapper);
|
||||
formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-rfc-style);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -164,7 +164,9 @@ impl ImageProcessingPipeline {
|
|||
let result = (width, height);
|
||||
trace!(
|
||||
"scaling {:?} to {:?} to fit {:?}",
|
||||
source, result, self.render_size
|
||||
source,
|
||||
result,
|
||||
self.render_size
|
||||
);
|
||||
result
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,8 +92,7 @@ fn pixels_video(
|
|||
) {
|
||||
ffmpeg::init().unwrap();
|
||||
|
||||
let mut ictx =
|
||||
ffmpeg::format::input(&options.file_name).expect("failed to open video input file");
|
||||
let mut ictx = ffmpeg::format::input(&options.file_name).expect("failed to open video input file");
|
||||
|
||||
let input = ictx
|
||||
.streams()
|
||||
|
|
@ -104,14 +103,12 @@ fn pixels_video(
|
|||
|
||||
let context_decoder = ffmpeg::codec::context::Context::from_parameters(input.parameters())
|
||||
.expect("could not extract video context from parameters");
|
||||
let mut decoder = context_decoder
|
||||
.decoder()
|
||||
.video()
|
||||
let mut decoder = context_decoder.decoder().video()
|
||||
.expect("failed to create decoder for video stream");
|
||||
|
||||
let src_width = decoder.width();
|
||||
let src_height = decoder.height();
|
||||
|
||||
|
||||
let mut scaler = ffmpeg::software::scaling::Context::get(
|
||||
decoder.format(),
|
||||
src_width,
|
||||
|
|
@ -120,8 +117,7 @@ fn pixels_video(
|
|||
src_width,
|
||||
src_height,
|
||||
ffmpeg::software::scaling::Flags::BILINEAR,
|
||||
)
|
||||
.expect("failed to create scaling context");
|
||||
).expect("failed to create scaling context");
|
||||
|
||||
let mut frame_index = 0;
|
||||
|
||||
|
|
@ -132,16 +128,14 @@ fn pixels_video(
|
|||
let mut decoded = ffmpeg::util::frame::video::Video::empty();
|
||||
let mut rgb_frame = ffmpeg::util::frame::video::Video::empty();
|
||||
while decoder.receive_frame(&mut decoded).is_ok() {
|
||||
scaler
|
||||
.run(&decoded, &mut rgb_frame)
|
||||
scaler.run(&decoded, &mut rgb_frame)
|
||||
.expect("failed to scale frame");
|
||||
|
||||
let image = RgbImage::from_raw(src_width, src_height, rgb_frame.data(0).to_owned())
|
||||
.expect("could not read rgb data to image");
|
||||
let image = DynamicImage::from(image);
|
||||
let bitmap = processing_pipeline.process(image);
|
||||
connection
|
||||
.send_command(BitmapCommand::from(bitmap))
|
||||
let bitmap= processing_pipeline.process(image);
|
||||
connection.send_command(BitmapCommand::from(bitmap))
|
||||
.expect("failed to send image command");
|
||||
|
||||
frame_index += 1;
|
||||
|
|
@ -151,13 +145,13 @@ fn pixels_video(
|
|||
|
||||
for (stream, packet) in ictx.packets() {
|
||||
if stream.index() == video_stream_index {
|
||||
decoder
|
||||
.send_packet(&packet)
|
||||
decoder.send_packet(&packet)
|
||||
.expect("failed to send video packet");
|
||||
receive_and_process_decoded_frames(&mut decoder)
|
||||
.expect("failed to process video packet");
|
||||
}
|
||||
}
|
||||
decoder.send_eof().expect("failed to send eof");
|
||||
receive_and_process_decoded_frames(&mut decoder).expect("failed to eof packet");
|
||||
receive_and_process_decoded_frames(&mut decoder)
|
||||
.expect("failed to eof packet");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@ use servicepoint::*;
|
|||
use std::thread::sleep;
|
||||
|
||||
pub(crate) fn stream_stdin(connection: &Transport, slow: bool) {
|
||||
warn!(
|
||||
"This mode will break when using multi-byte characters and does not support ANSI escape sequences yet."
|
||||
);
|
||||
warn!("This mode will break when using multi-byte characters and does not support ANSI escape sequences yet.");
|
||||
let mut app = App {
|
||||
connection,
|
||||
mirror: CharGrid::new(TILE_WIDTH, TILE_HEIGHT),
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ use image::{DynamicImage, ImageBuffer, Rgb, Rgba};
|
|||
use log::{debug, error, info, trace, warn};
|
||||
use scap::{
|
||||
capturer::{Capturer, Options},
|
||||
frame::Frame,
|
||||
frame::convert_bgra_to_rgb,
|
||||
frame::Frame,
|
||||
};
|
||||
use servicepoint::{BitmapCommand, CompressionCode, FRAME_PACING, Origin};
|
||||
use servicepoint::{BitmapCommand, CompressionCode, Origin, FRAME_PACING};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
pub fn stream_window(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue