Add new property to pulsesrc instead of audio device

Change-Id: Ibf91840198569cb6ff35396ed96e64b1f4c5c817
Signed-off-by: Hyunsoo, Park <hance.park@samsung.com>

diff --git a/config/scmirroring_src.ini b/config/scmirroring_src.ini
index e6db82fb4db898ea5929b58d624b733f8966f423..6da8f9e5ca9ef51b8e1fb9e471a817d02e5985a0 100755 (executable)
--- a/config/scmirroring_src.ini
+++ b/config/scmirroring_src.ini
@@ -37,6 +37,8 @@ audio codec = 0x3
 ; set exynos audiosrc property
 ; exynosaudio device name = alsa_output.0.analog-stereo.monitor
 exynosaudio device name = alsa_output.hw_0_0.monitor
+audio properties name = props,media.role=loopback-mirroring
+
 exynosaudio buffer_time = 200000
 ; set qcmsm audiosrc property
 qcmsmaudio device name = hw:0,8

diff --git a/include/scmirroring_src_ini.h b/include/scmirroring_src_ini.h
index 3523d500f37ad78dc0d43dd6fc96d4aca49b4135..05053d70c6625d49d321662fe212b69047e6e8a4 100755 (executable)
--- a/include/scmirroring_src_ini.h
+++ b/include/scmirroring_src_ini.h
@@ -82,6 +82,7 @@ typedef struct __scmirroring_src_ini {
        gint mtu_size;
 
        gchar name_of_audio_device[SCMIRRORING_SRC_INI_MAX_STRLEN];
+       gchar name_of_audio_device_property[SCMIRRORING_SRC_INI_MAX_STRLEN];
        gchar name_of_audio_encoder_aac[SCMIRRORING_SRC_INI_MAX_STRLEN];
        gchar name_of_audio_encoder_ac3[SCMIRRORING_SRC_INI_MAX_STRLEN];
        guint audio_codec;
@@ -117,6 +118,7 @@ typedef struct __scmirroring_src_ini {
 #define DEFAULT_VIDEO_CONVERTER                                ""
 /* hw accel */
 #define DEFAULT_AUDIO_DEVICE_NAME "alsa_output.0.analog-stereo.monitor"
+#define DEFAULT_AUDIO_DEVICE_PROPERTY_NAME "props,media.role=loopback-mirroring"
 #define DEFAULT_AUDIOENC_AAC                           "avenc_aac"
 #define DEFAULT_AUDIOENC_AC3                           "avenc_ac3"
 #define DEFAULT_AUDIO_CODEC    2

diff --git a/miracast_server/miracast_server_impl.c b/miracast_server/miracast_server_impl.c
index b213e83848076e69d0724c3ac0c34c15a9cbbc3d..d1060161d870de1d397877f633c9ab4eaf64f23c 100755 (executable)
--- a/miracast_server/miracast_server_impl.c
+++ b/miracast_server/miracast_server_impl.c
@@ -644,7 +644,8 @@ int __miracast_server_start(MiracastServer *server_obj)
 
        gst_rtsp_media_factory_wfd_set(factory,
                                                        scmirroring_src_ini_get_structure()->videosrc_element,
-                                                       scmirroring_src_ini_get_structure()->name_of_audio_device,
+                                                       //scmirroring_src_ini_get_structure()->name_of_audio_device,
+                                                       scmirroring_src_ini_get_structure()->name_of_audio_device_property,
                                                        scmirroring_src_ini_get_structure()->audio_latency_time,
                                                        scmirroring_src_ini_get_structure()->audio_buffer_time,
                                                        scmirroring_src_ini_get_structure()->audio_do_timestamp,

diff --git a/src/scmirroring_src_ini.c b/src/scmirroring_src_ini.c
index b60772340248610a65b38126277ea626bd03b324..06ce8a0dc3b225bf5f9b470d1f4774eb0145b7ba 100755 (executable)
--- a/src/scmirroring_src_ini.c
+++ b/src/scmirroring_src_ini.c
@@ -113,6 +113,7 @@ scmirroring_src_ini_load(void)
                SCMIRRORING_INI_GET_STRING(g_scmirroring_src_ini.name_of_audio_device, "general:qcmsmaudio device name", DEFAULT_AUDIO_DEVICE_NAME);
                g_scmirroring_src_ini.audio_buffer_time = iniparser_getint(dict, "general:qcmsmaudio buffer_time", DEFAULT_AUDIO_BUFFER_TIME);
 #endif
+               SCMIRRORING_INI_GET_STRING(g_scmirroring_src_ini.name_of_audio_device_property, "general:audio properties name", DEFAULT_AUDIO_DEVICE_PROPERTY_NAME);
                g_scmirroring_src_ini.audio_latency_time = iniparser_getint(dict, "general:audio latency_time", DEFAULT_AUDIO_LATENCY_TIME);
                g_scmirroring_src_ini.audio_do_timestamp = iniparser_getint(dict, "general:audio do_timestamp", DEFAULT_AUDIO_DO_TIMESTAMP);
                SCMIRRORING_INI_GET_STRING(temp, "general:video resolution_supported", "");
@@ -166,6 +167,7 @@ scmirroring_src_ini_load(void)
                g_scmirroring_src_ini.provide_clock = DEFAULT_PROVIDE_CLOCK;
 
                strncpy(g_scmirroring_src_ini.name_of_audio_device, DEFAULT_AUDIO_DEVICE_NAME, SCMIRRORING_SRC_INI_MAX_STRLEN - 1);
+               strncpy(g_scmirroring_src_ini.name_of_audio_device_property, DEFAULT_AUDIO_DEVICE_PROPERTY_NAME, SCMIRRORING_SRC_INI_MAX_STRLEN - 1);
                g_scmirroring_src_ini.audio_latency_time = DEFAULT_AUDIO_LATENCY_TIME;
                g_scmirroring_src_ini.audio_buffer_time = DEFAULT_AUDIO_BUFFER_TIME;
                g_scmirroring_src_ini.audio_do_timestamp = DEFAULT_AUDIO_DO_TIMESTAMP;
@@ -213,6 +215,7 @@ scmirroring_src_ini_load(void)
        scmirroring_debug("name_of_video_converter : %s\n", g_scmirroring_src_ini.name_of_video_converter);
 
        scmirroring_debug("audio device name : %s\n", g_scmirroring_src_ini.name_of_audio_device);
+       scmirroring_debug("audio device property name : %s\n", g_scmirroring_src_ini.name_of_audio_device_property);
        scmirroring_debug("audio latency_time : %d\n", g_scmirroring_src_ini.audio_latency_time);
        scmirroring_debug("audio buffer_time : %d\n", g_scmirroring_src_ini.audio_buffer_time);
        scmirroring_debug("audio do_timestamp : %d\n", g_scmirroring_src_ini.audio_do_timestamp);