From 7f5ed696c70d10008fb1f7ce273dcf5a93211fc6 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 17 Sep 2014 09:06:17 +0200 Subject: [PATCH 1/3] Fixed WVC capabilities. --- channels/tsmf/client/gstreamer/tsmf_gstreamer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c index 407dc8037..ef0912da2 100644 --- a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c +++ b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c @@ -191,10 +191,10 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder *decoder, TS_AM_MEDIA_TYPE *m { case TSMF_SUB_TYPE_WVC1: mdecoder->gst_caps = gst_caps_new_simple("video/x-wmv", - "bitrate", G_TYPE_UINT, media_type->BitRate, "width", G_TYPE_INT, media_type->Width, "height", G_TYPE_INT, media_type->Height, "wmvversion", G_TYPE_INT, 3, + "format", G_TYPE_STRING, "WVC1", NULL); break; case TSMF_SUB_TYPE_MP4S: From 5c6d72ebbac8bf811f8d110ae23d8c19d64a0adb Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 17 Sep 2014 09:12:01 +0200 Subject: [PATCH 2/3] Fixed naming of entry function, now working with non static channel builds. --- channels/tsmf/client/gstreamer/tsmf_gstreamer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c index ef0912da2..bd533e73c 100644 --- a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c +++ b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c @@ -748,10 +748,10 @@ BOOL tsmf_gstreamer_sync(ITSMFDecoder *decoder, void (*cb)(void *), void *stream } #ifdef STATIC_CHANNELS -#define freerdp_tsmf_client_decoder_subsystem_entry gstreamer_freerdp_tsmf_client_decoder_subsystem_entry +#define freerdp_tsmf_client_subsystem_entry gstreamer_freerdp_tsmf_client_subsystem_entry #endif -ITSMFDecoder *freerdp_tsmf_client_decoder_subsystem_entry(void) +ITSMFDecoder *freerdp_tsmf_client_subsystem_entry(void) { TSMFGstreamerDecoder *decoder; From 0bb8056494068db4a3102b14f04abd1fe70c9ba2 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 17 Sep 2014 09:18:21 +0200 Subject: [PATCH 3/3] Fixed entry function for ffmpeg and non static channel builds. --- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c index 4a13d4bb7..e40f44d83 100644 --- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c @@ -508,10 +508,10 @@ static void tsmf_ffmpeg_free(ITSMFDecoder *decoder) static BOOL initialized = FALSE; #ifdef STATIC_CHANNELS -#define freerdp_tsmf_client_decoder_subsystem_entry ffmpeg_freerdp_tsmf_client_decoder_subsystem_entry +#define freerdp_tsmf_client_subsystem_entry ffmpeg_freerdp_tsmf_client_subsystem_entry #endif -ITSMFDecoder *freerdp_tsmf_client_decoder_subsystem_entry(void) +ITSMFDecoder *freerdp_tsmf_client_subsystem_entry(void) { TSMFFFmpegDecoder *decoder; if(!initialized)