87 lines
2.5 KiB
Diff
87 lines
2.5 KiB
Diff
From 53d727ad0b15fad18df7a4f7513da2aa74932b25 Mon Sep 17 00:00:00 2001
|
|
From: Jeffy Chen <jeffy.chen@rock-chips.com>
|
|
Date: Fri, 14 Jun 2019 12:02:05 +0800
|
|
Subject: [PATCH 06/14] playbin2: Add preferred audio/video sink
|
|
|
|
Using env "PLAYBIN2_PREFERRED_VIDEOSINK" and
|
|
"PLAYBIN2_PREFERRED_AUDIOSINK".
|
|
|
|
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
|
|
---
|
|
gst/playback/gstplaybin2.c | 31 +++++++++++++++++++++++++++++++
|
|
1 file changed, 31 insertions(+)
|
|
|
|
diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
|
|
index cbd8e08..8561792 100644
|
|
--- a/gst/playback/gstplaybin2.c
|
|
+++ b/gst/playback/gstplaybin2.c
|
|
@@ -204,6 +204,7 @@
|
|
#include "config.h"
|
|
#endif
|
|
|
|
+#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <gst/gst.h>
|
|
|
|
@@ -480,6 +481,9 @@ struct _GstPlayBin
|
|
GList *contexts;
|
|
|
|
gboolean is_live;
|
|
+
|
|
+ const gchar *apreferred;
|
|
+ const gchar *vpreferred;
|
|
};
|
|
|
|
struct _GstPlayBinClass
|
|
@@ -1585,6 +1589,9 @@ gst_play_bin_init (GstPlayBin * playbin)
|
|
|
|
playbin->multiview_mode = GST_VIDEO_MULTIVIEW_FRAME_PACKING_NONE;
|
|
playbin->multiview_flags = GST_VIDEO_MULTIVIEW_FLAGS_NONE;
|
|
+
|
|
+ playbin->apreferred = g_getenv ("PLAYBIN2_PREFERRED_AUDIOSINK");
|
|
+ playbin->vpreferred = g_getenv ("PLAYBIN2_PREFERRED_VIDEOSINK");
|
|
}
|
|
|
|
static void
|
|
@@ -4702,6 +4709,7 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad,
|
|
GSequence *ave_seq = NULL;
|
|
GSequenceIter *seq_iter;
|
|
gboolean created_sink = FALSE;
|
|
+ const gchar *preferred = NULL;
|
|
|
|
playbin = group->playbin;
|
|
|
|
@@ -4764,6 +4772,29 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad,
|
|
ave_list = g_list_prepend (ave_list, NULL);
|
|
}
|
|
|
|
+ if (isaudiodec)
|
|
+ preferred = playbin->apreferred;
|
|
+ else if (isvideodec)
|
|
+ preferred = playbin->vpreferred;
|
|
+
|
|
+ if (preferred) {
|
|
+ for (l = ave_list; l; l = l->next) {
|
|
+ ave = (GstAVElement *) l->data;
|
|
+
|
|
+ if (ave && ave->sink &&
|
|
+ !strcmp (preferred, GST_OBJECT_NAME (ave->sink))) {
|
|
+ GST_DEBUG_OBJECT (playbin,
|
|
+ "Preferred sink '%s' for decoder '%s'",
|
|
+ gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (ave->sink)),
|
|
+ gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory)));
|
|
+
|
|
+ ave_list = g_list_delete_link (ave_list, l);
|
|
+ ave_list = g_list_prepend (ave_list, ave);
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
/* if it is a decoder and we don't have a fixed sink, then find out
|
|
* the matching audio/video sink from GstAVElements list */
|
|
for (l = ave_list; l; l = l->next) {
|
|
--
|
|
2.20.1
|
|
|