Kieran/zap-stream-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: bump egui-video

Browse Source
This commit is contained in:
kieran 2024-11-11 16:16:54 +00:00
parent 621686564d
commit 93e412a07c
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -1379,7 +1379,7 @@ dependencies = [
[[package]]
name = "egui-video"
version = "0.8.0"
source = "git+https://github.com/v0l/egui-video.git?rev=bb3f6b83ba3a0619b1b9de0d4da88acb7fafd257#bb3f6b83ba3a0619b1b9de0d4da88acb7fafd257"
source = "git+https://github.com/v0l/egui-video.git?rev=5e2167855822f9523aaab0fe58ec8b3d510d1996#5e2167855822f9523aaab0fe58ec8b3d510d1996"
dependencies = [
"anyhow",
"atomic",
@ -1604,7 +1604,7 @@ dependencies = [
[[package]]
name = "ffmpeg-rs-raw"
version = "0.1.0"
source = "git+https://git.v0l.io/Kieran/ffmpeg-rs-raw.git?rev=8b6166f1db18ffb322a5a634d6b6deaddb79ecbf#8b6166f1db18ffb322a5a634d6b6deaddb79ecbf"
source = "git+https://git.v0l.io/Kieran/ffmpeg-rs-raw.git?rev=90b98598e1fee6ddc52787c5c88924b52146b026#90b98598e1fee6ddc52787c5c88924b52146b026"
dependencies = [
"anyhow",
"ffmpeg-sys-the-third",

2
Cargo.toml
View File

@ -28,7 +28,7 @@ resvg = { version = "0.44.0", default-features = false }
serde = { version = "1.0.214", features = ["derive"] }
serde_with = { version = "3.11.0", features = ["hex"] }
egui-video = { git = "https://github.com/v0l/egui-video.git", rev = "bb3f6b83ba3a0619b1b9de0d4da88acb7fafd257" }
egui-video = { git = "https://github.com/v0l/egui-video.git", rev = "5e2167855822f9523aaab0fe58ec8b3d510d1996" }
#egui-video = { path = "../egui-video" }
[target.'cfg(not(target_os = "android"))'.dependencies]

11
android.sh
View File

@ -1,13 +1,18 @@
#!/bin/bash
git clone https://github.com/v0l/ffmpeg-kit.git
export ANDROID_SDK_ROOT=$ANDROID_HOME
#git clone https://github.com/v0l/ffmpeg-kit.git
#export ANDROID_SDK_ROOT=$ANDROID_HOME
#cd ffmpeg-kit && ./android.sh \
# --disable-x86 \
# --disable-x86-64 \
# --disable-arm-v7a \
# --disable-arm-v7a-neon \
# --enable-gpl \
# --enable-openssl \
# --enable-x264 \
# --enable-libwebp \
# --enable-libpng \
# --enable-android-media-codec \
# --api-level=28 \
# --no-ffmpeg-kit-protocols \
# --no-archive
@ -27,4 +32,4 @@ cp "$ANDROID_HOME/ndk/$NDK_VER/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr
cp "$ANDROID_HOME/ndk/$NDK_VER/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/$TRIPLET/35/libcamera2ndk.so" \
./target/x/release/android/$ARCH/cargo/$TRIPLET/release/deps
x build --arch $ARCH --platform $PLATFORM --verbose --release
x build --arch $ARCH --platform $PLATFORM --format apk --verbose --release

8
src/services/ffmpeg_loader.rs
View File

@ -13,7 +13,7 @@ impl FfmpegLoader {
}
pub fn load_image(&self, path: PathBuf) -> Result<ColorImage, Error> {
let demux = Demuxer::new(path.to_str().unwrap());
let demux = Demuxer::new(path.to_str().unwrap())?;
Self::load_image_from_demuxer(demux)
}
@ -22,7 +22,7 @@ impl FfmpegLoader {
key: &str,
data: &'static [u8],
) -> Result<ColorImage, Error> {
let demux = Demuxer::new_custom_io(data, Some(key.to_string()));
let demux = Demuxer::new_custom_io(data, Some(key.to_string()))?;
Self::load_image_from_demuxer(demux)
}
@ -45,8 +45,8 @@ impl FfmpegLoader {
loop {
let (mut pkt, stream) = demuxer.get_packet()?;
if (*stream).index as usize == bv.index {
let frames = decode.decode_pkt(pkt, stream)?;
if let Some((frame, _)) = frames.first() {
let frames = decode.decode_pkt(pkt)?;
if let Some(frame) = frames.first() {
let mut frame = get_frame_from_hw(*frame)?;
let frame_rgb = scaler.process_frame(
frame,