From: Gilbok Lee Date: Fri, 18 May 2018 04:39:01 +0000 (+0900) Subject: [0.6.99] disable max-size-time, use-rate-estimate in queue2 when PD mode X-Git-Tag: submit/tizen_4.0/20180523.102543^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6154ef8909a71c8dfa1e38ba34ced599f1ff0254;p=platform%2Fcore%2Fmultimedia%2Flibmm-player.git [0.6.99] disable max-size-time, use-rate-estimate in queue2 when PD mode Change-Id: I89f2c32007f43191d4a1215f3bbff00f269e6340 --- diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec index 5858801..105741f 100644 --- a/packaging/libmm-player.spec +++ b/packaging/libmm-player.spec @@ -1,6 +1,6 @@ Name: libmm-player Summary: Multimedia Framework Player Library -Version: 0.6.98 +Version: 0.6.99 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/include/mm_player_streaming.h b/src/include/mm_player_streaming.h index 4ea7638..b400b1a 100644 --- a/src/include/mm_player_streaming.h +++ b/src/include/mm_player_streaming.h @@ -129,6 +129,7 @@ typedef struct { gboolean is_buffering; gboolean is_buffering_done; /* get info from bus sync callback */ gboolean is_adaptive_streaming; + gboolean is_pd_mode; gint buffering_percent; diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c index af6d32e..ddccc3d 100644 --- a/src/mm_player_priv.c +++ b/src/mm_player_priv.c @@ -100,6 +100,9 @@ #define ADAPTIVE_VARIANT_DEFAULT_VALUE -1 /* auto */ +/* For PD mode */ +#define PLAYER_PD_EXT_MAX_SIZE_BYTE 1024 * 1024 * 3 + #define PLAYER_BUS_MSG_DEFAULT_TIMEOUT 500 /* bus msg wait timeout */ #define PLAYER_BUS_MSG_PREPARE_TIMEOUT 10 @@ -6835,10 +6838,12 @@ __mmplayer_gst_create_pipeline(mm_player_t* player) pre_buffering_time = (pre_buffering_time > 0) ? (pre_buffering_time) : (player->ini.http_buffering_time); + player->streamer->is_pd_mode = TRUE; + __mm_player_streaming_set_queue2(player->streamer, element, TRUE, - player->ini.http_max_size_bytes + 52428800, // http_max_size_types + 5Mb + player->ini.http_max_size_bytes + PLAYER_PD_EXT_MAX_SIZE_BYTE, pre_buffering_time, 1.0, player->ini.http_buffering_limit, diff --git a/src/mm_player_streaming.c b/src/mm_player_streaming.c index 2e3071f..78e9b0a 100644 --- a/src/mm_player_streaming.c +++ b/src/mm_player_streaming.c @@ -131,9 +131,11 @@ void __mm_player_streaming_initialize(mm_player_streaming_t* streamer) streamer->is_buffering = FALSE; streamer->is_buffering_done = FALSE; streamer->is_adaptive_streaming = FALSE; - streamer->buffering_percent = -1; + streamer->is_pd_mode = FALSE; + streamer->buffering_percent = -1; streamer->ring_buffer_size = DEFAULT_RING_BUFFER_SIZE; + MMPLAYER_FLEAVE(); return; } @@ -164,6 +166,7 @@ void __mm_player_streaming_deinitialize(mm_player_streaming_t* streamer) streamer->is_buffering = FALSE; streamer->is_buffering_done = FALSE; streamer->is_adaptive_streaming = FALSE; + streamer->is_pd_mode = FALSE; streamer->buffering_percent = -1; streamer->ring_buffer_size = DEFAULT_RING_BUFFER_SIZE; @@ -468,7 +471,7 @@ void __mm_player_streaming_set_queue2(mm_player_streaming_t* streamer, if (use_buffering) { streamer->streaming_buffer_type = BUFFER_TYPE_MUXED; - if (content_size > 0) { + if (content_size > 0 || streamer->is_pd_mode) { if (streamer->buffering_req.prebuffer_time > 0) streamer->buffering_req.is_pre_buffering = TRUE; else