Merge pull request #1021 from 21pages/hwcodec

hwcodec: update build.py

build.py

@@ -22,7 +22,7 @@ def get_version():
     return ''
 
 
-def get_features(feature):
+def prase_rc_features(feature):
     available_features = {
         'IddDriver': {
             'zip_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.1/RustDeskIddDriver_x64.zip',
@@ -94,8 +94,8 @@ def download_extract_features(features, res_dir):
         print(f'{feat} extract end')
 
 
-def build_windows(args):
-    features = get_features(args.feature)
+def get_rc_features(args):
+    features = prase_rc_features(args.feature)
     if features:
         print(f'Build with features {list(features.keys())}')
         res_dir = 'resources'
@@ -105,12 +105,17 @@ def build_windows(args):
             raise Exception(f'Find file {res_dir}, not a directory')
         os.makedirs(res_dir, exist_ok=True)
         download_extract_features(features, res_dir)
+    return ['with_rc'] if features else []
+    
 
-    with_rc = ',with_rc' if features else ''
-    hwcodec = ',hwcodec' if args.hwcodec else ''
-    cmd = 'cargo build --release --features inline' + with_rc + hwcodec
-    print(cmd)
-    os.system(cmd)
+def get_features(args):
+    features = ['inline']
+    if windows:
+        features.extend(get_rc_features(args))
+    if args.hwcodec:
+        features.append('hwcodec')
+    print("features:", features)
+    return features
 
 def main():
     parser = make_parser()
@@ -129,8 +134,9 @@ def main():
     if os.path.isfile('/usr/bin/pacman'):
         os.system('git checkout src/ui/common.tis')
     version = get_version()
+    features = ",".join(get_features(args))
     if windows:
-        build_windows(args)
+        os.system('cargo build --release --features ' + features)
         # os.system('upx.exe target/release/rustdesk.exe')
         os.system('mv target/release/rustdesk.exe target/release/RustDesk.exe')
         pa = os.environ.get('P')
@@ -141,7 +147,7 @@ def main():
             print('Not signed')
         os.system(f'cp -rf target/release/RustDesk.exe rustdesk-{version}-setdown.exe')
     elif os.path.isfile('/usr/bin/pacman'):
-        os.system('cargo build --release --features inline')
+        os.system('cargo build --release --features ' + features)
         os.system('git checkout src/ui/common.tis')
         os.system('strip target/release/rustdesk')
         os.system("sed -i 's/pkgver=.*/pkgver=%s/g' PKGBUILD" % version)
@@ -150,7 +156,7 @@ def main():
         os.system('mv rustdesk-%s-0-x86_64.pkg.tar.zst rustdesk-%s-manjaro-arch.pkg.tar.zst' % (version, version))
         # pacman -U ./rustdesk.pkg.tar.zst
     elif os.path.isfile('/usr/bin/yum'):
-        os.system('cargo build --release --features inline')
+        os.system('cargo build --release --features ' + features)
         os.system('strip target/release/rustdesk')
         os.system("sed -i 's/Version:    .*/Version:    %s/g' rpm.spec" % version)
         os.system('HBB=`pwd` rpmbuild -ba rpm.spec')
@@ -158,14 +164,14 @@ def main():
             version, version))
         # yum localinstall rustdesk.rpm
     elif os.path.isfile('/usr/bin/zypper'):
-        os.system('cargo build --release --features inline')
+        os.system('cargo build --release --features ' + features)
         os.system('strip target/release/rustdesk')
         os.system("sed -i 's/Version:    .*/Version:    %s/g' rpm-suse.spec" % version)
         os.system('HBB=`pwd` rpmbuild -ba rpm-suse.spec')
         os.system('mv $HOME/rpmbuild/RPMS/x86_64/rustdesk-%s-0.x86_64.rpm ./rustdesk-%s-suse.rpm' % (version, version))
         # yum localinstall rustdesk.rpm
     else:
-        os.system('cargo bundle --release --features inline')
+        os.system('cargo bundle --release --features ' + features)
         if osx:
             os.system(
                 'strip target/release/bundle/osx/RustDesk.app/Contents/MacOS/rustdesk')

libs/scrap/src/common/hwcodec.rs

@@ -7,7 +7,7 @@ use hbb_common::{
     config::HwCodecConfig,
     lazy_static, log,
     message_proto::{EncodedVideoFrame, EncodedVideoFrames, Message, VideoFrame},
-    ResultType,
+    ResultType, bytes::Bytes,
 };
 use hwcodec::{
     decode::{DecodeContext, DecodeFrame, Decoder},
@@ -91,7 +91,7 @@ impl EncoderApi for HwEncoder {
         let mut frames = Vec::new();
         for frame in self.encode(frame).with_context(|| "Failed to encode")? {
             frames.push(EncodedVideoFrame {
-                data: frame.data,
+                data: Bytes::from(frame.data),
                 pts: frame.pts as _,
                 ..Default::default()
             });