Skip to content

Commit

Permalink
very fluent now
Browse files Browse the repository at this point in the history
  • Loading branch information
seflerZ committed Nov 6, 2024
1 parent 914492e commit 23a740c
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 24 deletions.
4 changes: 2 additions & 2 deletions libxrdp/xrdp_caps.c
Original file line number Diff line number Diff line change
Expand Up @@ -1205,9 +1205,9 @@ xrdp_caps_send_demand_active(struct xrdp_rdp *self)
caps_count++;
out_uint16_le(s, CAPSTYPE_FRAME_ACKNOWLEDGE);
out_uint16_le(s, CAPSTYPE_FRAME_ACKNOWLEDGE_LEN);
out_uint32_le(s, 10); /* 10 frames in flight */
out_uint32_le(s, 6); /* 6 frames in flight */
LOG_DEVEL(LOG_LEVEL_TRACE, "xrdp_caps_send_demand_active: Server Capability "
"CAPSTYPE_FRAME_ACKNOWLEDGE = 10 frames");
"CAPSTYPE_FRAME_ACKNOWLEDGE = 6 frames");

/* surface commands */
caps_count++;
Expand Down
18 changes: 9 additions & 9 deletions xorgxrdp_helper/xorgxrdp_helper
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ func_parse_lt_options ()
case "$lt_opt" in
--lt-debug) lt_option_debug=1 ;;
--lt-dump-script)
lt_dump_D=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
lt_dump_D=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
lt_dump_F=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 's%^.*/%%'`
lt_dump_F=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%^.*/%%'`
cat "$lt_dump_D/$lt_dump_F"
exit 0
;;
Expand Down Expand Up @@ -143,13 +143,13 @@ func_exec_program ()
func_parse_lt_options "$0" ${1+"$@"}

# Find the directory that this script lives in.
thisdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'`
thisdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
test "x$thisdir" = "x$file" && thisdir=.

# Follow symbolic links until we get to the real thisdir.
file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'`
while test -n "$file"; do
destdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'`
destdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`

# If there was a directory component, then change thisdir.
if test "x$destdir" != "x$file"; then
Expand All @@ -159,8 +159,8 @@ func_exec_program ()
esac
fi

file=`$ECHO "$file" | /bin/sed 's%^.*/%%'`
file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
file=`$ECHO "$file" | /usr/bin/sed 's%^.*/%%'`
file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'`
done

# Usually 'no', except on cygwin/mingw when embedded into
Expand All @@ -173,7 +173,7 @@ func_exec_program ()
fi
# remove .libs from thisdir
case "$thisdir" in
*[\\/].libs ) thisdir=`$ECHO "$thisdir" | /bin/sed 's%[\\/][^\\/]*$%%'` ;;
*[\\/].libs ) thisdir=`$ECHO "$thisdir" | /usr/bin/sed 's%[\\/][^\\/]*$%%'` ;;
.libs ) thisdir=. ;;
esac
fi
Expand All @@ -192,7 +192,7 @@ func_exec_program ()

# Some systems cannot cope with colon-terminated LD_LIBRARY_PATH
# The second colon is a workaround for a bug in BeOS R4 sed
LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /bin/sed 's/::*$//'`
LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /usr/bin/sed 's/::*$//'`

export LD_LIBRARY_PATH

Expand Down
2 changes: 1 addition & 1 deletion xrdp/xrdp_encoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ xrdp_encoder_create(struct xrdp_mm *mm)
self->xrdp_encoder_term = g_create_wait_obj(buf);
if (client_info->gfx)
{
self->frames_in_flight = 10;
self->frames_in_flight = 6;
self->max_compressed_bytes = 4245728;
}
else
Expand Down
7 changes: 4 additions & 3 deletions xrdp/xrdp_encoder_x264.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,15 @@ xrdp_encoder_x264_encode(void *handle, int session,
xe->x264_params.i_height = height;
xe->x264_params.i_fps_num = 60;
xe->x264_params.i_fps_den = 1;
xe->x264_params.rc.b_mb_tree=0;
//xe->x264_params.b_cabac = 1;
//xe->x264_params.i_bframe = 0;
xe->x264_params.rc.i_rc_method = X264_RC_CRF;
xe->x264_params.rc.f_rf_constant = 20;
xe->x264_params.rc.f_rf_constant_max = 30;
xe->x264_params.rc.f_rf_constant = 21;
xe->x264_params.rc.f_rf_constant_max = 30;
//x264_param_apply_profile(&(xe->x264_params), "high");
//x264_param_apply_profile(&(xe->x264_params), "main");
x264_param_apply_profile(&(xe->x264_params), "baseline");
x264_param_apply_profile(&(xe->x264_params), "ultrafast");
xe->x264_enc_han = x264_encoder_open(&(xe->x264_params));
if (xe->x264_enc_han == 0)
{
Expand Down
18 changes: 9 additions & 9 deletions xrdpapi/xrdp-xrdpapi-simple
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ func_parse_lt_options ()
case "$lt_opt" in
--lt-debug) lt_option_debug=1 ;;
--lt-dump-script)
lt_dump_D=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
lt_dump_D=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
lt_dump_F=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 's%^.*/%%'`
lt_dump_F=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%^.*/%%'`
cat "$lt_dump_D/$lt_dump_F"
exit 0
;;
Expand Down Expand Up @@ -143,13 +143,13 @@ func_exec_program ()
func_parse_lt_options "$0" ${1+"$@"}

# Find the directory that this script lives in.
thisdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'`
thisdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
test "x$thisdir" = "x$file" && thisdir=.

# Follow symbolic links until we get to the real thisdir.
file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'`
while test -n "$file"; do
destdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'`
destdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`

# If there was a directory component, then change thisdir.
if test "x$destdir" != "x$file"; then
Expand All @@ -159,8 +159,8 @@ func_exec_program ()
esac
fi

file=`$ECHO "$file" | /bin/sed 's%^.*/%%'`
file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
file=`$ECHO "$file" | /usr/bin/sed 's%^.*/%%'`
file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'`
done

# Usually 'no', except on cygwin/mingw when embedded into
Expand All @@ -173,7 +173,7 @@ func_exec_program ()
fi
# remove .libs from thisdir
case "$thisdir" in
*[\\/].libs ) thisdir=`$ECHO "$thisdir" | /bin/sed 's%[\\/][^\\/]*$%%'` ;;
*[\\/].libs ) thisdir=`$ECHO "$thisdir" | /usr/bin/sed 's%[\\/][^\\/]*$%%'` ;;
.libs ) thisdir=. ;;
esac
fi
Expand All @@ -192,7 +192,7 @@ func_exec_program ()

# Some systems cannot cope with colon-terminated LD_LIBRARY_PATH
# The second colon is a workaround for a bug in BeOS R4 sed
LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /bin/sed 's/::*$//'`
LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /usr/bin/sed 's/::*$//'`

export LD_LIBRARY_PATH

Expand Down

0 comments on commit 23a740c

Please sign in to comment.