[0.6.53] delete dead code about textoverlay

Change-Id: I63cc22b950753b8535f8cb713ba02f6c48174b33

diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index 89785bcdd0e36a4958848e440e0f7f90176b3fb4..0e9e8070dcb04fb7ccd1da58eec72b42b7fa88fe 100644 (file)
--- 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.52
+Version:    0.6.53
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/include/mm_player_priv.h b/src/include/mm_player_priv.h
index 472475b2bf2284ea65890fcae72d262b4cacc242..3204604d39f3f599a4480ea9d4fceb8ef13a5707 100644 (file)
--- a/src/include/mm_player_priv.h
+++ b/src/include/mm_player_priv.h
@@ -694,7 +694,6 @@ typedef struct {
        gboolean keep_detecting_vcodec;
 
        gboolean play_subtitle;
-       gboolean use_textoverlay;
        gboolean is_subtitle_force_drop;        // set TRUE after bus_cb get EOS
 
        /* PD downloader message callback and param */

diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c
index a01e72d61cf1203695021443a9285344e3861021..e08c0729966996cf2738416c5bf15ba9e84ec360 100644 (file)
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -3576,43 +3576,6 @@ __mmplayer_gst_decode_callback(GstElement *elem, GstPad *pad, gpointer data) //
                mm_attrs_set_int_by_name(attrs, "content_video_track_num", 1);
                player->videosink_linked  = 1;
 
-               /* NOTE : intermediate code before doing H/W subtitle compositon */
-               if (player->use_textoverlay && player->play_subtitle) {
-                       LOGD("using textoverlay for external subtitle");
-                       /* check text bin has created well */
-                       if (player->pipeline && player->pipeline->textbin) {
-                               /* get sinkpad from textoverlay */
-                               sinkpad = gst_element_get_static_pad(
-                                       GST_ELEMENT(player->pipeline->textbin[MMPLAYER_T_BIN].gst),
-                                       "video_sink");
-                               if (!sinkpad) {
-                                       LOGE("failed to get sink pad from textoverlay");
-                                       goto ERROR;
-                               }
-
-                               /* link new pad with textoverlay first */
-                               if (GST_PAD_LINK_OK != GST_PAD_LINK(pad, sinkpad)) {
-                                       LOGE("failed to get pad from sinkbin\n");
-                                       goto ERROR;
-                               }
-
-                               gst_object_unref(sinkpad);
-                               sinkpad = NULL;
-
-                               /* alright, override pad to textbin.src for futher link */
-                               pad = gst_element_get_static_pad(
-                                       GST_ELEMENT(player->pipeline->textbin[MMPLAYER_T_BIN].gst),
-                                       "src");
-                               if (!pad) {
-                                       LOGE("failed to get sink pad from textoverlay");
-                                       goto ERROR;
-                               }
-                       } else {
-                               LOGE("should not reach here.");
-                               goto ERROR;
-                       }
-               }
-
                sinkpad = gst_element_get_static_pad(GST_ELEMENT(sinkbin), "sink");
                if (!sinkpad) {
                        LOGE("failed to get pad from sinkbin\n");
@@ -5581,6 +5544,7 @@ static int __mmplayer_gst_create_text_sink_bin(mm_player_t* player)
 {
        MMPlayerGstElement *textbin = NULL;
        GList *element_bucket = NULL;
+       int surface_type = 0;
        gint i = 0;
 
        MMPLAYER_FENTER();
@@ -5606,51 +5570,20 @@ static int __mmplayer_gst_create_text_sink_bin(mm_player_t* player)
        player->pipeline->textbin = textbin;
 
        /* fakesink */
-       if (player->use_textoverlay) {
-               LOGD("use textoverlay for displaying \n");
-
-               MMPLAYER_CREATE_ELEMENT_ADD_BIN(textbin, MMPLAYER_T_QUEUE, "queue", "text_t_queue", textbin[MMPLAYER_T_BIN].gst, player);
-
-               MMPLAYER_CREATE_ELEMENT_ADD_BIN(textbin, MMPLAYER_T_VIDEO_QUEUE, "queue", "text_v_queue", textbin[MMPLAYER_T_BIN].gst, player);
-
-               MMPLAYER_CREATE_ELEMENT_ADD_BIN(textbin, MMPLAYER_T_VIDEO_CONVERTER, "fimcconvert", "text_v_converter", textbin[MMPLAYER_T_BIN].gst, player);
-
-               MMPLAYER_CREATE_ELEMENT_ADD_BIN(textbin, MMPLAYER_T_OVERLAY, "textoverlay", "text_overlay", textbin[MMPLAYER_T_BIN].gst, player);
-
-               if (!gst_element_link_pads(textbin[MMPLAYER_T_VIDEO_QUEUE].gst, "src", textbin[MMPLAYER_T_VIDEO_CONVERTER].gst, "sink")) {
-                       LOGE("failed to link queue and converter\n");
-                       goto ERROR;
-               }
-
-               if (!gst_element_link_pads(textbin[MMPLAYER_T_VIDEO_CONVERTER].gst, "src", textbin[MMPLAYER_T_OVERLAY].gst, "video_sink")) {
-                       LOGE("failed to link queue and textoverlay\n");
-                       goto ERROR;
-               }
-
-               if (!gst_element_link_pads(textbin[MMPLAYER_T_QUEUE].gst, "src", textbin[MMPLAYER_T_OVERLAY].gst, "text_sink")) {
-                       LOGE("failed to link queue and textoverlay\n");
+       mm_attrs_get_int_by_name(player->attrs, "display_surface_type", &surface_type);
+       LOGD("surface type for subtitle : %d", surface_type);
+       switch (surface_type) {
+       case MM_DISPLAY_SURFACE_OVERLAY:
+       case MM_DISPLAY_SURFACE_NULL:
+       case MM_DISPLAY_SURFACE_REMOTE:
+               if (__mmplayer_gst_create_plain_text_elements(player) != MM_ERROR_NONE) {
+                       LOGE("failed to make plain text elements\n");
                        goto ERROR;
                }
-       } else {
-               int surface_type = 0;
-
-               LOGD("use subtitle message for displaying \n");
-
-               mm_attrs_get_int_by_name(player->attrs, "display_surface_type", &surface_type);
-
-               switch (surface_type) {
-               case MM_DISPLAY_SURFACE_OVERLAY:
-               case MM_DISPLAY_SURFACE_NULL:
-               case MM_DISPLAY_SURFACE_REMOTE:
-                       if (__mmplayer_gst_create_plain_text_elements(player) != MM_ERROR_NONE) {
-                               LOGE("failed to make plain text elements\n");
-                               goto ERROR;
-                       }
-                       break;
-
-               default:
-                       break;
-               }
+               break;
+       default:
+               goto ERROR;
+               break;
        }
 
        MMPLAYER_FLEAVE();
@@ -5689,6 +5622,7 @@ ERROR:
        MMPLAYER_FREEIF(player->pipeline->textbin);
        player->pipeline->textbin = NULL;
 
+       MMPLAYER_FLEAVE();
        return MM_ERROR_PLAYER_INTERNAL;
 }
 
@@ -8568,7 +8502,6 @@ _mmplayer_create_player(MMHandleType handle) // @
        player->playback_rate = DEFAULT_PLAYBACK_RATE;
 
        player->play_subtitle = FALSE;
-       player->use_textoverlay = FALSE;
        player->play_count = 0;
        player->use_decodebin = TRUE;
        player->ignore_asyncdone = FALSE;
@@ -11197,7 +11130,6 @@ __mmplayer_initialize_next_play(mm_player_t *player)
        player->max_audio_channels = 0;
        player->is_subtitle_force_drop = FALSE;
        player->play_subtitle = FALSE;
-       player->use_textoverlay = FALSE;
        player->adjust_subtitle_pos = 0;
 
        player->updated_bitrate_count = 0;
@@ -12283,7 +12215,6 @@ __mmplayer_release_misc(mm_player_t* player)
        player->sound_focus.acquired = FALSE;
        player->is_subtitle_force_drop = FALSE;
        player->play_subtitle = FALSE;
-       player->use_textoverlay = FALSE;
        player->adjust_subtitle_pos = 0;
        player->last_multiwin_status = FALSE;
        player->has_closed_caption = FALSE;
@@ -13558,7 +13489,7 @@ __gst_send_event_to_sink(mm_player_t* player, GstEvent* event)
                }
        }
 
-       if (player->play_subtitle && !player->use_textoverlay)
+       if (player->play_subtitle)
                event2 = gst_event_copy((const GstEvent *)event);
 
        sinks = player->sink_elements;
@@ -13610,7 +13541,7 @@ __gst_send_event_to_sink(mm_player_t* player, GstEvent* event)
        /* Note : Textbin is not linked to the video or audio bin.
         * It needs to send the event to the text sink seperatelly.
         */
-        if (player->play_subtitle && !player->use_textoverlay) {
+        if (player->play_subtitle) {
                GstElement *text_sink = GST_ELEMENT_CAST(player->pipeline->textbin[MMPLAYER_T_FAKE_SINK].gst);
 
                if (GST_IS_ELEMENT(text_sink)) {