Skip to content

Commit 11d4ff7

Browse files
committed
added freerdp3 rdpecam related optimizations and minor patches for improved
functionality.
1 parent 8cfa93f commit 11d4ff7

4 files changed

Lines changed: 493 additions & 0 deletions

File tree

buildroot-external/Buildroot.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ BR2_PACKAGE_FFMPEG=y
3737
# BR2_PACKAGE_FFMPEG_FFMPEG is not set
3838
BR2_PACKAGE_FFMPEG_XCBGRAB=y
3939
BR2_PACKAGE_FFMPEG_GPL=y
40+
BR2_PACKAGE_FFMPEG_SWSCALE=y
41+
BR2_PACKAGE_FFMPEG_EXTRACONF="--enable-sse3 --enable-ssse3 --enable-sse4 --enable-sse42 --enable-avx --enable-avx2 --enable-fma3"
4042
BR2_PACKAGE_GLIBC_UTILS=y
4143
BR2_PACKAGE_X264=y
4244
BR2_PACKAGE_X265=y
@@ -49,6 +51,7 @@ BR2_PACKAGE_EXFAT=y
4951
BR2_PACKAGE_F2FS_TOOLS=y
5052
BR2_PACKAGE_NTFS_3G=y
5153
BR2_PACKAGE_DEJAVU=y
54+
BR2_PACKAGE_LIBVA=y
5255
BR2_PACKAGE_LIBERATION=y
5356
BR2_PACKAGE_LIBDRM=y
5457
BR2_PACKAGE_MESA3D=y

buildroot-external/package/freerdp3/freerdp3.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ else
9494
FREERDP3_CONF_OPTS += -DWITH_SIMD=OFF
9595
endif
9696

97+
ifeq ($(BR2_PACKAGE_LIBVA),y)
98+
FREERDP3_CONF_OPTS += -DWITH_VAAPI=ON -DWITH_VAAPI_H264_ENCODING=ON
99+
else
100+
FREERDP3_CONF_OPTS += -DWITH_VAAPI=OFF
101+
endif
102+
97103
#---------------------------------------
98104
# Enabling server and/or client
99105

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From: local Buildroot integration
2+
Subject: [PATCH 1/2] build: fix FFmpeg AVCODEC component variable name
3+
4+
FindFFmpeg.cmake records the AVCODEC component result in the
5+
FFmpeg_AVCODEC_FOUND variable. The checks in libfreerdp use a differently
6+
cased variable, causing CMake to report AVCODEC as unavailable even after it
7+
has successfully found libavcodec.
8+
9+
Use the component variable name provided by FindFFmpeg.cmake so that the
10+
MJPEG decoder dependencies are added explicitly.
11+
12+
Upstream-Status: Pending
13+
---
14+
libfreerdp/CMakeLists.txt | 4 ++--
15+
1 file changed, 2 insertions(+), 2 deletions(-)
16+
17+
diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
18+
--- a/libfreerdp/CMakeLists.txt
19+
+++ b/libfreerdp/CMakeLists.txt
20+
@@ -162,7 +162,7 @@ if(WITH_SWSCALE)
21+
# AVUTIL is needed for av_image_* functions, AVCODEC is optional (for MJPEG in video.c)
22+
find_package(FFmpeg REQUIRED COMPONENTS SWSCALE AVUTIL)
23+
find_package(FFmpeg COMPONENTS AVCODEC)
24+
- if(FFmpeg_avcodec_FOUND)
25+
+ if(FFmpeg_AVCODEC_FOUND)
26+
message(STATUS "FFmpeg AVCODEC found - MJPEG support available in video codec wrappers")
27+
set(WITH_FFMPEG ON)
28+
else()
29+
@@ -180,7 +180,7 @@ if(WITH_SWSCALE)
30+
if(NOT WITH_SWSCALE_LOADING)
31+
include_directories(SYSTEM ${SWSCALE_INCLUDE_DIRS} ${AVUTIL_INCLUDE_DIRS})
32+
freerdp_library_add(${SWSCALE_LIBRARIES} ${AVUTIL_LIBRARIES})
33+
- if(FFmpeg_avcodec_FOUND)
34+
+ if(FFmpeg_AVCODEC_FOUND)
35+
include_directories(SYSTEM ${AVCODEC_INCLUDE_DIRS})
36+
freerdp_library_add(${AVCODEC_LIBRARIES})
37+
endif()
38+
--
39+
2.39.5

0 commit comments

Comments
 (0)