mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,482 Commits 6 Branches 74 Tags 84 MiB
ed9a4b7d45
Commit Graph

339 Commits

Author SHA1 Message Date
Martin Haimberger
f65d15feeb fixed audioserver 
if no data could be read, the ERROR_NO_DATA is returend to
indicate a further read.
 2015-07-22 03:16:46 -07:00
Bernhard Miklautz
f992568432 rdpsnd: restore old behavior and fixes 
* oss: fix function signature
* autodetection - if only /sound is given all enabled
  plugins are tried in order and the first successful loaded is used.
	- this restores the previous behavior
* alsa/pulse fix command line parsing - no parameters shouldn't be
  treated as error
 2015-07-20 12:28:49 +02:00
Martin Haimberger
e682329eeb fixed compiler errors 2015-07-15 03:17:38 -07:00
Martin Haimberger
6ab0187d84 Merge remote-tracking branch 'upstream/master' into mh-channel 
Conflicts:
	channels/audin/client/oss/audin_oss.c
	channels/drive/client/drive_main.c
	channels/printer/client/printer_cups.c
	channels/printer/client/printer_main.c
	channels/rail/client/rail_main.c
	channels/rdpgfx/client/rdpgfx_main.c
	channels/rdpsnd/client/oss/rdpsnd_oss.c
	channels/remdesk/client/remdesk_main.c
	channels/remdesk/server/remdesk_main.c
	channels/tsmf/client/tsmf_media.c
 2015-07-15 01:57:07 -07:00
Martin Haimberger
b8c110d19b introduced channel error reporting system 
The rdpContext gets an event which will
get set if an error occoured in a channel.

If a thread or a void callback has to report an
error it will get signaled by this system.
 2015-07-15 00:50:35 -07:00
David FORT
1b7140d84e Fixed some more checks in rdpsnd channel 2015-07-04 00:17:37 +02:00
Armin Novak
cf9f975341 Replaced snprintf with sprintf_s 2015-07-03 13:26:15 +02:00
Zavadovsky Yan
2c1aff1ab9 channels/rdpsnd: fix memory leak 
Pointer to sound data chunk must be put into queue
otherwise bqPlayerCallback() will have nothing to free and
memory will leak.
 2015-07-01 18:58:38 +03:00
Zavadovsky Yan
6ce87bd477 channels/rdpsnd: fix rdpsnd_opensles_set_format() logic 
If server says "PCM format" treat sound data as PCM, not ADPCM.
This fixes noise from speakers when using Xrdp as server.
 2015-07-01 18:58:10 +03:00
Marc-André Moreau
ddf2519f1e Merge pull request #2719 from bmiklautz/pull/2481 
OSS, tsmf, usb and BSD fixes and improvements
 2015-06-26 08:27:22 -04:00
David FORT
a8fefae3a1 Harden the sound channel 
This patch adds checks for the sound channel and plugins:

* checks for protocol bytes;
* checks for malloc/calloc;
* be more strict when interacting with sound plugin
 2015-06-24 17:06:45 +02:00
Bernhard Miklautz
7624519453 oss: fix formating 2015-06-22 19:45:56 +02:00
Bernhard Miklautz
77927c213e android: fix misc compiler warnings 
with gcc version arm-linux-androideabi-gcc (GCC) 4.8
 2015-06-22 19:09:59 +02:00
ivan-83
e22a4461c7 rdpsnd oss remove unneded mem operations 2015-05-30 03:02:25 +03:00
ivan-83
d925f2f9fe rdpsnd: latency process 2015-05-30 02:22:18 +03:00
ivan-83
94a7abd2af + tsmf: OSS initial suppot (not work yet) 
* tsmf: fix video playback on FreeBSD (proper shared object name)
* tsmf: renamed args: audio->sys, audio-dev->dev
* audin: OSS fix, now it work
* cmdline: add syntax help for /audin, /rdpsnd, /tsmf
* add debug messages
 2015-05-27 22:54:13 +03:00
David FORT
29d372480a Take in account nfedera's review 2015-05-20 19:19:50 +02:00
David FORT
f8d6eb226c Fixed last VirtualChannelEntry 2015-05-19 13:56:48 +02:00
Hardening
f8120919af Add checks for some XXX_New and XXX_Add functions 
Based on PR #2616
 2015-05-18 11:28:00 +02:00
Norbert Federa
1eff1a345e free can handle NULL perfectly fine 2015-05-11 09:07:39 +02:00
Bryan Everly
8c75127a67 Necessary changes to get latest branch working on OpenBSD 5.6 2015-04-21 14:42:06 -04:00
Bernhard Miklautz
79de8168f9 Integrate feedback from pull request 
* orders.c: remove ; at eol
* rdpdr_main.c: simplify error case
* rdpsnd_pulse.c: fix incorrect check
* rdpsnd_main.c: adapt return value according to documentation
* update.c: fix incorrect return values
 2015-03-30 18:29:32 +02:00
Bernhard Miklautz
74c8400789 coding style fixes 
Add missing space after if
 2015-03-30 17:15:45 +02:00
Bernhard Miklautz
f469e069dc stream: Stream_Ensure*Capacity: change return type 
Change the return type of Stream_Ensure*Capacity from void to BOOL to be
able to detect realloc problems easily. Otherwise the only way to detect
this was to check if the capacity after the call was >= the required
size.
In case Stream_Ensure*Capacity fails the old memory is still available
and need to freed outside.

This commit also adds checks to most calls of Stream_Ensure*Capacity to
check if the call was successful.
 2015-03-30 16:33:48 +02:00
ivan-83
7b3a552988 + audin OSS support (un tested now) 
+ add: COMMAND_LINE_IGN_UNKNOWN_KEYWORD flag for CommandLineParseArgumentsA to ignory unknown keys without fail
+ add: lot of WLog_DBG() in drdynvc, add function names in existing
* change: error text in rdpsnd OSS
* fix: dev in rdpsnd does not work
* fix/change: audio-dev renamed to dev and now work in audin
* fix dynamic channels now work again
 2015-03-13 01:28:44 +03:00
ivan-83
0f3b639058 * OSS build fix on linux 2015-03-11 02:17:45 +03:00
ivan-83
e85dccc22a * remove OSS debug messages 2015-03-10 01:34:15 +03:00
ivan-83
4f8f84f33b + some files for OSS, missed from prev commit 2015-03-09 09:31:27 +03:00
ivan-83
fe9fab920e + add OSS support for rdpsnd 2015-03-09 09:23:29 +03:00
ivan-83
8d5825ee00 Fix poor sound quality with ALSA 
and decrease "ALSA lib pcm.c:7339:(snd_pcm_recover) underrun occurred"
+ little code cleanup
 2015-03-09 09:11:46 +03:00
Armin Novak
69afce34c7 Debug messages now use WLog_DBG instead of WLog_ERR. 2015-02-19 08:45:45 +01:00
Armin Novak
557e8bb938 Fixed variable initialisation and cleanup. 2015-01-20 12:31:21 +01:00
Armin Novak
918ca132f6 Fixed resource cleanup locations. 
Additional error checks and logging.
 2015-01-20 11:59:13 +01:00
Armin Novak
cbf8b1cf01 Fixed resource cleanup locations. 
Additional error checks and logging.
 2015-01-20 11:53:12 +01:00
Armin Novak
54fa77a06a Prettiefied WLog messages. 2015-01-20 11:20:38 +01:00
Marc-André Moreau
27a8e50e60 channels: fix drdynvc, patch memory leaks 2014-12-27 15:20:29 -05:00
Marc-André Moreau
6c2ebb2b58 channels: redirection valgrind fixes 2014-12-27 13:50:50 -05:00
Marc-André Moreau
fdd2dc7601 freerdp: patch valgrind leaks, cleanup 2014-12-03 14:17:27 -05:00
Armin Novak
059374457d Removed library prefix override. 2014-09-17 11:27:11 +02:00
Armin Novak
4529eb00ee Decreased logging verbosity. 2014-09-15 19:37:53 +02:00
Armin Novak
b1e9ffb655 Using wlog for channel logging now. 
Fixed compiler warnings and broken callback in urbdrc.
 2014-09-15 08:48:46 +02:00
Marc-André Moreau
f5ff6e1bd8 Merge pull request #2095 from bmiklautz/feat/byemonolithic 
Remove non-monolithic builds of libfreerdp
 2014-09-11 18:46:32 -04:00
Bernhard Miklautz
0313ca3622 libfreerdp: always build "MONOLITHIC" 
"libfreerdp" consisted of multiple (small) single libraries. If the cmake
option MONOLITHIC was used only one library was build combining all of
the libfreerdp-* libraries.
The only exceptions to this are libfreerdp-server and libfreerdp-client these
are build as separate libraries.

This commit obsoltes non-monolithic builds and makes monolithic builds
the default. The cmake option MONOLITHIC is also removed.
 2014-09-12 00:19:53 +02:00
Bernhard Miklautz
96cd479c99 rdpsnd_server_handle_messages: change return type 
With BOOL as return type it is not possible to differentiate between
success and "no data can be read" (when a channel read would block).

rdpsnd_server_handle_messages returns now int with the following
possible values:

-1 if no data could be read
0 error (like connection close) (formerly FALSE)
1 succsess (also if further bytes need to be read) (formerly TRUE)

Not using -1 for error cases was chosen to be compatible with the BOOL
return values used before.
 2014-09-11 13:45:23 +02:00
Bernhard Miklautz
e603655048 rdpsnd server: seal stream before processing 
If the stream is not sealed Stream_GetRemainingLength might return bogus
values.
 2014-09-11 12:30:37 +02:00
Bernhard Miklautz
bbaecbd42d rdpsnd server: add support for clients version < 6 
MS-RDPEA 2.2.2.3 states (Appendix A <6>) that quality mode PDU
should be ignored if the client version is < 6. For these clients the sound
channel got never activated since activated was only called after
reception of the quality mode PDU.

For clients < version 6 activated is now called after
CLIENT_AUDIO_VERSION_AND_FORMATS was received.
 2014-09-11 12:30:37 +02:00
Armin Novak
784696c1cd Fixed missing includes and invalid replacement. 2014-08-11 09:38:08 +02:00
Armin Novak
66b8905ac6 Using special log defines for channels now. 2014-08-11 09:12:01 +02:00
Armin Novak
158e1323de Fixed compiler warnings. 2014-08-07 19:05:48 +02:00
Armin Novak
b252009d36 Replaced custom logging mechanism with WLog wrapper. 2014-08-07 16:51:49 +02:00
Vic Lee
29cb8680ce server: allow partial channel read (fix rdpsnd). 2014-07-14 20:00:38 +08:00
Bernhard Miklautz
6a49bcfe40 winpr: always build "monolitic" 
winpr is now always build as single library.
The build option MONOLITHIC_BUILD doesn't influence this behavior anymore.

The only exception is winpr-makecert-tool which is still build as extra
library.

This obsoletes complex_libraries for winpr.
 2014-07-10 11:10:58 +02:00
Hardening
4b6edb913c Make server sound thread optionnal 
This patch makes the server-side sound channel thread optionnal, and
exposes functions to handle channel traffic from the outside.
 2014-07-02 10:31:45 +02:00
Marc-André Moreau
c156006195 Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx 2014-06-23 11:55:27 -04:00
Hardening
11f8e40d50 Fix packet decoding logic 
This patch totally reworks the logic of the packet decoding for the
server-side sound channel.
 2014-06-19 10:06:37 +02:00
Hardening
f33f755635 Also specify the timestamp when sending samples 
This patch complements the SendSample() callback to take the timestamp
as extra argument.
 2014-06-18 23:44:34 +02:00
Hardening
99d531655c Implement a confirm block callback 
This patch adds a callback called when we receive feedback from the
client.
 2014-06-18 23:44:34 +02:00
Marc-André Moreau
53639dea0b channels: reduce dependency on svc_plugin.h 2014-06-11 15:09:28 -04:00
Martin Fleisz
6f1f4be0ae Merge pull request #1873 from hardening/WTSVirtualChannelWriteCallers 
Don't use NULL for pWrittenBytes when calling WTSVirtualChannelWrite()
 2014-06-03 16:40:05 +02:00
Vic Lee
a4c583c459 rdpsnd/server: fix incorrect use of channe handle. 2014-05-30 23:00:15 +08:00
Hardening
c076ffb020 Don't use NULL for pWrittenBytes when calling WTSVirtualChannelWrite() 
Nothing in the MSDN API says that setting NULL is safe. And if the
implementation uses WriteFile directly, it crashes.
 2014-05-28 17:04:24 +02:00
Hardening
965eefe04e Fixed bad check 2014-05-02 22:45:38 +02:00
Hardening
09c9181f8d Fix ChannelEvent 2014-05-02 21:53:52 +02:00
Hardening
a7023769d0 Fixes in the server-side sound channel 
This patch:
* treats OOM situations
* adds checks when reading audio channel messages
 2014-04-29 01:02:35 +02:00
Marc-André Moreau
769502ec72 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-04-26 13:47:01 -04:00
Vic Lee
08b4976f72 Revert "channels: fix link errors." 
This reverts commit 2fc7f9c485.
 2014-04-22 15:05:53 +08:00
Marc-André Moreau
13d61f341d Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-04-21 16:28:01 -04:00
Marc-André Moreau
784e9abd79 cmake: improve __FILE__ relative path hack 2014-04-21 14:42:24 -04:00
Vic Lee
2fc7f9c485 channels: fix link errors. 2014-04-21 17:47:12 +08:00
Benoit LeBlanc
27c753f80c Merge branch 'master' of git://github.com/awakecoding/FreeRDP 2014-03-19 11:53:10 -04:00
Marc-André Moreau
db1159f7b6 Merge pull request #1737 from zhangzl2013/sound-fix 
Sound fix
 2014-03-13 10:35:33 -04:00
Benoît LeBlanc
c6f235e1ee Merge branch 'master' of git://github.com/awakecoding/FreeRDP 2014-03-12 18:23:26 -04:00
Benoît LeBlanc
dde8d81f46 Removed WLOG traces for audio playback 2014-03-12 18:23:17 -04:00
Zhang Zhaolong
ffb53ba5e2 sound: cleanup invalid code. 2014-03-12 17:16:06 +08:00
Zhang Zhaolong
9cf6d1d9ae sound: fix long latency. 2014-03-12 17:02:45 +08:00
Zhang Zhaolong
69c926eb37 sound: fix random volume on connection. 2014-03-12 15:04:33 +08:00
Zhang Zhaolong
69296ce3bd wfreerdp: build fix. 2014-03-04 13:54:25 +08:00
Marc-André Moreau
6695873394 libwinpr-wtsapi: fix multiple inconsistencies with original wtsapi headers 2014-02-28 14:49:57 -05:00
Marc-André Moreau
419e2936be Merge branch 'master' of github.com:awakecoding/FreeRDP into channels 2014-02-27 15:09:06 -05:00
Marc-André Moreau
951368a1ce Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-02-27 13:58:29 -05:00
Marc-André Moreau
6e1cdf1b67 libfreerdp-core: expose opaque HANDLE instead of WTSVirtualChannelManager* 2014-02-27 13:30:04 -05:00
Vic Lee
4fa2ca3062 rdpsnd-server: fix broken message parsing. 2014-02-20 23:33:27 +08:00
Marc-André Moreau
3e546a22a1 channels: start migrating existing server-side channels to WTSAPI 2014-02-16 22:07:00 -05:00
Marc-André Moreau
82b922a70d channels: rename custom CHANNEL_ENTRY_POINTS_EX to CHANNEL_ENTRY_POINTS_FREERDP to fix conflict 2014-02-16 17:38:59 -05:00
Marc-André Moreau
b833073f57 libfreerdp-core: make client virtual channel API prototypes converge towards original API 2014-02-16 17:27:36 -05:00
Marc-André Moreau
8a81208059 libfreerdp-core: move server-side virtual channels back into core 2014-02-15 17:42:59 -05:00
Marc-André Moreau
cdcd290c44 wfreerdp: fix most build warnings 2014-02-10 22:12:13 -05:00
Marc-André Moreau
5ff847a6e6 wfreerdp: fix multiple warnings 2014-02-10 01:06:11 -05:00
Marc-André Moreau
6acd0ed84a channels/rdpsnd: improve winmm rdpsnd implementation 2013-12-15 15:59:51 -05:00
Marc-André Moreau
4356eb5572 Merge branch 'audio' of github.com:FreeRDP/FreeRDP 
Conflicts:
	libfreerdp/codec/audio.c
 2013-12-11 17:24:00 -05:00
Marc-André Moreau
f890771871 channels/rdpsnd: fix audio duration computation for GSM610 format 2013-12-11 17:21:29 -05:00
Marc-André Moreau
95a452e77f channels/rdpsnd: start using AudioConverter 2013-12-09 17:34:23 -05:00
Marc-André Moreau
c230e872af channels/rdpsnd: start refactoring mac audio code 2013-12-09 16:02:42 -05:00
Marc-André Moreau
76c842285d channels/rdpsnd: initial attempt at adding GSM610 support 2013-11-22 12:11:39 -05:00
Marc-André Moreau
c1fa455c30 channels/rdpsnd: add wlog debug output 2013-11-19 15:31:38 -05:00
Marc-André Moreau
c03a2e5497 channels/rdpsnd: add option for configuring audio quality mode 2013-11-19 14:29:31 -05:00
Armin Novak
23b5845660 Fixed crash due to duplicate resource cleanup (MessagePipe freed in channel) 2013-11-12 10:22:04 +01:00
Marc-André Moreau
3c44ff9c83 channels/rdpsnd: fix bug in rdpsnd and rdpdr deinitialization 2013-11-06 14:31:33 -05:00
Marc-André Moreau
5406ebd5d8 channels/drive: refactoring 2013-11-03 19:10:33 -05:00
Marc-André Moreau
37450da55d cmake: fix exporting of targets on pre-2.8.11 2013-10-29 14:47:40 -04:00