TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-20 19:51:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

enable ffmpeg native h26x software decoders for all platforms (#7750)

Browse Source 
* enable ffmpeg native h26x software decoders for all platforms

* h26x software decoders depend on hwcodec feature, so all platforms
  enable it, software h26x decoders are always available like vpx, no available check and no option
* ffmpeg:
	- build: mac arm64 build ffmpeg with my m1, others build with ci
	- version: win/linux use ffmpeg release/5.1, becaues higher version require higher nvidia driver,  other platforms use release/7.0
* test:
	- ios not test.
	- android: sometimes the screen will appear blurry, but it will recover after a while.
	- arm64 linux: test a example of hwcodec repo

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

* check hwcodec only when enabled and immediately when clicked enabled

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

---------

Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2024-04-18 13:12:45 +08:00
committed by GitHub
parent 4e8cbe3db1
commit 4252b5e273
16 changed files with 106 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/scrap/src/common/codec.rs
View File

@@ -399,7 +399,7 @@ impl Decoder {
..Default::default()
};
#[cfg(feature = "hwcodec")]
if enable_hwcodec_option() {
{
let best = HwRamDecoder::best();
decoding.ability_h264 |= if best.h264.is_some() { 1 } else { 0 };
decoding.ability_h265 |= if best.h265.is_some() { 1 } else { 0 };
@@ -492,7 +492,7 @@ impl Decoder {
valid = h264_vram.is_some();
}
#[cfg(feature = "hwcodec")]
if !valid && enable_hwcodec_option() {
if !valid {
match HwRamDecoder::new(format) {
Ok(v) => h264_ram = Some(v),
Err(e) => log::error!("create H264 ram decoder failed: {}", e),
@@ -518,7 +518,7 @@ impl Decoder {
valid = h265_vram.is_some();
}
#[cfg(feature = "hwcodec")]
if !valid && enable_hwcodec_option() {
if !valid {
match HwRamDecoder::new(format) {
Ok(v) => h265_ram = Some(v),
Err(e) => log::error!("create H265 ram decoder failed: {}", e),
@@ -792,10 +792,13 @@ impl Decoder {
#[cfg(any(feature = "hwcodec", feature = "mediacodec"))]
pub fn enable_hwcodec_option() -> bool {
if let Some(v) = Config2::get().options.get("enable-hwcodec") {
return v != "N";
if cfg!(windows) || cfg!(target_os = "linux") || cfg!(feature = "mediacodec") {
if let Some(v) = Config2::get().options.get("enable-hwcodec") {
return v != "N";
}
return true; // default is true
}
return true; // default is true
false
}
#[cfg(feature = "vram")]
pub fn enable_vram_option() -> bool {