mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-26 17:18:15 +00:00
examples/seeking/Makefile.am: Don't compile non-compiling compiled objects with the compiler.
Original commit message from CVS: 2005-08-16 Andy Wingo <wingo@pobox.com> * examples/seeking/Makefile.am: Don't compile non-compiling compiled objects with the compiler. * examples/seeking/seek.c (make_dv_pipeline): Update for new DV elements.
This commit is contained in:
parent
536acc96d9
commit
107da3e93c
7 changed files with 44 additions and 32 deletions
|
@ -1,3 +1,11 @@
|
|||
2005-08-16 Andy Wingo <wingo@pobox.com>
|
||||
|
||||
* examples/seeking/Makefile.am: Don't compile non-compiling
|
||||
compiled objects with the compiler.
|
||||
|
||||
* examples/seeking/seek.c (make_dv_pipeline): Update for new DV
|
||||
elements.
|
||||
|
||||
2005-08-12 Philippe Khalaf <burger@speedy.org>
|
||||
* gst-libs/gst/rtp/gstbasertpdepayload.c:
|
||||
* gst-libs/gst/rtp/gstbasertpdepayload.h:
|
||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit 28e778474e1d40dfb47bbcec0db31dfb9b90db37
|
||||
Subproject commit 8ff526a316f9b576e727b8e32cba0a53cdec07a6
|
|
@ -1,4 +1,4 @@
|
|||
examples = seek cdplayer cdparanoia
|
||||
examples = seek # cdplayer cdparanoia
|
||||
|
||||
noinst_PROGRAMS = $(examples)
|
||||
|
||||
|
|
|
@ -125,42 +125,44 @@ static GstElement *
|
|||
make_dv_pipeline (const gchar * location)
|
||||
{
|
||||
GstElement *pipeline;
|
||||
GstElement *src, *decoder, *audiosink, *videosink;
|
||||
GstElement *src, *demux, *decoder, *audiosink, *videosink;
|
||||
GstElement *a_queue, *v_queue;
|
||||
GstPad *seekable;
|
||||
|
||||
pipeline = gst_pipeline_new ("app");
|
||||
|
||||
src = gst_element_factory_make_or_warn (SOURCE, "src");
|
||||
decoder = gst_element_factory_make_or_warn ("dvdec", "decoder");
|
||||
demux = gst_element_factory_make_or_warn ("dvdemux", "demuxer");
|
||||
v_queue = gst_element_factory_make_or_warn ("queue", "v_queue");
|
||||
videosink = gst_element_factory_make_or_warn (VSINK, "v_sink");
|
||||
decoder = gst_element_factory_make_or_warn ("ffdec_dvvideo", "decoder");
|
||||
videosink = gst_element_factory_make_or_warn ("xvimagesink", "v_sink");
|
||||
a_queue = gst_element_factory_make_or_warn ("queue", "a_queue");
|
||||
audiosink = gst_element_factory_make_or_warn (ASINK, "a_sink");
|
||||
audiosink = gst_element_factory_make_or_warn ("alsasink", "a_sink");
|
||||
|
||||
g_object_set (G_OBJECT (src), "location", location, NULL);
|
||||
|
||||
gst_bin_add (GST_BIN (pipeline), src);
|
||||
gst_bin_add (GST_BIN (pipeline), decoder);
|
||||
gst_bin_add (GST_BIN (pipeline), demux);
|
||||
gst_bin_add (GST_BIN (pipeline), a_queue);
|
||||
gst_bin_add (GST_BIN (pipeline), audiosink);
|
||||
gst_bin_add (GST_BIN (pipeline), v_queue);
|
||||
gst_bin_add (GST_BIN (pipeline), decoder);
|
||||
gst_bin_add (GST_BIN (pipeline), videosink);
|
||||
|
||||
gst_element_link (src, decoder);
|
||||
gst_element_link (decoder, a_queue);
|
||||
gst_element_link (src, demux);
|
||||
gst_element_link (a_queue, audiosink);
|
||||
gst_element_link (decoder, v_queue);
|
||||
gst_element_link (v_queue, videosink);
|
||||
gst_element_link (v_queue, decoder);
|
||||
gst_element_link (decoder, videosink);
|
||||
|
||||
seekable = gst_element_get_pad (decoder, "video");
|
||||
setup_dynamic_link (demux, "video", gst_element_get_pad (v_queue, "sink"),
|
||||
NULL);
|
||||
setup_dynamic_link (demux, "audio", gst_element_get_pad (a_queue, "sink"),
|
||||
NULL);
|
||||
|
||||
seekable = gst_element_get_pad (decoder, "src");
|
||||
seekable_pads = g_list_prepend (seekable_pads, seekable);
|
||||
rate_pads = g_list_prepend (rate_pads, seekable);
|
||||
|
||||
seekable = gst_element_get_pad (decoder, "audio");
|
||||
rate_pads = g_list_prepend (rate_pads, seekable);
|
||||
rate_pads = g_list_prepend (rate_pads, gst_element_get_pad (decoder, "sink"));
|
||||
|
||||
return pipeline;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
examples = seek cdplayer cdparanoia
|
||||
examples = seek # cdplayer cdparanoia
|
||||
|
||||
noinst_PROGRAMS = $(examples)
|
||||
|
||||
|
|
|
@ -125,42 +125,44 @@ static GstElement *
|
|||
make_dv_pipeline (const gchar * location)
|
||||
{
|
||||
GstElement *pipeline;
|
||||
GstElement *src, *decoder, *audiosink, *videosink;
|
||||
GstElement *src, *demux, *decoder, *audiosink, *videosink;
|
||||
GstElement *a_queue, *v_queue;
|
||||
GstPad *seekable;
|
||||
|
||||
pipeline = gst_pipeline_new ("app");
|
||||
|
||||
src = gst_element_factory_make_or_warn (SOURCE, "src");
|
||||
decoder = gst_element_factory_make_or_warn ("dvdec", "decoder");
|
||||
demux = gst_element_factory_make_or_warn ("dvdemux", "demuxer");
|
||||
v_queue = gst_element_factory_make_or_warn ("queue", "v_queue");
|
||||
videosink = gst_element_factory_make_or_warn (VSINK, "v_sink");
|
||||
decoder = gst_element_factory_make_or_warn ("ffdec_dvvideo", "decoder");
|
||||
videosink = gst_element_factory_make_or_warn ("xvimagesink", "v_sink");
|
||||
a_queue = gst_element_factory_make_or_warn ("queue", "a_queue");
|
||||
audiosink = gst_element_factory_make_or_warn (ASINK, "a_sink");
|
||||
audiosink = gst_element_factory_make_or_warn ("alsasink", "a_sink");
|
||||
|
||||
g_object_set (G_OBJECT (src), "location", location, NULL);
|
||||
|
||||
gst_bin_add (GST_BIN (pipeline), src);
|
||||
gst_bin_add (GST_BIN (pipeline), decoder);
|
||||
gst_bin_add (GST_BIN (pipeline), demux);
|
||||
gst_bin_add (GST_BIN (pipeline), a_queue);
|
||||
gst_bin_add (GST_BIN (pipeline), audiosink);
|
||||
gst_bin_add (GST_BIN (pipeline), v_queue);
|
||||
gst_bin_add (GST_BIN (pipeline), decoder);
|
||||
gst_bin_add (GST_BIN (pipeline), videosink);
|
||||
|
||||
gst_element_link (src, decoder);
|
||||
gst_element_link (decoder, a_queue);
|
||||
gst_element_link (src, demux);
|
||||
gst_element_link (a_queue, audiosink);
|
||||
gst_element_link (decoder, v_queue);
|
||||
gst_element_link (v_queue, videosink);
|
||||
gst_element_link (v_queue, decoder);
|
||||
gst_element_link (decoder, videosink);
|
||||
|
||||
seekable = gst_element_get_pad (decoder, "video");
|
||||
setup_dynamic_link (demux, "video", gst_element_get_pad (v_queue, "sink"),
|
||||
NULL);
|
||||
setup_dynamic_link (demux, "audio", gst_element_get_pad (a_queue, "sink"),
|
||||
NULL);
|
||||
|
||||
seekable = gst_element_get_pad (decoder, "src");
|
||||
seekable_pads = g_list_prepend (seekable_pads, seekable);
|
||||
rate_pads = g_list_prepend (rate_pads, seekable);
|
||||
|
||||
seekable = gst_element_get_pad (decoder, "audio");
|
||||
rate_pads = g_list_prepend (rate_pads, seekable);
|
||||
rate_pads = g_list_prepend (rate_pads, gst_element_get_pad (decoder, "sink"));
|
||||
|
||||
return pipeline;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
examples = seek cdplayer cdparanoia
|
||||
examples = seek # cdplayer cdparanoia
|
||||
|
||||
noinst_PROGRAMS = $(examples)
|
||||
|
||||
|
|
Loading…
Reference in a new issue