Commit 2162ffbb authored by Lori Anderson's avatar Lori Anderson

Removed use of passthru, use gstreamer provided element "identity" instead.

parent 2406e300
......@@ -81,7 +81,7 @@ static gboolean g_create_dot = FALSE;
static GstElement* g_sink = NULL;
static GstElement* g_pipeline = NULL;
static GstElement* g_passthru = NULL;
static GstElement* g_identity = NULL;
static GstElement* g_tee = NULL;
static GstElement* g_queue = NULL;
static GstElement* g_mpeg2dec = NULL;
......@@ -510,7 +510,7 @@ static GstElement* create_playbin_pipeline()
*/
static GstElement* create_simple_pipeline()
{
GstElement* passthru;
GstElement* identity;
// Create gstreamer elements
GstElement* pipeline = gst_pipeline_new("simple-pipeline");
......@@ -543,11 +543,11 @@ static GstElement* create_simple_pipeline()
g_object_set(G_OBJECT(src), "uri", g_uri, NULL);
}
// Create passthru element
passthru = gst_element_factory_make ("passthru", "passthru");
if (!passthru)
// Create identity element
identity = gst_element_factory_make ("identity", "identity");
if (!identity)
{
g_printerr ("passthru element could not be created.\n");
g_printerr ("identity element could not be created.\n");
return NULL;
}
......@@ -561,13 +561,11 @@ static GstElement* create_simple_pipeline()
// Add all elements into the pipeline
gst_bin_add_many (GST_BIN (pipeline),
src, passthru, sink,
src, identity, sink,
NULL);
// Link the elements together
//if (!gst_element_link_many (src, passthru, sink,
if (!gst_element_link_many (src, sink,
NULL))
if (!gst_element_link_many (src, identity, sink, NULL))
{
g_printerr ("Problems linking elements together\n");
return NULL;
......@@ -659,15 +657,15 @@ static gboolean create_manual_bin_pipeline(GstElement* pipeline)
g_print("%s() - set uri decode bin uri: %s\n", __FUNCTION__, g_uri);
// Create diagnostic element
g_passthru = gst_element_factory_make ("passthru", "diagnostic-pt");
if (!g_passthru)
g_identity = gst_element_factory_make ("identity", "identity");
if (!g_identity)
{
g_printerr ("%s() - passthru element could not be created.\n", __FUNCTION__);
g_printerr ("%s() - identity element could not be created.\n", __FUNCTION__);
return FALSE;
}
gst_bin_add_many (GST_BIN (pipeline),
dbin, g_passthru, g_sink,
dbin, g_identity, g_sink,
NULL);
// Add callback to link after source has been selected
......@@ -698,16 +696,16 @@ bin_cb_pad_added (GstElement *dec,
GstPad* d_src_pad;
GstPad* d_sink_pad;
d_src_pad = gst_element_get_static_pad(g_passthru, "src");
d_sink_pad = gst_element_get_static_pad(g_passthru, "sink");
d_src_pad = gst_element_get_static_pad(g_identity, "src");
d_sink_pad = gst_element_get_static_pad(g_identity, "sink");
if (!d_src_pad || !d_sink_pad)
{
g_printerr ("passthru element pads could not be retrieved.\n");
g_printerr ("identity element pads could not be retrieved.\n");
return;
}
if ((gst_pad_is_linked(d_sink_pad)) || (gst_pad_is_linked(d_src_pad)))
{
g_printerr ("passthru element pads already linked\n");
g_printerr ("identity element pads already linked\n");
return;
}
......
#!/bin/sh
#rm ./tmp/*.dot
#
TEST_FILE_URL_PREFIX=file:///home/landerson/gst/git/gst-plugins-cl/dlnasrc/test/
TEST_FILE_URL_PREFIX=file:///home/landerson/gst/git/gst-plugins-cl/test/videos/
export TEST_FILE_URL_PREFIX
#
#RUIH_GST_DTCP_DISABLE=true
......@@ -20,7 +20,7 @@ RUIH_GST_DTCP_DLL=/media/RUIH_RI_2/dtcp_greg/dtcpip_test_nodebug.so
export RUIH_GST_DTCP_KEY_STORAGE
export RUIH_GST_DTCP_DLL
#
GST_DEBUG=*:1,dlnasrc:4,souphttpsrc:4,mpeg2dec:3,tsdemux:4,mpegtsbase:4,mpegtspacketizer:4,dtcpip:5,GST_PADS:1
GST_DEBUG=*:1,dlnasrc:4,souphttpsrc:4,mpeg2dec:3,tsdemux:4,mpegtsbase:4,mpegtspacketizer:4,dtcpip:5,basesrc:4
#uridecodebin:3,filesrc:5,dtcpip:4,playbin:3,passthru:1,\
#basesrc:3,pushsrc:5,baseparse:1,task:1,queue2:2,multiqueue:2,bin:1,\
#mpegtsdemux:4,xvimagesink:3,fakesink:5,structure:1,\
......@@ -36,9 +36,9 @@ export GST_DEBUG_NO_COLOR
#export GST_DEBUG_DUMP_DOT_DIR=tmp
#
gst-git ./general-test host=192.168.2.16 rrid=35 wait=10 rate=2
#gst-git ./general-test file=clock.mpg wait=10 rate=2
#gst-git ./general-test uri=http://10.36.32.195:80/fxi/us.ts
#gst-git ./general-test uri=http://10.36.32.195/fxi/Ultimate-Stream-1280x720-5Mb-mpeg2v-ac3_0100_CC_Trim.ts
#gst-git ./general-test uri=http://192.168.2.16:818/true_lies.mpg
#gst-git ./general-test uri=http://192.168.2.16:8895/resource/1/MEDIA_ITEM/MPEG_TS_SD_KO_ISO-0/ORIGINAL
#gst-git ./general-test uri=http://dveo.com/downloads/TS-sample-files/San_Diego_Clip.ts
#gst-git ./general-test uri=http://192.168.0.106:60656/mal/I/AM2/1.mpeg
......@@ -48,6 +48,6 @@ gst-git ./general-test host=192.168.2.16 rrid=35 wait=10 rate=2
#rate=8 wait=15 host=192.168.0.106 or 192.168.2.2 pipeline switch position seek file=clock.mpg file=two_videos.mkv file=scte20_7.mpg dtcp byte dot manual_elements
#
# To debug with gdb debugger, use this line
#gdb --args gst-git ./test host=192.168.2.2 rrid=19
#gdb --args gst-git ./test file=0.mpg wait=10 rate=4
#gst-git gdb --args ./test host=192.168.2.2 rrid=19
#gst-git gdb --args ./test file=0.mpg wait=10 rate=4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment