hwcodec uses one repository (#7701)

* update hwcodec, gpucodec repo is merged to hwcodec

Signed-off-by: 21pages <pages21@163.com>

* rename gpucodec.rs to vram.rs

Signed-off-by: 21pages <pages21@163.com>

* rename all gpucodec to vram, because vram is a feature of hwcodec

Signed-off-by: 21pages <pages21@163.com>

* use one check process and one config file

* set check encode image size to 720p

Signed-off-by: 21pages <pages21@163.com>

---------

Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2024-04-12 17:26:24 +08:00
committed by GitHub
parent d8875f381b
commit 98df2b111e
32 changed files with 330 additions and 478 deletions

View File

@@ -1038,9 +1038,9 @@ pub struct VideoHandler {
impl VideoHandler {
/// Create a new video handler.
pub fn new(format: CodecFormat, _display: usize) -> Self {
#[cfg(all(feature = "gpucodec", feature = "flutter"))]
#[cfg(all(feature = "vram", feature = "flutter"))]
let luid = crate::flutter::get_adapter_luid();
#[cfg(not(all(feature = "gpucodec", feature = "flutter")))]
#[cfg(not(all(feature = "vram", feature = "flutter")))]
let luid = Default::default();
log::info!("new video handler for display #{_display}, format: {format:?}, luid: {luid:?}");
VideoHandler {
@@ -1097,9 +1097,9 @@ impl VideoHandler {
/// Reset the decoder, change format if it is Some
pub fn reset(&mut self, format: Option<CodecFormat>) {
#[cfg(all(feature = "flutter", feature = "gpucodec"))]
#[cfg(all(feature = "flutter", feature = "vram"))]
let luid = crate::flutter::get_adapter_luid();
#[cfg(not(all(feature = "flutter", feature = "gpucodec")))]
#[cfg(not(all(feature = "flutter", feature = "vram")))]
let luid = None;
let format = format.unwrap_or(self.decoder.format());
self.decoder = Decoder::new(format, luid);

View File

@@ -410,10 +410,6 @@ pub fn core_main() -> Option<Vec<String>> {
#[cfg(feature = "hwcodec")]
scrap::hwcodec::check_available_hwcodec();
return None;
} else if args[0] == "--check-gpucodec-config" {
#[cfg(feature = "gpucodec")]
scrap::gpucodec::check_available_gpucodec();
return None;
} else if args[0] == "--cm" {
// call connection manager to establish connections
// meanwhile, return true to call flutter window to show control panel

View File

@@ -4,7 +4,7 @@ use crate::{
ui_session_interface::{io_loop, InvokeUiSession, Session},
};
use flutter_rust_bridge::StreamSink;
#[cfg(any(feature = "flutter_texture_render", feature = "gpucodec"))]
#[cfg(any(feature = "flutter_texture_render", feature = "vram"))]
use hbb_common::dlopen::{
symbor::{Library, Symbol},
Error as LibError,
@@ -16,7 +16,7 @@ use hbb_common::{
use serde::Serialize;
use serde_json::json;
#[cfg(any(feature = "flutter_texture_render", feature = "gpucodec"))]
#[cfg(any(feature = "flutter_texture_render", feature = "vram"))]
use std::os::raw::c_void;
use std::{
@@ -63,7 +63,7 @@ lazy_static::lazy_static! {
pub static ref TEXTURE_RGBA_RENDERER_PLUGIN: Result<Library, LibError> = Library::open_self();
}
#[cfg(all(target_os = "windows", feature = "gpucodec"))]
#[cfg(all(target_os = "windows", feature = "vram"))]
lazy_static::lazy_static! {
pub static ref TEXTURE_GPU_RENDERER_PLUGIN: Result<Library, LibError> = Library::open("flutter_gpu_texture_renderer_plugin.dll");
}
@@ -168,15 +168,15 @@ pub unsafe extern "C" fn get_rustdesk_app_name(buffer: *mut u16, length: i32) ->
#[derive(Default)]
struct SessionHandler {
event_stream: Option<StreamSink<EventToUI>>,
#[cfg(any(feature = "flutter_texture_render", feature = "gpucodec"))]
#[cfg(any(feature = "flutter_texture_render", feature = "vram"))]
renderer: VideoRenderer,
}
#[cfg(any(feature = "flutter_texture_render", feature = "gpucodec"))]
#[cfg(any(feature = "flutter_texture_render", feature = "vram"))]
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
enum RenderType {
PixelBuffer,
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
Texture,
}
@@ -214,41 +214,41 @@ pub type FlutterRgbaRendererPluginOnRgba = unsafe extern "C" fn(
dst_rgba_stride: c_int,
);
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
pub type FlutterGpuTextureRendererPluginCApiSetTexture =
unsafe extern "C" fn(output: *mut c_void, texture: *mut c_void);
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
pub type FlutterGpuTextureRendererPluginCApiGetAdapterLuid = unsafe extern "C" fn() -> i64;
#[cfg(feature = "flutter_texture_render")]
pub(super) type TextureRgbaPtr = usize;
#[cfg(any(feature = "flutter_texture_render", feature = "gpucodec"))]
#[cfg(any(feature = "flutter_texture_render", feature = "vram"))]
struct DisplaySessionInfo {
// TextureRgba pointer in flutter native.
#[cfg(feature = "flutter_texture_render")]
texture_rgba_ptr: TextureRgbaPtr,
#[cfg(feature = "flutter_texture_render")]
size: (usize, usize),
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
gpu_output_ptr: usize,
notify_render_type: Option<RenderType>,
}
// Video Texture Renderer in Flutter
#[cfg(any(feature = "flutter_texture_render", feature = "gpucodec"))]
#[cfg(any(feature = "flutter_texture_render", feature = "vram"))]
#[derive(Clone)]
struct VideoRenderer {
is_support_multi_ui_session: bool,
map_display_sessions: Arc<RwLock<HashMap<usize, DisplaySessionInfo>>>,
#[cfg(feature = "flutter_texture_render")]
on_rgba_func: Option<Symbol<'static, FlutterRgbaRendererPluginOnRgba>>,
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
on_texture_func: Option<Symbol<'static, FlutterGpuTextureRendererPluginCApiSetTexture>>,
}
#[cfg(any(feature = "flutter_texture_render", feature = "gpucodec"))]
#[cfg(any(feature = "flutter_texture_render", feature = "vram"))]
impl Default for VideoRenderer {
fn default() -> Self {
#[cfg(feature = "flutter_texture_render")]
@@ -270,7 +270,7 @@ impl Default for VideoRenderer {
None
}
};
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
let on_texture_func = match &*TEXTURE_GPU_RENDERER_PLUGIN {
Ok(lib) => {
let find_sym_res = unsafe {
@@ -297,13 +297,13 @@ impl Default for VideoRenderer {
is_support_multi_ui_session: false,
#[cfg(feature = "flutter_texture_render")]
on_rgba_func,
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
on_texture_func,
}
}
}
#[cfg(any(feature = "flutter_texture_render", feature = "gpucodec"))]
#[cfg(any(feature = "flutter_texture_render", feature = "vram"))]
impl VideoRenderer {
#[inline]
#[cfg(feature = "flutter_texture_render")]
@@ -318,7 +318,7 @@ impl VideoRenderer {
DisplaySessionInfo {
texture_rgba_ptr: usize::default(),
size: (width, height),
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
gpu_output_ptr: usize::default(),
notify_render_type: None,
},
@@ -345,7 +345,7 @@ impl VideoRenderer {
DisplaySessionInfo {
texture_rgba_ptr: ptr as _,
size: (0, 0),
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
gpu_output_ptr: usize::default(),
notify_render_type: None,
},
@@ -355,7 +355,7 @@ impl VideoRenderer {
}
}
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
pub fn register_gpu_output(&self, display: usize, ptr: usize) {
let mut sessions_lock = self.map_display_sessions.write().unwrap();
if ptr == 0 {
@@ -434,7 +434,7 @@ impl VideoRenderer {
}
}
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
pub fn on_texture(&self, display: usize, texture: *mut c_void) -> bool {
let mut write_lock = self.map_display_sessions.write().unwrap();
let opt_info = if !self.is_support_multi_ui_session {
@@ -793,7 +793,7 @@ impl InvokeUiSession for FlutterHandler {
}
#[inline]
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
fn on_texture(&self, display: usize, texture: *mut c_void) {
for (_, session) in self.session_handlers.read().unwrap().iter() {
if session.renderer.on_texture(display, texture) {
@@ -1073,9 +1073,9 @@ pub fn session_add(
Some(switch_uuid.to_string())
};
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
let adapter_luid = get_adapter_luid();
#[cfg(not(feature = "gpucodec"))]
#[cfg(not(feature = "vram"))]
let adapter_luid = None;
session.lc.write().unwrap().initialize(
@@ -1453,7 +1453,7 @@ pub fn session_register_pixelbuffer_texture(_session_id: SessionID, _display: us
#[inline]
pub fn session_register_gpu_texture(_session_id: SessionID, _display: usize, _output_ptr: usize) {
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
for s in sessions::get_sessions() {
if let Some(h) = s
.ui_handler
@@ -1468,7 +1468,7 @@ pub fn session_register_gpu_texture(_session_id: SessionID, _display: usize, _ou
}
}
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
pub fn get_adapter_luid() -> Option<i64> {
let get_adapter_luid_func = match &*TEXTURE_GPU_RENDERER_PLUGIN {
Ok(lib) => {

View File

@@ -1295,8 +1295,8 @@ pub fn main_has_hwcodec() -> SyncReturn<bool> {
SyncReturn(has_hwcodec())
}
pub fn main_has_gpucodec() -> SyncReturn<bool> {
SyncReturn(has_gpucodec())
pub fn main_has_vram() -> SyncReturn<bool> {
SyncReturn(has_vram())
}
pub fn main_supported_hwdecodings() -> SyncReturn<String> {
@@ -1782,7 +1782,7 @@ pub fn main_has_file_clipboard() -> SyncReturn<bool> {
}
pub fn main_has_gpu_texture_render() -> SyncReturn<bool> {
SyncReturn(cfg!(feature = "gpucodec"))
SyncReturn(cfg!(feature = "vram"))
}
pub fn cm_init() {

View File

@@ -450,8 +450,6 @@ pub async fn start_server(is_server: bool) {
}
#[cfg(feature = "hwcodec")]
scrap::hwcodec::hwcodec_new_check_process();
#[cfg(feature = "gpucodec")]
scrap::gpucodec::gpucodec_new_check_process();
#[cfg(windows)]
hbb_common::platform::windows::start_cpu_performance_monitor();

View File

@@ -235,7 +235,7 @@ pub struct Connection {
auto_disconnect_timer: Option<(Instant, u64)>,
authed_conn_id: Option<self::raii::AuthedConnID>,
file_remove_log_control: FileRemoveLogControl,
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
supported_encoding_flag: (bool, Option<bool>),
services_subed: bool,
delayed_read_dir: Option<(String, bool)>,
@@ -386,7 +386,7 @@ impl Connection {
auto_disconnect_timer: None,
authed_conn_id: None,
file_remove_log_control: FileRemoveLogControl::new(id),
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
supported_encoding_flag: (false, None),
services_subed: false,
delayed_read_dir: None,
@@ -691,7 +691,7 @@ impl Connection {
}
}
conn.file_remove_log_control.on_timer().drain(..).map(|x| conn.send_to_cm(x)).count();
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
conn.update_supported_encoding();
}
_ = test_delay_timer.tick() => {
@@ -3097,9 +3097,9 @@ impl Connection {
.map(|t| t.0 = Instant::now());
}
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
fn update_supported_encoding(&mut self) {
let not_use = Some(scrap::gpucodec::GpuEncoder::not_use());
let not_use = Some(scrap::vram::VRamEncoder::not_use());
if !self.authorized
|| self.supported_encoding_flag.0 && self.supported_encoding_flag.1 == not_use
{

View File

@@ -8,7 +8,7 @@ use hbb_common::{
tokio::{self, sync::mpsc},
ResultType,
};
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
use scrap::AdapterDevice;
use scrap::{Capturer, Frame, TraitCapturer, TraitPixelBuffer};
use shared_memory::*;
@@ -744,12 +744,12 @@ pub mod client {
true
}
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
fn device(&self) -> AdapterDevice {
AdapterDevice::default()
}
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
fn set_output_texture(&mut self, _texture: bool) {}
}

View File

@@ -42,10 +42,10 @@ use hbb_common::{
Mutex as TokioMutex,
},
};
#[cfg(feature = "gpucodec")]
use scrap::gpucodec::{GpuEncoder, GpuEncoderConfig};
#[cfg(feature = "hwcodec")]
use scrap::hwcodec::{HwEncoder, HwEncoderConfig};
use scrap::hwcodec::{HwRamEncoder, HwRamEncoderConfig};
#[cfg(feature = "vram")]
use scrap::vram::{VRamEncoder, VRamEncoderConfig};
#[cfg(not(windows))]
use scrap::Capturer;
use scrap::{
@@ -430,7 +430,7 @@ fn run(vs: VideoService) -> ResultType<()> {
Ok(x) => encoder = x,
Err(err) => bail!("Failed to create encoder: {}", err),
}
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
c.set_output_texture(encoder.input_texture());
VIDEO_QOS.lock().unwrap().store_bitrate(encoder.bitrate());
VIDEO_QOS
@@ -490,9 +490,9 @@ fn run(vs: VideoService) -> ResultType<()> {
if Encoder::use_i444(&encoder_cfg) != use_i444 {
bail!("SWITCH");
}
#[cfg(all(windows, feature = "gpucodec"))]
if c.is_gdi() && (codec_name == CodecName::H264GPU || codec_name == CodecName::H265GPU) {
log::info!("changed to gdi when using gpucodec");
#[cfg(all(windows, feature = "vram"))]
if c.is_gdi() && (codec_name == CodecName::H264VRAM || codec_name == CodecName::H265VRAM) {
log::info!("changed to gdi when using vram");
bail!("SWITCH");
}
check_privacy_mode_changed(&sp, c.privacy_mode_id)?;
@@ -624,8 +624,8 @@ impl Raii {
impl Drop for Raii {
fn drop(&mut self) {
#[cfg(feature = "gpucodec")]
GpuEncoder::set_not_use(self.0, false);
#[cfg(feature = "vram")]
VRamEncoder::set_not_use(self.0, false);
VIDEO_QOS.lock().unwrap().set_support_abr(self.0, true);
}
}
@@ -637,21 +637,21 @@ fn get_encoder_config(
record: bool,
_portable_service: bool,
) -> EncoderCfg {
#[cfg(all(windows, feature = "gpucodec"))]
#[cfg(all(windows, feature = "vram"))]
if _portable_service || c.is_gdi() {
log::info!("gdi:{}, portable:{}", c.is_gdi(), _portable_service);
GpuEncoder::set_not_use(_display_idx, true);
VRamEncoder::set_not_use(_display_idx, true);
}
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
Encoder::update(scrap::codec::EncodingUpdate::Check);
// https://www.wowza.com/community/t/the-correct-keyframe-interval-in-obs-studio/95162
let keyframe_interval = if record { Some(240) } else { None };
let negotiated_codec = Encoder::negotiated_codec();
match negotiated_codec.clone() {
CodecName::H264GPU | CodecName::H265GPU => {
#[cfg(feature = "gpucodec")]
if let Some(feature) = GpuEncoder::try_get(&c.device(), negotiated_codec.clone()) {
EncoderCfg::GPU(GpuEncoderConfig {
CodecName::H264VRAM | CodecName::H265VRAM => {
#[cfg(feature = "vram")]
if let Some(feature) = VRamEncoder::try_get(&c.device(), negotiated_codec.clone()) {
EncoderCfg::VRAM(VRamEncoderConfig {
device: c.device(),
width: c.width,
height: c.height,
@@ -668,7 +668,7 @@ fn get_encoder_config(
keyframe_interval,
)
}
#[cfg(not(feature = "gpucodec"))]
#[cfg(not(feature = "vram"))]
handle_hw_encoder(
negotiated_codec.clone(),
c.width,
@@ -677,7 +677,7 @@ fn get_encoder_config(
keyframe_interval,
)
}
CodecName::H264HW(_name) | CodecName::H265HW(_name) => handle_hw_encoder(
CodecName::H264RAM(_name) | CodecName::H265RAM(_name) => handle_hw_encoder(
negotiated_codec.clone(),
c.width,
c.height,
@@ -714,15 +714,15 @@ fn handle_hw_encoder(
let f = || {
#[cfg(feature = "hwcodec")]
match _name {
CodecName::H264GPU | CodecName::H265GPU => {
CodecName::H264VRAM | CodecName::H265VRAM => {
if !scrap::codec::enable_hwcodec_option() {
return Err(());
}
let is_h265 = _name == CodecName::H265GPU;
let best = HwEncoder::best();
let is_h265 = _name == CodecName::H265VRAM;
let best = HwRamEncoder::best();
if let Some(h264) = best.h264 {
if !is_h265 {
return Ok(EncoderCfg::HW(HwEncoderConfig {
return Ok(EncoderCfg::HWRAM(HwRamEncoderConfig {
name: h264.name,
width,
height,
@@ -733,7 +733,7 @@ fn handle_hw_encoder(
}
if let Some(h265) = best.h265 {
if is_h265 {
return Ok(EncoderCfg::HW(HwEncoderConfig {
return Ok(EncoderCfg::HWRAM(HwRamEncoderConfig {
name: h265.name,
width,
height,
@@ -743,8 +743,8 @@ fn handle_hw_encoder(
}
}
}
CodecName::H264HW(name) | CodecName::H265HW(name) => {
return Ok(EncoderCfg::HW(HwEncoderConfig {
CodecName::H264RAM(name) | CodecName::H265RAM(name) => {
return Ok(EncoderCfg::HWRAM(HwRamEncoderConfig {
name,
width,
height,

View File

@@ -576,8 +576,8 @@ impl UI {
has_hwcodec()
}
fn has_gpucodec(&self) -> bool {
has_gpucodec()
fn has_vram(&self) -> bool {
has_vram()
}
fn get_langs(&self) -> String {
@@ -701,7 +701,7 @@ impl sciter::EventHandler for UI {
fn get_lan_peers();
fn get_uuid();
fn has_hwcodec();
fn has_gpucodec();
fn has_vram();
fn get_langs();
fn default_video_save_directory();
fn handle_relay_id(String);

View File

@@ -210,13 +210,13 @@ class Enhancements: Reactor.Component {
function render() {
var has_hwcodec = handler.has_hwcodec();
var has_gpucodec = handler.has_gpucodec();
var has_vram = handler.has_vram();
var support_remove_wallpaper = handler.support_remove_wallpaper();
var me = this;
self.timer(1ms, function() { me.toggleMenuState() });
return <li>{translate('Enhancements')}
<menu #enhancements-menu>
{(has_hwcodec || has_gpucodec) ? <li #enable-hwcodec><span>{svg_checkmark}</span>{translate("Enable hardware codec")}</li> : ""}
{(has_hwcodec || has_vram) ? <li #enable-hwcodec><span>{svg_checkmark}</span>{translate("Enable hardware codec")}</li> : ""}
<li #enable-abr><span>{svg_checkmark}</span>{translate("Adaptive bitrate")} (beta)</li>
<li #screen-recording>{translate("Recording")}</li>
{support_remove_wallpaper ? <li #allow-remove-wallpaper><span>{svg_checkmark}</span>{translate("Remove wallpaper during incoming sessions")}</li> : ""}

View File

@@ -836,8 +836,8 @@ pub fn has_hwcodec() -> bool {
}
#[inline]
pub fn has_gpucodec() -> bool {
cfg!(feature = "gpucodec")
pub fn has_vram() -> bool {
cfg!(feature = "vram")
}
#[cfg(feature = "flutter")]
@@ -846,14 +846,14 @@ pub fn supported_hwdecodings() -> (bool, bool) {
let decoding = scrap::codec::Decoder::supported_decodings(None, true, None, &vec![]);
#[allow(unused_mut)]
let (mut h264, mut h265) = (decoding.ability_h264 > 0, decoding.ability_h265 > 0);
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
{
// supported_decodings check runtime luid
let gpu = scrap::gpucodec::GpuDecoder::possible_available_without_check();
if gpu.0 {
let vram = scrap::vram::VRamDecoder::possible_available_without_check();
if vram.0 {
h264 = true;
}
if gpu.1 {
if vram.1 {
h265 = true;
}
}

View File

@@ -1350,7 +1350,7 @@ pub trait InvokeUiSession: Send + Sync + Clone + 'static + Sized + Default {
fn on_voice_call_incoming(&self);
fn get_rgba(&self, display: usize) -> *const u8;
fn next_rgba(&self, display: usize);
#[cfg(all(feature = "gpucodec", feature = "flutter"))]
#[cfg(all(feature = "vram", feature = "flutter"))]
fn on_texture(&self, display: usize, texture: *mut c_void);
fn set_multiple_windows_session(&self, sessions: Vec<WindowsSession>);
}
@@ -1663,7 +1663,7 @@ pub async fn io_loop<T: InvokeUiSession>(handler: Session<T>, round: u32) {
if pixelbuffer {
ui_handler.on_rgba(display, data);
} else {
#[cfg(all(feature = "gpucodec", feature = "flutter"))]
#[cfg(all(feature = "vram", feature = "flutter"))]
ui_handler.on_texture(display, _texture);
}
},