mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 00:31:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegdemux: namespace fixes

Browse source
This commit is contained in:
Tim-Philipp Müller 2013-09-02 23:36:43 +01:00 committed by Tim-Philipp Müller
parent d5c7a09a83
commit 2a93e71e67
3 changed files with 210 additions and 214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

362
gst/mpegdemux/gstmpegdemux.c
View file

File diff suppressed because it is too large Load diff

60
gst/mpegdemux/gstmpegdemux.h
View file

@ -42,8 +42,8 @@
* Jan Schmidt <thaytan@noraisin.net> * Jan Schmidt <thaytan@noraisin.net>
*/ */
#ifndef __GST_FLUPS_DEMUX_H__ #ifndef __GST_PS_DEMUX_H__
#define __GST_FLUPS_DEMUX_H__ #define __GST_PS_DEMUX_H__
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstadapter.h> #include <gst/base/gstadapter.h>
@ -53,39 +53,39 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_FLUPS_DEMUX (gst_flups_demux_get_type()) #define GST_TYPE_PS_DEMUX (gst_ps_demux_get_type())
#define GST_FLUPS_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_FLUPS_DEMUX,GstFluPSDemux)) #define GST_PS_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PS_DEMUX,GstPsDemux))
#define GST_FLUPS_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FLUPS_DEMUX,GstFluPSDemuxClass)) #define GST_PS_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PS_DEMUX,GstPsDemuxClass))
#define GST_FLUPS_DEMUX_GET_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS((klass),GST_TYPE_FLUPS_DEMUX,GstFluPSDemuxClass)) #define GST_PS_DEMUX_GET_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS((klass),GST_TYPE_PS_DEMUX,GstPsDemuxClass))
#define GST_IS_FLUPS_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FLUPS_DEMUX)) #define GST_IS_PS_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PS_DEMUX))
#define GST_IS_FLUPS_DEMUX_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FLUPS_DEMUX)) #define GST_IS_PS_DEMUX_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PS_DEMUX))
typedef struct _GstFluPSStream GstFluPSStream; typedef struct _GstPsStream GstPsStream;
typedef struct _GstFluPSDemux GstFluPSDemux; typedef struct _GstPsDemux GstPsDemux;
typedef struct _GstFluPSDemuxClass GstFluPSDemuxClass; typedef struct _GstPsDemuxClass GstPsDemuxClass;
#define GST_FLUPS_DEMUX_MAX_STREAMS 256 #define GST_PS_DEMUX_MAX_STREAMS 256
#define GST_FLUPS_DEMUX_MAX_PSM 256 #define GST_PS_DEMUX_MAX_PSM 256
#define MAX_DVD_AUDIO_STREAMS 8 #define MAX_DVD_AUDIO_STREAMS 8
#define MAX_DVD_SUBPICTURE_STREAMS 32 #define MAX_DVD_SUBPICTURE_STREAMS 32
typedef enum typedef enum
{ {
GST_FLUPS_DEMUX_SYNC_AUTO = 0, GST_PS_DEMUX_SYNC_AUTO = 0,
GST_FLUPS_DEMUX_SYNC_SCR = 1, GST_PS_DEMUX_SYNC_SCR = 1,
GST_FLUPS_DEMUX_SYNC_DTS = 2 GST_PS_DEMUX_SYNC_DTS = 2
} GstFluPSDemuxSync; } GstPsDemuxSync;
typedef enum typedef enum
{ {
STATE_FLUPS_DEMUX_NEED_SYNC, STATE_PS_DEMUX_NEED_SYNC,
STATE_FLUPS_DEMUX_SYNCED, STATE_PS_DEMUX_SYNCED,
STATE_FLUPS_DEMUX_NEED_MORE_DATA, STATE_PS_DEMUX_NEED_MORE_DATA,
} GstFluPSDemuxState; } GstPsDemuxState;
/* Information associated with a single FluPS stream. */ /* Information associated with a single FluPS stream. */
struct _GstFluPSStream struct _GstPsStream
{ {
GstPad *pad; GstPad *pad;
@ -102,7 +102,7 @@ struct _GstFluPSStream
GstTagList *pending_tags; GstTagList *pending_tags;
}; };
struct _GstFluPSDemux struct _GstPsDemux
{ {
GstElement parent; GstElement parent;
@ -137,18 +137,18 @@ struct _GstFluPSDemux
guint64 first_pts; guint64 first_pts;
guint64 last_pts; guint64 last_pts;
gint16 psm[GST_FLUPS_DEMUX_MAX_PSM]; gint16 psm[GST_PS_DEMUX_MAX_PSM];
GstSegment sink_segment; GstSegment sink_segment;
GstSegment src_segment; GstSegment src_segment;
gboolean adjust_segment; gboolean adjust_segment;
/* stream output */ /* stream output */
GstFluPSStream *current_stream; GstPsStream *current_stream;
guint64 next_pts; guint64 next_pts;
guint64 next_dts; guint64 next_dts;
GstFluPSStream **streams; GstPsStream **streams;
GstFluPSStream **streams_found; GstPsStream **streams_found;
gint found_count; gint found_count;
gboolean need_no_more_pads; gboolean need_no_more_pads;
@ -158,7 +158,7 @@ struct _GstFluPSDemux
gboolean is_mpeg2_pack; gboolean is_mpeg2_pack;
}; };
struct _GstFluPSDemuxClass struct _GstPsDemuxClass
{ {
GstElementClass parent_class; GstElementClass parent_class;
@ -169,7 +169,7 @@ struct _GstFluPSDemuxClass
GstPadTemplate *private_template; GstPadTemplate *private_template;
}; };
GType gst_flups_demux_get_type (void); GType gst_ps_demux_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GST_FLUPS_DEMUX_H__ */ #endif /* __GST_PS_DEMUX_H__ */

2
gst/mpegdemux/plugin.c
View file

@ -56,7 +56,7 @@ plugin_init (GstPlugin * plugin)
"MPEG-PS PES filter"); "MPEG-PS PES filter");
if (!gst_element_register (plugin, "mpegpsdemux", GST_RANK_PRIMARY, if (!gst_element_register (plugin, "mpegpsdemux", GST_RANK_PRIMARY,
GST_TYPE_FLUPS_DEMUX)) GST_TYPE_PS_DEMUX))
return FALSE; return FALSE;
return TRUE; return TRUE;