gstplay: avoid getting property of playbin2 if subtitle_sid is null
authorElliot Chen <elliot.chen@nxp.com>
Thu, 2 Mar 2023 10:09:54 +0000 (18:09 +0800)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Wed, 17 May 2023 19:22:28 +0000 (19:22 +0000)
 There is a probability of getting "current-text" property
 when play with playbin3, and this property is available
 only in playbin2.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4661>

subprojects/gst-plugins-bad/gst-libs/gst/play/gstplay.c

index f99bbe1..c88d8e9 100644 (file)
@@ -1762,9 +1762,11 @@ gst_play_subtitle_info_update (GstPlay * self, GstPlayStreamInfo * stream_info)
 
       g_object_get (G_OBJECT (self->playbin), "current-suburi", &suburi, NULL);
       if (suburi) {
-        if (self->use_playbin3 && self->subtitle_sid) {
-          if (g_str_equal (self->subtitle_sid, stream_info->stream_id))
+        if (self->use_playbin3) {
+          if (self->subtitle_sid &&
+              g_str_equal (self->subtitle_sid, stream_info->stream_id)) {
             info->language = g_path_get_basename (suburi);
+          }
         } else {
           g_object_get (G_OBJECT (self->playbin), "current-text", &text_index,
               NULL);