Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gst-plugins-base
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
George Kiagiadakis
gst-plugins-base
Commits
dcd42227
Commit
dcd42227
authored
Dec 31, 2010
by
Tim-Philipp Müller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playbin2: use input-selector from core instead of internal copy
parent
cfe8ffdf
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
3 additions
and
1556 deletions
+3
-1556
configure.ac
configure.ac
+1
-1
gst/playback/Makefile.am
gst/playback/Makefile.am
+0
-2
gst/playback/gstinputselector.c
gst/playback/gstinputselector.c
+0
-1459
gst/playback/gstinputselector.h
gst/playback/gstinputselector.h
+0
-84
gst/playback/gstplay-marshal.list
gst/playback/gstplay-marshal.list
+0
-2
gst/playback/gstplaybin2.c
gst/playback/gstplaybin2.c
+2
-8
No files found.
configure.ac
View file @
dcd42227
...
...
@@ -60,7 +60,7 @@ AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
dnl *** required versions of GStreamer stuff ***
GST_REQ=0.10.31
GST_REQ=0.10.31
.1
dnl *** autotools stuff ****
...
...
gst/playback/Makefile.am
View file @
dcd42227
...
...
@@ -17,7 +17,6 @@ libgstplaybin_la_SOURCES = \
gstplaysink.c
\
gstplaybasebin.c
\
gstplay-enum.c
\
gstinputselector.c
\
gststreaminfo.c
\
gststreamselector.c
\
gstsubtitleoverlay.c
\
...
...
@@ -56,7 +55,6 @@ noinst_HEADERS = \
gstplaybasebin.h
\
gstplaysink.h
\
gststreaminfo.h
\
gstinputselector.h
\
gstplay-enum.h
\
gststreamselector.h
\
gstrawcaps.h
\
...
...
gst/playback/gstinputselector.c
deleted
100644 → 0
View file @
cfe8ffdf
This diff is collapsed.
Click to expand it.
gst/playback/gstinputselector.h
deleted
100644 → 0
View file @
cfe8ffdf
/* GStreamer
* Copyright (C) 2003 Julien Moutte <julien@moutte.net>
* Copyright (C) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* Copyright (C) 2008 Nokia Corporation. (contact <stefan.kost@nokia.com>)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GST_INPUT_SELECTOR_H__
#define __GST_INPUT_SELECTOR_H__
#include <gst/gst.h>
G_BEGIN_DECLS
#define GST_TYPE_INPUT_SELECTOR \
(gst_input_selector_get_type())
#define GST_INPUT_SELECTOR(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_INPUT_SELECTOR, GstInputSelector))
#define GST_INPUT_SELECTOR_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_INPUT_SELECTOR, GstInputSelectorClass))
#define GST_IS_INPUT_SELECTOR(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_INPUT_SELECTOR))
#define GST_IS_INPUT_SELECTOR_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_INPUT_SELECTOR))
typedef
struct
_GstInputSelector
GstInputSelector
;
typedef
struct
_GstInputSelectorClass
GstInputSelectorClass
;
#define GST_INPUT_SELECTOR_GET_LOCK(sel) (((GstInputSelector*)(sel))->lock)
#define GST_INPUT_SELECTOR_GET_COND(sel) (((GstInputSelector*)(sel))->cond)
#define GST_INPUT_SELECTOR_LOCK(sel) (g_mutex_lock (GST_INPUT_SELECTOR_GET_LOCK(sel)))
#define GST_INPUT_SELECTOR_UNLOCK(sel) (g_mutex_unlock (GST_INPUT_SELECTOR_GET_LOCK(sel)))
#define GST_INPUT_SELECTOR_WAIT(sel) (g_cond_wait (GST_INPUT_SELECTOR_GET_COND(sel), \
GST_INPUT_SELECTOR_GET_LOCK(sel)))
#define GST_INPUT_SELECTOR_BROADCAST(sel) (g_cond_broadcast (GST_INPUT_SELECTOR_GET_COND(sel)))
struct
_GstInputSelector
{
GstElement
element
;
GstPad
*
srcpad
;
GstPad
*
active_sinkpad
;
guint
n_pads
;
guint
padcount
;
GstSegment
segment
;
/* the output segment */
gboolean
pending_close
;
/* if we should push a close first */
GMutex
*
lock
;
GCond
*
cond
;
gboolean
blocked
;
gboolean
flushing
;
/* select all mode, send data from all input pads forward */
gboolean
select_all
;
};
struct
_GstInputSelectorClass
{
GstElementClass
parent_class
;
gint64
(
*
block
)
(
GstInputSelector
*
self
);
void
(
*
switch_
)
(
GstInputSelector
*
self
,
GstPad
*
pad
,
gint64
stop_time
,
gint64
start_time
);
};
GType
gst_input_selector_get_type
(
void
);
G_END_DECLS
#endif
/* __GST_INPUT_SELECTOR_H__ */
gst/playback/gstplay-marshal.list
View file @
dcd42227
...
...
@@ -8,5 +8,3 @@ BOXED:OBJECT,BOXED,BOXED
BOXED:INT
OBJECT:BOXED
OBJECT:INT
INT64:VOID
VOID:OBJECT,INT64,INT64
gst/playback/gstplaybin2.c
View file @
dcd42227
...
...
@@ -230,7 +230,6 @@
#include "gstplay-marshal.h"
#include "gstplayback.h"
#include "gstplaysink.h"
#include "gstinputselector.h"
#include "gstsubtitleoverlay.h"
GST_DEBUG_CATEGORY_STATIC
(
gst_play_bin_debug
);
...
...
@@ -2456,11 +2455,8 @@ pad_added_cb (GstElement * decodebin, GstPad * pad, GstSourceGroup * group)
GST_SOURCE_GROUP_LOCK
(
group
);
if
(
select
->
selector
==
NULL
&&
playbin
->
have_selector
)
{
/* no selector, create one */
GST_DEBUG_OBJECT
(
playbin
,
"creating new selector"
);
select
->
selector
=
g_object_new
(
GST_TYPE_INPUT_SELECTOR
,
NULL
);
/* the above can't fail, but we keep the error handling around for when
* the selector plugin has moved to -base or -good and we stop using an
* internal copy of input-selector */
GST_DEBUG_OBJECT
(
playbin
,
"creating new input selector"
);
select
->
selector
=
gst_element_factory_make
(
"input-selector"
,
NULL
);
if
(
select
->
selector
==
NULL
)
{
/* post the missing selector message only once */
playbin
->
have_selector
=
FALSE
;
...
...
@@ -3621,8 +3617,6 @@ gst_play_bin2_plugin_init (GstPlugin * plugin)
{
GST_DEBUG_CATEGORY_INIT
(
gst_play_bin_debug
,
"playbin2"
,
0
,
"play bin"
);
g_type_class_ref
(
gst_input_selector_get_type
());
return
gst_element_register
(
plugin
,
"playbin2"
,
GST_RANK_NONE
,
GST_TYPE_PLAY_BIN
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment