FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mpegtsdemux: s/fluts/mpegts

Browse Source 
Change all definitions from fluts to mpegts.
This commit is contained in:
Zaheer Merali 2009-02-19 11:36:45 +00:00
parent b545961383
commit 571d51ac92
9 changed files with 396 additions and 393 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gst/mpegdemux/flumpegdemux.c
View File

@ -62,7 +62,7 @@ plugin_init (GstPlugin * plugin)
if (!gst_flups_demux_plugin_init (plugin)) if (!gst_flups_demux_plugin_init (plugin))
return FALSE; return FALSE;
if (!gst_fluts_demux_plugin_init (plugin)) if (!gst_mpegts_demux_plugin_init (plugin))
return FALSE; return FALSE;
if (!gst_mpegtsparse_plugin_init (plugin)) if (!gst_mpegtsparse_plugin_init (plugin))
return FALSE; return FALSE;

36
gst/mpegdemux/flutspatinfo.c
View File

@ -56,19 +56,19 @@ enum
PROP_PID PROP_PID
}; };
static void fluts_pat_info_set_property (GObject * object, guint prop_id, static void mpegts_pat_info_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * spec); const GValue * value, GParamSpec * spec);
static void fluts_pat_info_get_property (GObject * object, guint prop_id, static void mpegts_pat_info_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * spec); GValue * value, GParamSpec * spec);
GST_BOILERPLATE (FluTsPatInfo, fluts_pat_info, GObject, G_TYPE_OBJECT); GST_BOILERPLATE (MpegTsPatInfo, mpegts_pat_info, GObject, G_TYPE_OBJECT);
FluTsPatInfo * MpegTsPatInfo *
fluts_pat_info_new (guint16 program_no, guint16 pid) mpegts_pat_info_new (guint16 program_no, guint16 pid)
{ {
FluTsPatInfo *info; MpegTsPatInfo *info;
info = g_object_new (FLUTS_TYPE_PAT_INFO, NULL); info = g_object_new (MPEGTS_TYPE_PAT_INFO, NULL);
info->program_no = program_no; info->program_no = program_no;
info->pid = pid; info->pid = pid;
@ -77,17 +77,17 @@ fluts_pat_info_new (guint16 program_no, guint16 pid)
} }
static void static void
fluts_pat_info_base_init (gpointer klass) mpegts_pat_info_base_init (gpointer klass)
{ {
} }
static void static void
fluts_pat_info_class_init (FluTsPatInfoClass * klass) mpegts_pat_info_class_init (MpegTsPatInfoClass * klass)
{ {
GObjectClass *gobject_klass = (GObjectClass *) klass; GObjectClass *gobject_klass = (GObjectClass *) klass;
gobject_klass->set_property = fluts_pat_info_set_property; gobject_klass->set_property = mpegts_pat_info_set_property;
gobject_klass->get_property = fluts_pat_info_get_property; gobject_klass->get_property = mpegts_pat_info_get_property;
g_object_class_install_property (gobject_klass, PROP_PROGRAM_NO, g_object_class_install_property (gobject_klass, PROP_PROGRAM_NO,
g_param_spec_uint ("program-number", "Program Number", g_param_spec_uint ("program-number", "Program Number",
@ -101,29 +101,29 @@ fluts_pat_info_class_init (FluTsPatInfoClass * klass)
} }
static void static void
fluts_pat_info_init (FluTsPatInfo * pat_info, FluTsPatInfoClass * klass) mpegts_pat_info_init (MpegTsPatInfo * pat_info, MpegTsPatInfoClass * klass)
{ {
} }
static void static void
fluts_pat_info_set_property (GObject * object, guint prop_id, mpegts_pat_info_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * spec) const GValue * value, GParamSpec * spec)
{ {
g_return_if_fail (FLUTS_IS_PAT_INFO (object)); g_return_if_fail (MPEGTS_IS_PAT_INFO (object));
/* No settable properties */ /* No settable properties */
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, spec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, spec);
} }
static void static void
fluts_pat_info_get_property (GObject * object, guint prop_id, mpegts_pat_info_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * spec) GValue * value, GParamSpec * spec)
{ {
FluTsPatInfo *pat_info; MpegTsPatInfo *pat_info;
g_return_if_fail (FLUTS_IS_PAT_INFO (object)); g_return_if_fail (MPEGTS_IS_PAT_INFO (object));
pat_info = FLUTS_PAT_INFO (object); pat_info = MPEGTS_PAT_INFO (object);
switch (prop_id) { switch (prop_id) {
case PROP_PROGRAM_NO: case PROP_PROGRAM_NO:

14
gst/mpegdemux/flutspatinfo.h
View File

@ -50,22 +50,22 @@ G_BEGIN_DECLS
typedef struct FluTsPatInfoClass { typedef struct FluTsPatInfoClass {
GObjectClass parent_class; GObjectClass parent_class;
} FluTsPatInfoClass; } MpegTsPatInfoClass;
typedef struct FluTsPatInfo { typedef struct FluTsPatInfo {
GObject parent; GObject parent;
guint16 pid; guint16 pid;
guint16 program_no; guint16 program_no;
} FluTsPatInfo; } MpegTsPatInfo;
#define FLUTS_TYPE_PAT_INFO (fluts_pat_info_get_type ()) #define MPEGTS_TYPE_PAT_INFO (mpegts_pat_info_get_type ())
#define FLUTS_IS_PAT_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), FLUTS_TYPE_PAT_INFO)) #define MPEGTS_IS_PAT_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), MPEGTS_TYPE_PAT_INFO))
#define FLUTS_PAT_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),FLUTS_TYPE_PAT_INFO, FluTsPatInfo)) #define MPEGTS_PAT_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MPEGTS_TYPE_PAT_INFO, MpegTsPatInfo))
GType fluts_pat_info_get_type (void); GType mpegts_pat_info_get_type (void);
FluTsPatInfo *fluts_pat_info_new (guint16 program_no, guint16 pid); MpegTsPatInfo *mpegts_pat_info_new (guint16 program_no, guint16 pid);
G_END_DECLS G_END_DECLS

58
gst/mpegdemux/flutspmtinfo.c
View File

@ -59,27 +59,27 @@ enum
PROP_STREAMINFO PROP_STREAMINFO
}; };
GST_BOILERPLATE (FluTsPmtInfo, fluts_pmt_info, GObject, G_TYPE_OBJECT); GST_BOILERPLATE (MpegTsPmtInfo, mpegts_pmt_info, GObject, G_TYPE_OBJECT);
static void fluts_pmt_info_finalize (GObject * object); static void mpegts_pmt_info_finalize (GObject * object);
static void fluts_pmt_info_set_property (GObject * object, guint prop_id, static void mpegts_pmt_info_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * spec); const GValue * value, GParamSpec * spec);
static void fluts_pmt_info_get_property (GObject * object, guint prop_id, static void mpegts_pmt_info_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * spec); GValue * value, GParamSpec * spec);
static void static void
fluts_pmt_info_base_init (gpointer klass) mpegts_pmt_info_base_init (gpointer klass)
{ {
} }
static void static void
fluts_pmt_info_class_init (FluTsPmtInfoClass * klass) mpegts_pmt_info_class_init (MpegTsPmtInfoClass * klass)
{ {
GObjectClass *gobject_klass = (GObjectClass *) klass; GObjectClass *gobject_klass = (GObjectClass *) klass;
gobject_klass->finalize = fluts_pmt_info_finalize; gobject_klass->finalize = mpegts_pmt_info_finalize;
gobject_klass->set_property = fluts_pmt_info_set_property; gobject_klass->set_property = mpegts_pmt_info_set_property;
gobject_klass->get_property = fluts_pmt_info_get_property; gobject_klass->get_property = mpegts_pmt_info_get_property;
g_object_class_install_property (gobject_klass, PROP_PROGRAM_NO, g_object_class_install_property (gobject_klass, PROP_PROGRAM_NO,
g_param_spec_uint ("program-number", "Program Number", g_param_spec_uint ("program-number", "Program Number",
@ -97,7 +97,8 @@ fluts_pmt_info_class_init (FluTsPmtInfoClass * klass)
"Array of GObjects containing information about the program streams", "Array of GObjects containing information about the program streams",
g_param_spec_object ("flu-pmt-streaminfo", "FluPMTStreamInfo", g_param_spec_object ("flu-pmt-streaminfo", "FluPMTStreamInfo",
"Fluendo TS Demuxer PMT Stream info object", "Fluendo TS Demuxer PMT Stream info object",
FLUTS_TYPE_PMT_STREAM_INFO, G_PARAM_READABLE), G_PARAM_READABLE)); MPEGTS_TYPE_PMT_STREAM_INFO, G_PARAM_READABLE),
G_PARAM_READABLE));
g_object_class_install_property (gobject_klass, PROP_VERSION_NO, g_object_class_install_property (gobject_klass, PROP_VERSION_NO,
g_param_spec_uint ("version-number", "Version Number", g_param_spec_uint ("version-number", "Version Number",
@ -114,18 +115,18 @@ fluts_pmt_info_class_init (FluTsPmtInfoClass * klass)
} }
static void static void
fluts_pmt_info_init (FluTsPmtInfo * pmt_info, FluTsPmtInfoClass * klass) mpegts_pmt_info_init (MpegTsPmtInfo * pmt_info, MpegTsPmtInfoClass * klass)
{ {
pmt_info->streams = g_value_array_new (0); pmt_info->streams = g_value_array_new (0);
pmt_info->descriptors = g_value_array_new (0); pmt_info->descriptors = g_value_array_new (0);
} }
FluTsPmtInfo * MpegTsPmtInfo *
fluts_pmt_info_new (guint16 program_no, guint16 pcr_pid, guint8 version_no) mpegts_pmt_info_new (guint16 program_no, guint16 pcr_pid, guint8 version_no)
{ {
FluTsPmtInfo *info; MpegTsPmtInfo *info;
info = g_object_new (FLUTS_TYPE_PMT_INFO, NULL); info = g_object_new (MPEGTS_TYPE_PMT_INFO, NULL);
info->program_no = program_no; info->program_no = program_no;
info->pcr_pid = pcr_pid; info->pcr_pid = pcr_pid;
@ -135,9 +136,9 @@ fluts_pmt_info_new (guint16 program_no, guint16 pcr_pid, guint8 version_no)
} }
static void static void
fluts_pmt_info_finalize (GObject * object) mpegts_pmt_info_finalize (GObject * object)
{ {
FluTsPmtInfo *info = FLUTS_PMT_INFO (object); MpegTsPmtInfo *info = MPEGTS_PMT_INFO (object);
g_value_array_free (info->streams); g_value_array_free (info->streams);
g_value_array_free (info->descriptors); g_value_array_free (info->descriptors);
@ -146,24 +147,24 @@ fluts_pmt_info_finalize (GObject * object)
} }
static void static void
fluts_pmt_info_set_property (GObject * object, guint prop_id, mpegts_pmt_info_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * spec) const GValue * value, GParamSpec * spec)
{ {
g_return_if_fail (FLUTS_IS_PMT_INFO (object)); g_return_if_fail (MPEGTS_IS_PMT_INFO (object));
/* No settable properties */ /* No settable properties */
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, spec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, spec);
} }
static void static void
fluts_pmt_info_get_property (GObject * object, guint prop_id, mpegts_pmt_info_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * spec) GValue * value, GParamSpec * spec)
{ {
FluTsPmtInfo *pmt_info; MpegTsPmtInfo *pmt_info;
g_return_if_fail (FLUTS_IS_PMT_INFO (object)); g_return_if_fail (MPEGTS_IS_PMT_INFO (object));
pmt_info = FLUTS_PMT_INFO (object); pmt_info = MPEGTS_PMT_INFO (object);
switch (prop_id) { switch (prop_id) {
case PROP_PROGRAM_NO: case PROP_PROGRAM_NO:
@ -188,13 +189,13 @@ fluts_pmt_info_get_property (GObject * object, guint prop_id,
} }
void void
fluts_pmt_info_add_descriptor (FluTsPmtInfo * pmt_info, mpegts_pmt_info_add_descriptor (MpegTsPmtInfo * pmt_info,
const gchar * descriptor, guint length) const gchar * descriptor, guint length)
{ {
GValue value = { 0 }; GValue value = { 0 };
GString *string; GString *string;
g_return_if_fail (FLUTS_IS_PMT_INFO (pmt_info)); g_return_if_fail (MPEGTS_IS_PMT_INFO (pmt_info));
string = g_string_new_len (descriptor, length); string = g_string_new_len (descriptor, length);
@ -205,12 +206,13 @@ fluts_pmt_info_add_descriptor (FluTsPmtInfo * pmt_info,
} }
void void
fluts_pmt_info_add_stream (FluTsPmtInfo * pmt_info, FluTsPmtStreamInfo * stream) mpegts_pmt_info_add_stream (MpegTsPmtInfo * pmt_info,
MpegTsPmtStreamInfo * stream)
{ {
GValue v = { 0, }; GValue v = { 0, };
g_return_if_fail (FLUTS_IS_PMT_INFO (pmt_info)); g_return_if_fail (MPEGTS_IS_PMT_INFO (pmt_info));
g_return_if_fail (FLUTS_IS_PMT_STREAM_INFO (stream)); g_return_if_fail (MPEGTS_IS_PMT_STREAM_INFO (stream));
g_value_init (&v, G_TYPE_OBJECT); g_value_init (&v, G_TYPE_OBJECT);
g_value_take_object (&v, stream); g_value_take_object (&v, stream);

22
gst/mpegdemux/flutspmtinfo.h
View File

@ -49,11 +49,11 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct FluTsPmtInfoClass { typedef struct MpegTsPmtInfoClass {
GObjectClass parent_class; GObjectClass parent_class;
} FluTsPmtInfoClass; } MpegTsPmtInfoClass;
typedef struct FluTsPmtInfo { typedef struct MpegTsPmtInfo {
GObject parent; GObject parent;
guint16 program_no; guint16 program_no;
@ -63,18 +63,18 @@ typedef struct FluTsPmtInfo {
GValueArray *descriptors; GValueArray *descriptors;
GValueArray *streams; GValueArray *streams;
} FluTsPmtInfo; } MpegTsPmtInfo;
FluTsPmtInfo *fluts_pmt_info_new (guint16 program_no, guint16 pcr_pid, guint8 version); MpegTsPmtInfo *mpegts_pmt_info_new (guint16 program_no, guint16 pcr_pid, guint8 version);
void fluts_pmt_info_add_stream (FluTsPmtInfo *pmt_info, FluTsPmtStreamInfo *stream); void mpegts_pmt_info_add_stream (MpegTsPmtInfo *pmt_info, MpegTsPmtStreamInfo *stream);
void fluts_pmt_info_add_descriptor (FluTsPmtInfo *pmt_info, void mpegts_pmt_info_add_descriptor (MpegTsPmtInfo *pmt_info,
const gchar *descriptor, guint length); const gchar *descriptor, guint length);
GType fluts_pmt_info_get_type (void); GType mpegts_pmt_info_get_type (void);
#define FLUTS_TYPE_PMT_INFO (fluts_pmt_info_get_type ()) #define MPEGTS_TYPE_PMT_INFO (mpegts_pmt_info_get_type ())
#define FLUTS_IS_PMT_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), FLUTS_TYPE_PMT_INFO)) #define MPEGTS_IS_PMT_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), MPEGTS_TYPE_PMT_INFO))
#define FLUTS_PMT_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),FLUTS_TYPE_PMT_INFO, FluTsPmtInfo)) #define MPEGTS_PMT_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MPEGTS_TYPE_PMT_INFO, MpegTsPmtInfo))
G_END_DECLS G_END_DECLS

58
gst/mpegdemux/flutspmtstreaminfo.c
View File

@ -58,28 +58,28 @@ enum
PROP_DESCRIPTORS, PROP_DESCRIPTORS,
}; };
GST_BOILERPLATE (FluTsPmtStreamInfo, fluts_pmt_stream_info, GObject, GST_BOILERPLATE (MpegTsPmtStreamInfo, mpegts_pmt_stream_info, GObject,
G_TYPE_OBJECT); G_TYPE_OBJECT);
static void fluts_pmt_stream_info_set_property (GObject * object, guint prop_id, static void mpegts_pmt_stream_info_set_property (GObject * object,
const GValue * value, GParamSpec * spec); guint prop_id, const GValue * value, GParamSpec * spec);
static void fluts_pmt_stream_info_get_property (GObject * object, guint prop_id, static void mpegts_pmt_stream_info_get_property (GObject * object,
GValue * value, GParamSpec * spec); guint prop_id, GValue * value, GParamSpec * spec);
static void fluts_pmt_stream_info_finalize (GObject * object); static void mpegts_pmt_stream_info_finalize (GObject * object);
static void static void
fluts_pmt_stream_info_base_init (gpointer klass) mpegts_pmt_stream_info_base_init (gpointer klass)
{ {
} }
static void static void
fluts_pmt_stream_info_class_init (FluTsPmtStreamInfoClass * klass) mpegts_pmt_stream_info_class_init (MpegTsPmtStreamInfoClass * klass)
{ {
GObjectClass *gobject_klass = (GObjectClass *) klass; GObjectClass *gobject_klass = (GObjectClass *) klass;
gobject_klass->set_property = fluts_pmt_stream_info_set_property; gobject_klass->set_property = mpegts_pmt_stream_info_set_property;
gobject_klass->get_property = fluts_pmt_stream_info_get_property; gobject_klass->get_property = mpegts_pmt_stream_info_get_property;
gobject_klass->finalize = fluts_pmt_stream_info_finalize; gobject_klass->finalize = mpegts_pmt_stream_info_finalize;
g_object_class_install_property (gobject_klass, PROP_PID, g_object_class_install_property (gobject_klass, PROP_PID,
g_param_spec_uint ("pid", "PID carrying this stream", g_param_spec_uint ("pid", "PID carrying this stream",
@ -105,27 +105,27 @@ fluts_pmt_stream_info_class_init (FluTsPmtStreamInfoClass * klass)
} }
static void static void
fluts_pmt_stream_info_init (FluTsPmtStreamInfo * pmt_stream_info, mpegts_pmt_stream_info_init (MpegTsPmtStreamInfo * pmt_stream_info,
FluTsPmtStreamInfoClass * klass) MpegTsPmtStreamInfoClass * klass)
{ {
pmt_stream_info->languages = g_value_array_new (0); pmt_stream_info->languages = g_value_array_new (0);
pmt_stream_info->descriptors = g_value_array_new (0); pmt_stream_info->descriptors = g_value_array_new (0);
} }
static void static void
fluts_pmt_stream_info_finalize (GObject * object) mpegts_pmt_stream_info_finalize (GObject * object)
{ {
FluTsPmtStreamInfo *info = FLUTS_PMT_STREAM_INFO (object); MpegTsPmtStreamInfo *info = MPEGTS_PMT_STREAM_INFO (object);
g_value_array_free (info->languages); g_value_array_free (info->languages);
g_value_array_free (info->descriptors); g_value_array_free (info->descriptors);
} }
FluTsPmtStreamInfo * MpegTsPmtStreamInfo *
fluts_pmt_stream_info_new (guint16 pid, guint8 type) mpegts_pmt_stream_info_new (guint16 pid, guint8 type)
{ {
FluTsPmtStreamInfo *info; MpegTsPmtStreamInfo *info;
info = g_object_new (FLUTS_TYPE_PMT_STREAM_INFO, NULL); info = g_object_new (MPEGTS_TYPE_PMT_STREAM_INFO, NULL);
info->pid = pid; info->pid = pid;
info->stream_type = type; info->stream_type = type;
@ -133,12 +133,12 @@ fluts_pmt_stream_info_new (guint16 pid, guint8 type)
} }
void void
fluts_pmt_stream_info_add_language (FluTsPmtStreamInfo * pmt_info, mpegts_pmt_stream_info_add_language (MpegTsPmtStreamInfo * pmt_info,
gchar * language) gchar * language)
{ {
GValue v = { 0, }; GValue v = { 0, };
g_return_if_fail (FLUTS_IS_PMT_STREAM_INFO (pmt_info)); g_return_if_fail (MPEGTS_IS_PMT_STREAM_INFO (pmt_info));
g_value_init (&v, G_TYPE_STRING); g_value_init (&v, G_TYPE_STRING);
g_value_take_string (&v, language); g_value_take_string (&v, language);
@ -147,13 +147,13 @@ fluts_pmt_stream_info_add_language (FluTsPmtStreamInfo * pmt_info,
} }
void void
fluts_pmt_stream_info_add_descriptor (FluTsPmtStreamInfo * pmt_info, mpegts_pmt_stream_info_add_descriptor (MpegTsPmtStreamInfo * pmt_info,
const gchar * descriptor, guint length) const gchar * descriptor, guint length)
{ {
GValue value = { 0 }; GValue value = { 0 };
GString *string; GString *string;
g_return_if_fail (FLUTS_IS_PMT_STREAM_INFO (pmt_info)); g_return_if_fail (MPEGTS_IS_PMT_STREAM_INFO (pmt_info));
string = g_string_new_len (descriptor, length); string = g_string_new_len (descriptor, length);
@ -164,24 +164,24 @@ fluts_pmt_stream_info_add_descriptor (FluTsPmtStreamInfo * pmt_info,
} }
static void static void
fluts_pmt_stream_info_set_property (GObject * object, guint prop_id, mpegts_pmt_stream_info_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * spec) const GValue * value, GParamSpec * spec)
{ {
g_return_if_fail (FLUTS_IS_PMT_STREAM_INFO (object)); g_return_if_fail (MPEGTS_IS_PMT_STREAM_INFO (object));
/* No settable properties */ /* No settable properties */
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, spec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, spec);
} }
static void static void
fluts_pmt_stream_info_get_property (GObject * object, guint prop_id, mpegts_pmt_stream_info_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * spec) GValue * value, GParamSpec * spec)
{ {
FluTsPmtStreamInfo *si; MpegTsPmtStreamInfo *si;
g_return_if_fail (FLUTS_IS_PMT_STREAM_INFO (object)); g_return_if_fail (MPEGTS_IS_PMT_STREAM_INFO (object));
si = FLUTS_PMT_STREAM_INFO (object); si = MPEGTS_PMT_STREAM_INFO (object);
switch (prop_id) { switch (prop_id) {
case PROP_STREAM_TYPE: case PROP_STREAM_TYPE:

22
gst/mpegdemux/flutspmtstreaminfo.h
View File

@ -49,31 +49,31 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct FluTsPmtStreamInfoClass { typedef struct MpegTsPmtStreamInfoClass {
GObjectClass parent_class; GObjectClass parent_class;
} FluTsPmtStreamInfoClass; } MpegTsPmtStreamInfoClass;
typedef struct FluTsPmtStreamInfo { typedef struct MpegTsPmtStreamInfo {
GObject parent; GObject parent;
guint16 pid; guint16 pid;
GValueArray *languages; /* null terminated 3 character ISO639 language code */ GValueArray *languages; /* null terminated 3 character ISO639 language code */
guint8 stream_type; guint8 stream_type;
GValueArray *descriptors; GValueArray *descriptors;
} FluTsPmtStreamInfo; } MpegTsPmtStreamInfo;
FluTsPmtStreamInfo *fluts_pmt_stream_info_new (guint16 pid, guint8 type); MpegTsPmtStreamInfo *mpegts_pmt_stream_info_new (guint16 pid, guint8 type);
void fluts_pmt_stream_info_add_language(FluTsPmtStreamInfo* si, void mpegts_pmt_stream_info_add_language(MpegTsPmtStreamInfo* si,
gchar* language); gchar* language);
void fluts_pmt_stream_info_add_descriptor (FluTsPmtStreamInfo *pmt_info, void mpegts_pmt_stream_info_add_descriptor (MpegTsPmtStreamInfo *pmt_info,
const gchar *descriptor, guint length); const gchar *descriptor, guint length);
GType fluts_pmt_stream_info_get_type (void); GType mpegts_pmt_stream_info_get_type (void);
#define FLUTS_TYPE_PMT_STREAM_INFO (fluts_pmt_stream_info_get_type ()) #define MPEGTS_TYPE_PMT_STREAM_INFO (mpegts_pmt_stream_info_get_type ())
#define FLUTS_IS_PMT_STREAM_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), FLUTS_TYPE_PMT_STREAM_INFO)) #define MPEGTS_IS_PMT_STREAM_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), MPEGTS_TYPE_PMT_STREAM_INFO))
#define FLUTS_PMT_STREAM_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),FLUTS_TYPE_PMT_STREAM_INFO, FluTsPmtStreamInfo)) #define MPEGTS_PMT_STREAM_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MPEGTS_TYPE_PMT_STREAM_INFO, MpegTsPmtStreamInfo))
G_END_DECLS G_END_DECLS

481
gst/mpegdemux/gstmpegtsdemux.c
View File

File diff suppressed because it is too large Load Diff

96
gst/mpegdemux/gstmpegtsdemux.h
View File

@ -41,8 +41,8 @@
* Contributor(s): Wim Taymans <wim@fluendo.com> * Contributor(s): Wim Taymans <wim@fluendo.com>
*/ */
#ifndef __GST_FLUTS_DEMUX_H__ #ifndef __GST_MPEGTS_DEMUX_H__
#define __GST_FLUTS_DEMUX_H__ #define __GST_MPEGTS_DEMUX_H__
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstadapter.h> #include <gst/base/gstadapter.h>
@ -53,12 +53,12 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define FLUTS_MIN_PES_BUFFER_SIZE 4 * 1024 #define MPEGTS_MIN_PES_BUFFER_SIZE 4 * 1024
#define FLUTS_MAX_PES_BUFFER_SIZE 256 * 1024 #define MPEGTS_MAX_PES_BUFFER_SIZE 256 * 1024
#define FLUTS_MAX_PID 0x1fff #define MPEGTS_MAX_PID 0x1fff
#define FLUTS_NORMAL_TS_PACKETSIZE 188 #define MPEGTS_NORMAL_TS_PACKETSIZE 188
#define FLUTS_M2TS_TS_PACKETSIZE 192 #define MPEGTS_M2TS_TS_PACKETSIZE 192
#define LENGTH_SYNC_LUT 256 #define LENGTH_SYNC_LUT 256
@ -66,31 +66,31 @@ G_BEGIN_DECLS
(((data)[1] & 0x80) == 0x00) && \ (((data)[1] & 0x80) == 0x00) && \
(((data)[3] & 0x10) == 0x10)) (((data)[3] & 0x10) == 0x10))
#define GST_TYPE_FLUTS_DEMUX (gst_fluts_demux_get_type()) #define GST_TYPE_MPEGTS_DEMUX (gst_mpegts_demux_get_type())
#define GST_FLUTS_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\ #define GST_MPEGTS_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\
GST_TYPE_FLUTS_DEMUX,GstFluTSDemux)) GST_TYPE_MPEGTS_DEMUX,GstMpegTSDemux))
#define GST_FLUTS_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),\ #define GST_MPEGTS_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),\
GST_TYPE_FLUTS_DEMUX,GstFluTSDemuxClass)) GST_TYPE_MPEGTS_DEMUX,GstMpegTSDemuxClass))
#define GST_FLUTS_DEMUX_GET_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS((klass),\ #define GST_MPEGTS_DEMUX_GET_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS((klass),\
GST_TYPE_FLUTS_DEMUX,GstFluTSDemuxClass)) GST_TYPE_MPEGTS_DEMUX,GstMpegTSDemuxClass))
#define GST_IS_FLUTS_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),\ #define GST_IS_MPEGTS_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),\
GST_TYPE_FLUTS_DEMUX)) GST_TYPE_MPEGTS_DEMUX))
#define GST_IS_FLUTS_DEMUX_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),\ #define GST_IS_MPEGTS_DEMUX_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),\
GST_TYPE_FLUTS_DEMUX)) GST_TYPE_MPEGTS_DEMUX))
typedef struct _GstFluTSStream GstFluTSStream; typedef struct _GstMpegTSStream GstMpegTSStream;
typedef struct _GstFluTSPMTEntry GstFluTSPMTEntry; typedef struct _GstMpegTSPMTEntry GstMpegTSPMTEntry;
typedef struct _GstFluTSPMT GstFluTSPMT; typedef struct _GstMpegTSPMT GstMpegTSPMT;
typedef struct _GstFluTSPATEntry GstFluTSPATEntry; typedef struct _GstMpegTSPATEntry GstMpegTSPATEntry;
typedef struct _GstFluTSPAT GstFluTSPAT; typedef struct _GstMpegTSPAT GstMpegTSPAT;
typedef struct _GstFluTSDemux GstFluTSDemux; typedef struct _GstMpegTSDemux GstMpegTSDemux;
typedef struct _GstFluTSDemuxClass GstFluTSDemuxClass; typedef struct _GstMpegTSDemuxClass GstMpegTSDemuxClass;
struct _GstFluTSPMTEntry { struct _GstMpegTSPMTEntry {
guint16 PID; guint16 PID;
}; };
struct _GstFluTSPMT { struct _GstMpegTSPMT {
guint16 program_number; guint16 program_number;
guint8 version_number; guint8 version_number;
gboolean current_next_indicator; gboolean current_next_indicator;
@ -103,12 +103,12 @@ struct _GstFluTSPMT {
GArray * entries; GArray * entries;
}; };
struct _GstFluTSPATEntry { struct _GstMpegTSPATEntry {
guint16 program_number; guint16 program_number;
guint16 PID; guint16 PID;
}; };
struct _GstFluTSPAT { struct _GstMpegTSPAT {
guint16 transport_stream_id; guint16 transport_stream_id;
guint8 version_number; guint8 version_number;
gboolean current_next_indicator; gboolean current_next_indicator;
@ -118,17 +118,17 @@ struct _GstFluTSPAT {
GArray * entries; GArray * entries;
}; };
typedef enum _FluTsStreamFlags { typedef enum _MpegTsStreamFlags {
FLUTS_STREAM_FLAG_STREAM_TYPE_UNKNOWN = 0x01, MPEGTS_STREAM_FLAG_STREAM_TYPE_UNKNOWN = 0x01,
FLUTS_STREAM_FLAG_PMT_VALID = 0x02, MPEGTS_STREAM_FLAG_PMT_VALID = 0x02,
FLUTS_STREAM_FLAG_IS_VIDEO = 0x04 MPEGTS_STREAM_FLAG_IS_VIDEO = 0x04
} FluTsStreamFlags; } MpegTsStreamFlags;
/* Information associated to a single MPEG stream. */ /* Information associated to a single MPEG stream. */
struct _GstFluTSStream { struct _GstMpegTSStream {
GstFluTSDemux * demux; GstMpegTSDemux * demux;
FluTsStreamFlags flags; MpegTsStreamFlags flags;
/* PID and type */ /* PID and type */
guint16 PID; guint16 PID;
@ -143,10 +143,10 @@ struct _GstFluTSStream {
GstClockTimeDiff discont_difference; GstClockTimeDiff discont_difference;
/* for PAT streams */ /* for PAT streams */
GstFluTSPAT PAT; GstMpegTSPAT PAT;
/* for PMT streams */ /* for PMT streams */
GstFluTSPMT PMT; GstMpegTSPMT PMT;
/* for CA streams */ /* for CA streams */
@ -172,7 +172,7 @@ struct _GstFluTSStream {
guint16 PMT_pid; guint16 PMT_pid;
}; };
struct _GstFluTSDemux { struct _GstMpegTSDemux {
GstElement parent; GstElement parent;
/* properties */ /* properties */
@ -186,10 +186,10 @@ struct _GstFluTSDemux {
/* current PMT PID */ /* current PMT PID */
guint16 current_PMT; guint16 current_PMT;
/* Array of FLUTS_MAX_PID + 1 stream entries */ /* Array of MPEGTS_MAX_PID + 1 stream entries */
GstFluTSStream ** streams; GstMpegTSStream ** streams;
/* Array to perform pmts checks at gst_fluts_demux_parse_adaptation_field */ /* Array to perform pmts checks at gst_mpegts_demux_parse_adaptation_field */
gboolean pmts_checked[FLUTS_MAX_PID + 1]; gboolean pmts_checked[MPEGTS_MAX_PID + 1];
/* Array of Elementary Stream pids for ts with PMT */ /* Array of Elementary Stream pids for ts with PMT */
guint16 * elementary_pids; guint16 * elementary_pids;
@ -208,7 +208,7 @@ struct _GstFluTSDemux {
GstClockTime clock_base; GstClockTime clock_base;
}; };
struct _GstFluTSDemuxClass { struct _GstMpegTSDemuxClass {
GstElementClass parent_class; GstElementClass parent_class;
GstPadTemplate * sink_template; GstPadTemplate * sink_template;
@ -217,10 +217,10 @@ struct _GstFluTSDemuxClass {
GstPadTemplate * private_template; GstPadTemplate * private_template;
}; };
GType gst_fluts_demux_get_type (void); GType gst_mpegts_demux_get_type (void);
gboolean gst_fluts_demux_plugin_init (GstPlugin *plugin); gboolean gst_mpegts_demux_plugin_init (GstPlugin *plugin);
G_END_DECLS G_END_DECLS
#endif /* __GST_FLUTS_DEMUX_H__ */ #endif /* __GST_MPEGTS_DEMUX_H__ */