Merge tizen branch into tizen_5.5_devel

Change-Id: Iccf04bb441767f827462a5c01f6abf9984ed8fdf

diff --cc src/include/mm_player_ini.h
Simple merge

diff --cc src/include/mm_player_priv.h
index c2e4443,7ef55bd..b87ba77
--- 1/src/include/mm_player_priv.h
--- 2/src/include/mm_player_priv.h
+++ b/src/include/mm_player_priv.h
@@@ -873,7 -860,7 +861,8 @@@ int _mmplayer_set_replaygain_enabled(MM
  int _mmplayer_is_replaygain_enabled(MMHandleType hplayer, bool *enabled);
  int _mmplayer_set_video_roi_area(MMHandleType hplayer, double scale_x, double scale_y, double scale_width, double scale_height);
  int _mmplayer_get_video_roi_area(MMHandleType hplayer, double *scale_x, double *scale_y, double *scale_width, double *scale_height);
+ int _mmplayer_audio_offload_is_activated(MMHandleType hplayer, bool *activated);
 +int _mmplayer_set_client_pid(MMHandleType hplayer, int pid);
  
  /* internal */
  void _mmplayer_bus_msg_thread_destroy(MMHandleType hplayer);

diff --cc src/include/mm_player_utils.h
index 0255e94,b0f9630..88d33b2
--- 1/src/include/mm_player_utils.h
--- 2/src/include/mm_player_utils.h
+++ b/src/include/mm_player_utils.h
@@@ -302,7 -300,7 +302,8 @@@ gboolean _mmplayer_is_dash_streaming(mm
  gboolean _mmplayer_is_smooth_streaming(mmplayer_t *player);
  gboolean _mmplayer_is_ms_buff_src(mmplayer_t *player);
  gboolean _mmplayer_has_suffix(mmplayer_t *player, const gchar *suffix);
+ gboolean _mmplayer_is_videosink_ready(mmplayer_t *player, int surface_type);
 +gboolean _mmplayer_use_uridecodebin3(mmplayer_t *player);
  
  gboolean _mmplayer_post_message(mmplayer_t *player, enum MMMessageType msgtype, MMMessageParamType *param);
  gboolean _mmplayer_dump_pipeline_state(mmplayer_t *player);

diff --cc src/mm_player_gst.c
index 4eb339f,b2dd971..3312104
--- 1/src/mm_player_gst.c
--- 2/src/mm_player_gst.c
+++ b/src/mm_player_gst.c
@@@ -1027,18 -1003,8 +1004,19 @@@ __mmplayer_gst_check_useful_message(mmp
  
                break;
        }
 +      case GST_MESSAGE_STREAMS_SELECTED:
 +      {
 +              if (!MMPLAYER_USE_URIDECODEBIN3(player))
 +                      break; /* drop msg */
 +
 +              LOGD("GST_MESSAGE_STREAMS_SELECTED");
 +              player->no_more_pad = TRUE;
 +              _mmplayer_pipeline_complete(NULL, player);
 +              retval = TRUE;
 +              break;
 +      }
        default:
+               retval = FALSE;
                break;
        }
  
@@@ -2042,14 -2006,8 +2018,14 @@@ __mmplayer_gst_bus_msg_callback(GstMess
        case GST_MESSAGE_ASYNC_DONE:
                __mmplayer_gst_handle_async_done_message(player, msg);
                break;
 +      case GST_MESSAGE_STREAM_COLLECTION:
 +              LOGD("GST_MESSAGE_STREAM_COLLECTION : %s", GST_ELEMENT_NAME(GST_MESSAGE_SRC(msg)));
 +              break;
 +      case GST_MESSAGE_STREAMS_SELECTED:
 +              LOGD("GST_MESSAGE_STREAMS_SELECTED : %s", GST_ELEMENT_NAME(GST_MESSAGE_SRC(msg)));
 +              break;
  
-       #if 0 /* delete unnecessary logs */
+ #ifdef __DEBUG__
        case GST_MESSAGE_REQUEST_STATE:         LOGD("GST_MESSAGE_REQUEST_STATE"); break;
        case GST_MESSAGE_STEP_START:            LOGD("GST_MESSAGE_STEP_START"); break;
        case GST_MESSAGE_QOS:                           LOGD("GST_MESSAGE_QOS"); break;
@@@ -3939,15 -3712,6 +3913,8 @@@ _mmplayer_gst_build_pipeline(mmplayer_
        MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline &&
                                player->pipeline->mainbin, MM_ERROR_PLAYER_NOT_INITIALIZED);
  
-       /* get profile attribute */
-       attrs = MMPLAYER_GET_ATTRS(player);
-       if (!attrs) {
-               LOGE("failed to get content attribute");
-               return MM_ERROR_PLAYER_INTERNAL;
-       }
- 
 +      mainbin = player->pipeline->mainbin;
 +
        LOGD("uri type %d", player->profile.uri_type);
  
        /* create source element */

diff --cc src/mm_player_ini.c
Simple merge

diff --cc src/mm_player_priv.c
index 0cc1ecc,e80309e..866126f
--- 1/src/mm_player_priv.c
--- 2/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@@ -2569,6 -2478,21 +2472,21 @@@ ERROR
  }
  
  void
 -      __mmplayer_pipeline_complete(NULL, player);
+ __mmplayer_gst_audio_deinterleave_no_more_pads(GstElement* object, gpointer data)
+ {
+       mmplayer_t *player = (mmplayer_t *)data;
+ 
+       MMPLAYER_FENTER();
+       MMPLAYER_RETURN_IF_FAIL(player && player->pipeline && player->pipeline->mainbin);
+ 
+       player->no_more_pad = TRUE;
++      _mmplayer_pipeline_complete(NULL, player);
+ 
+       MMPLAYER_FLEAVE();
+       return;
+ }
+ 
+ void
  __mmplayer_gst_set_pulsesink_property(mmplayer_t *player)
  {
        #define MAX_PROPS_LEN 128

diff --cc src/mm_player_utils.c
Simple merge