summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/client/mm_player_client.c4
-rw-r--r--src/include/mm_player_ini.h12
-rw-r--r--src/mm_player_ini.c10
-rw-r--r--src/server/mm_player_priv.c14
4 files changed, 22 insertions, 18 deletions
diff --git a/src/client/mm_player_client.c b/src/client/mm_player_client.c
index 2cbdea3..6185cf1 100644
--- a/src/client/mm_player_client.c
+++ b/src/client/mm_player_client.c
@@ -404,8 +404,8 @@ static int _mmplayer_mused_realize(mm_player_t *player, char *string_caps)
switch(surface_type)
{
case MM_DISPLAY_SURFACE_X:
- if (strlen(player->ini.videosink_element_x) > 0)
- videosink_element = player->ini.videosink_element_x;
+ if (strlen(player->ini.videosink_element_overlay) > 0)
+ videosink_element = player->ini.videosink_element_overlay;
else {
result = MM_ERROR_PLAYER_NOT_INITIALIZED;
goto REALIZE_ERROR;
diff --git a/src/include/mm_player_ini.h b/src/include/mm_player_ini.h
index 9e10c4f..cd680f5 100644
--- a/src/include/mm_player_ini.h
+++ b/src/include/mm_player_ini.h
@@ -60,7 +60,7 @@ enum keyword_type
typedef struct __mm_player_ini
{
/* general */
- gchar videosink_element_x[PLAYER_INI_MAX_STRLEN];
+ gchar videosink_element_overlay[PLAYER_INI_MAX_STRLEN];
gchar videosink_element_evas[PLAYER_INI_MAX_STRLEN];
gchar videosink_element_fake[PLAYER_INI_MAX_STRLEN];
gchar videosink_element_remote[PLAYER_INI_MAX_STRLEN];
@@ -135,9 +135,9 @@ typedef struct __mm_player_ini
#define DEFAULT_GENERATE_DOT FALSE
#define DEFAULT_USE_SYSTEM_CLOCK TRUE
#define DEFAULT_DELAY_BEFORE_REPEAT 50 /* msec */
-#define DEFAULT_EOS_DELAY 150 /* msec */
-#define DEFAULT_VIDEOSINK_X "xvimagesink"
-#define DEFAULT_VIDEOSINK_EVAS "evaspixmapsink"
+#define DEFAULT_EOS_DELAY 0 /* msec */
+#define DEFAULT_VIDEOSINK_OVERLAY "waylandsink"
+#define DEFAULT_VIDEOSINK_EVAS "evasimagesink"
#define DEFAULT_VIDEOSINK_FAKE "fakesink"
#define DEFAULT_VIDEOSINK_REMOTE "shmsink"
#define DEFAULT_VIDEOSRC_REMOTE "shmsrc"
@@ -152,7 +152,7 @@ typedef struct __mm_player_ini
#define DEFAULT_LOCALPLAYBACK_STATE_CHANGE_TIMEOUT 10 /* sec */
/* http streaming */
#define DEFAULT_HTTPSRC "souphttpsrc"
-#define DEFAULT_HTTP_FILE_BUFFER_PATH "/opt/usr/media"
+#define DEFAULT_HTTP_FILE_BUFFER_PATH "/home/owner/content"
#define DEFAULT_HTTP_BUFFERING_LIMIT 99.0 /* percent */
#define DEFAULT_HTTP_MAX_SIZE_BYTES 1048576 /* bytes : 1 MBytes */
#define DEFAULT_HTTP_BUFFERING_TIME 1.2 /* sec */
@@ -160,7 +160,7 @@ typedef struct __mm_player_ini
/* dump buffer for debug */
#define DEFAULT_DUMP_ELEMENT_KEYWORD ""
-#define DEFAULT_DUMP_ELEMENT_PATH "/opt/usr/media/"
+#define DEFAULT_DUMP_ELEMENT_PATH "/tmp/"
/* NOTE : following content should be same with above default values */
/* FIXIT : need smarter way to generate default ini file. */
diff --git a/src/mm_player_ini.c b/src/mm_player_ini.c
index e5403a6..075df16 100644
--- a/src/mm_player_ini.c
+++ b/src/mm_player_ini.c
@@ -178,7 +178,7 @@ mm_player_ini_load(mm_player_ini_t* ini)
ini->delay_before_repeat = iniparser_getint(dict, "general:delay before repeat", DEFAULT_DELAY_BEFORE_REPEAT);
- MMPLAYER_INI_GET_STRING(dict, ini->videosink_element_x, "general:videosink element x", DEFAULT_VIDEOSINK_X);
+ MMPLAYER_INI_GET_STRING(dict, ini->videosink_element_overlay, "general:videosink element x", DEFAULT_VIDEOSINK_OVERLAY);
MMPLAYER_INI_GET_STRING(dict, ini->videosink_element_evas, "general:videosink element evas", DEFAULT_VIDEOSINK_EVAS);
MMPLAYER_INI_GET_STRING(dict, ini->videosink_element_fake, "general:videosink element fake", DEFAULT_VIDEOSINK_FAKE);
MMPLAYER_INI_GET_STRING(dict, ini->videosink_element_remote, "general:videosink element remote", DEFAULT_VIDEOSINK_REMOTE);
@@ -217,9 +217,11 @@ mm_player_ini_load(mm_player_ini_t* ini)
/* general */
ini->disable_segtrap = DEFAULT_DISABLE_SEGTRAP;
ini->skip_rescan = DEFAULT_SKIP_RESCAN;
- strncpy( ini->videosink_element_x, DEFAULT_VIDEOSINK_X, PLAYER_INI_MAX_STRLEN - 1 );
+ strncpy( ini->videosink_element_overlay, DEFAULT_VIDEOSINK_OVERLAY, PLAYER_INI_MAX_STRLEN - 1 );
strncpy( ini->videosink_element_evas, DEFAULT_VIDEOSINK_EVAS, PLAYER_INI_MAX_STRLEN - 1 );
strncpy( ini->videosink_element_fake, DEFAULT_VIDEOSINK_FAKE, PLAYER_INI_MAX_STRLEN - 1 );
+ strncpy( ini->videosink_element_remote, DEFAULT_VIDEOSINK_REMOTE, PLAYER_INI_MAX_STRLEN - 1 );
+ strncpy( ini->videosrc_element_remote, DEFAULT_VIDEOSRC_REMOTE, PLAYER_INI_MAX_STRLEN - 1 );
ini->generate_dot = DEFAULT_GENERATE_DOT;
ini->use_system_clock = DEFAULT_USE_SYSTEM_CLOCK;
ini->live_state_change_timeout = DEFAULT_LIVE_STATE_CHANGE_TIMEOUT;
@@ -262,9 +264,11 @@ mm_player_ini_load(mm_player_ini_t* ini)
/* general */
LOGD("disable segtrap : %d\n", ini->disable_segtrap);
LOGD("skip rescan : %d\n", ini->skip_rescan);
- LOGD("videosink element x: %s\n", ini->videosink_element_x);
+ LOGD("videosink element x: %s\n", ini->videosink_element_overlay);
LOGD("videosink element evas: %s\n", ini->videosink_element_evas);
LOGD("videosink element fake: %s\n", ini->videosink_element_fake);
+ LOGD("videosink element remote: %s\n", ini->videosink_element_remote);
+ LOGD("videosrc element remote: %s\n", ini->videosrc_element_remote);
LOGD("video converter element : %s\n", ini->videoconverter_element);
LOGD("audio resampler element : %s\n", ini->audioresampler_element);
LOGD("audiosink element : %s\n", ini->audiosink_element);
diff --git a/src/server/mm_player_priv.c b/src/server/mm_player_priv.c
index a72c36d..5661644 100644
--- a/src/server/mm_player_priv.c
+++ b/src/server/mm_player_priv.c
@@ -4238,7 +4238,7 @@ _mmplayer_update_video_param(mm_player_t* player) // @
}
/* if xvimagesink */
- if (!strcmp(player->ini.videosink_element_x,"xvimagesink"))
+ if (!strcmp(player->ini.videosink_element_overlay,"xvimagesink"))
{
mm_attrs_get_int_by_name(attrs, "display_force_aspect_ration", &force_aspect_ratio);
mm_attrs_get_int_by_name(attrs, "display_method", &display_method);
@@ -4451,7 +4451,7 @@ _mmplayer_update_video_param(mm_player_t* player) // @
gboolean visible = TRUE;
/* if xvimagesink */
- if (strcmp(player->ini.videosink_element_x,"xvimagesink"))
+ if (strcmp(player->ini.videosink_element_overlay,"xvimagesink"))
{
LOGE("videosink is not xvimagesink");
return MM_ERROR_PLAYER_INTERNAL;
@@ -5496,7 +5496,7 @@ __mmplayer_gst_create_video_filters(mm_player_t* player, GList** bucket, gboolea
}
else /* sw codec, if player use libav, waylandsink need videoconvert to render shm wl-buffer which support RGB only */
{
- if ((surface_type == MM_DISPLAY_SURFACE_X) && (!strncmp(player->ini.videosink_element_x, "waylandsink", strlen(player->ini.videosink_element_x))))
+ if ((surface_type == MM_DISPLAY_SURFACE_X) && (!strncmp(player->ini.videosink_element_overlay, "waylandsink", strlen(player->ini.videosink_element_overlay))))
{
video_csc = "videoconvert";
}
@@ -5610,8 +5610,8 @@ __mmplayer_gst_create_video_pipeline(mm_player_t* player, GstCaps* caps, MMDispl
switch (surface_type)
{
case MM_DISPLAY_SURFACE_X:
- if (strlen(player->ini.videosink_element_x) > 0)
- videosink_element = player->ini.videosink_element_x;
+ if (strlen(player->ini.videosink_element_overlay) > 0)
+ videosink_element = player->ini.videosink_element_overlay;
else
goto ERROR;
break;
@@ -5627,7 +5627,7 @@ __mmplayer_gst_create_video_pipeline(mm_player_t* player, GstCaps* caps, MMDispl
mm_attrs_get_data_by_name(attrs, "display_overlay", &pixmap_id_cb);
if (pixmap_id_cb) /* this is used for the videoTextue(canvasTexture) overlay */
{
- videosink_element = player->ini.videosink_element_x;
+ videosink_element = player->ini.videosink_element_overlay;
}
else
{
@@ -14930,7 +14930,7 @@ int _mmplayer_change_videosink(MMHandleType handle, MMDisplaySurfaceType surface
}
else if (!strncmp(cur_videosink_name, "evas", 4) && (surface_type == MM_DISPLAY_SURFACE_X) )
{
- ret = __mmplayer_do_change_videosink(player, MMPLAYER_M_DEC1+i, player->ini.videosink_element_x, surface_type, display_overlay);
+ ret = __mmplayer_do_change_videosink(player, MMPLAYER_M_DEC1+i, player->ini.videosink_element_overlay, surface_type, display_overlay);
if (ret)
{
goto ERROR_CASE;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 12:31:57 +0000