modeco80/vncstream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some warning cleanup

Browse source
This commit is contained in:
Lily Tsuru 2024-10-14 21:58:02 -04:00
parent 2ecf9af167
commit 3c2d4cee6f
2 changed files with 54 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
server/src/video/encoder_thread.rs
View file

@ -1,8 +1,11 @@
use anyhow::Context;
use cudarc::{driver::{
use cudarc::{
driver::{
sys::{CUdeviceptr, CUmemorytype},
CudaDevice, CudaSlice, DevicePtr, LaunchAsync,
}, nvrtc::CompileOptions};
},
nvrtc::CompileOptions,
};
use letsplay_gpu::egl_helpers::DeviceContext;
use std::{
sync::{Arc, Mutex},
@ -281,7 +284,10 @@ fn encoder_thread_hwframe_main(
cuda_device.load_ptx(ptx, "module", &["flip_opengl"])?;
let mut memcpy = cudarc::driver::sys::CUDA_MEMCPY2D_st::default();
// setup basic src stuff
// setup the things that won't change about the cuda memcpy
// src
memcpy.srcXInBytes = 0;
memcpy.srcY = 0;
memcpy.srcMemoryType = CUmemorytype::CU_MEMORYTYPE_ARRAY;
@ -291,12 +297,14 @@ fn encoder_thread_hwframe_main(
memcpy.dstY = 0;
memcpy.dstMemoryType = CUmemorytype::CU_MEMORYTYPE_DEVICE;
// Temporary buffer used for opengl flip on the GPU
// Temporary buffer used for opengl flip on the GPU. We copy to this buffer,
// then copy the flipped version (using the launched support kernel) to the CUDA device memory ffmpeg
// allocated.
let mut temp_buffer: CudaSlice<u32> = cuda_device.alloc_zeros::<u32>(48).expect("over");
loop {
match rx.try_recv() {
Ok(msg) => match msg {
match rx.blocking_recv() {
Some(msg) => match msg {
EncodeThreadInput::Init { size } => {
frame_number = 0;
@ -318,9 +326,13 @@ fn encoder_thread_hwframe_main(
}
EncodeThreadInput::SendFrame => {
// copy gl frame *ON THE GPU*
// benchmarking
//use std::time::Instant;
//let start = Instant::now();
// copy gl frame *ON THE GPU* to ffmpeg frame
{
let mut gl_ctx = gl_context.lock().expect("you dumb fuck");
let gl_ctx = gl_context.lock().expect("you dumb fuck");
let mut gl_resource =
cuda_resource.lock().expect("couldnt lock GL resource!");
@ -351,11 +363,16 @@ fn encoder_thread_hwframe_main(
}
}
// copy to the temporary buffer and synchronize
unsafe {
cudarc::driver::sys::lib()
.cuMemcpy2DAsync_v2(&memcpy, std::ptr::null_mut())
.result()
.expect("cuMemcpy2D fail epic");
cudarc::driver::sys::lib()
.cuStreamSynchronize(std::ptr::null_mut())
.result()?;
}
// launch kernel to flip the opengl framebuffer right-side up
@ -369,9 +386,9 @@ fn encoder_thread_hwframe_main(
shared_mem_bytes: 0,
};
let flip_opengl = cuda_device
.get_func("module", "flip_opengl")
.expect("dumb fucker");
let flip_opengl = cuda_device.get_func("module", "flip_opengl").expect(
"for some reason we couldn't get the support kenrel function",
);
unsafe {
let frame_ptr = frame.as_mut_ptr();
@ -381,23 +398,24 @@ fn encoder_thread_hwframe_main(
(width * height) as usize * 4usize,
);
flip_opengl
.launch(
flip_opengl.launch(
launch_config,
(&mut temp_buffer, &mut slice, width, height),
)
.expect("I hate you");
)?;
// leak so it doesn't free the memory
// (the device pointer we convert into a slice is owned by ffmpeg, so we shouldn't be the ones
// trying to free it!)
let _ = slice.leak();
// Synchronize for the final time
cudarc::driver::sys::lib()
.cuStreamSynchronize(std::ptr::null_mut())
.result()
.expect("you banned");
// leak so it doesnt free the memory like a dumbass
let _ = slice.leak();
.result()?;
}
}
// FIXME: ideally this would work on-drop but it doesn't.
mapped.unmap().expect("fuck you asshole");
gl_ctx.release();
}
@ -416,16 +434,17 @@ fn encoder_thread_hwframe_main(
if force_keyframe {
force_keyframe = false;
}
//tracing::info!("encoding frame {frame_number} took {:2?}", start.elapsed());
}
},
Err(TryRecvError::Disconnected) => break,
Err(TryRecvError::Empty) => {
std::thread::sleep(Duration::from_millis(1));
}
None => break,
}
}
//std::thread::sleep(Duration::from_millis(1));
Ok(())
}

28
server/src/video/h264_encoder.rs
View file

@ -4,7 +4,7 @@ use anyhow::Context;
use cudarc::driver::CudaDevice;
use ffmpeg::error::EAGAIN;
use ffmpeg::{codec as lavc, packet}; // lavc
use ffmpeg::codec as lavc; // lavc
use crate::types::Size;
@ -129,7 +129,7 @@ impl H264Encoder {
max_framerate: u32,
bitrate: usize,
) -> anyhow::Result<Self> {
let (mut encoder, mut video_encoder_context) =
let (encoder, mut video_encoder_context) =
create_context_and_set_common_parameters("h264_nvenc", &size, max_framerate, bitrate)
.with_context(|| "while trying to create encoder")?;
@ -186,7 +186,7 @@ impl H264Encoder {
.build()
.with_context(|| "while trying to create CUDA frame context")?;
let (mut encoder, mut video_encoder_context) =
let (encoder, mut video_encoder_context) =
create_context_and_set_common_parameters("h264_nvenc", &size, max_framerate, bitrate)
.with_context(|| "while trying to create encoder")?;
@ -269,8 +269,6 @@ impl H264Encoder {
(*frame.as_mut_ptr()).height = encoder.height() as i32;
(*frame.as_mut_ptr()).hw_frames_ctx = hw_context.as_raw_mut();
//ffmpeg::sys::av_frame_get_buffer(frame.as_mut_ptr(), 32);
hw_context.get_buffer(&mut frame)?;
hw_context.get_buffer(&mut frame)?;
@ -280,13 +278,6 @@ impl H264Encoder {
}
}
}
/*
*/
todo!("FIXME");
}
pub fn send_frame(&mut self, frame: &ffmpeg::Frame) {
@ -296,16 +287,13 @@ impl H264Encoder {
}
Self::NvencSWFrame { encoder } => {
// Realistically this should be the same right?
encoder.send_frame(frame).unwrap();
//todo!("Requires support.");
}
Self::NvencHWFrame {
encoder,
hw_context,
hw_context: _,
} => {
//todo!("Implement send_frame() for NvencHWFrame");
encoder.send_frame(frame).unwrap();
}
}
@ -325,9 +313,9 @@ impl H264Encoder {
Self::NvencHWFrame {
encoder,
hw_context,
hw_context: _,
} => {
todo!("Implement send_eof() for NvencHWFrame");
encoder.send_eof().unwrap();
}
}
}
@ -336,11 +324,9 @@ impl H264Encoder {
return match self {
Self::Software { encoder } => encoder.receive_packet(packet),
Self::NvencSWFrame { encoder } => encoder.receive_packet(packet),
// this might work?
Self::NvencHWFrame {
encoder,
hw_context,
hw_context: _,
} => encoder.receive_packet(packet),
};
}