summaryrefslogtreecommitdiff
path: root/gst/mpegtsmux
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2014-06-25 14:50:05 +0200
committerEdward Hervey <bilboed@bilboed.com>2014-06-25 14:50:05 +0200
commit22dfd9aef361c6e630fe32d6b7f6c07588a2dff9 (patch)
tree48cbfc0212922b7d8c6a98f1d7854a9326358788 /gst/mpegtsmux
parentcddabd751c760454915bcd3a485f241939499292 (diff)
downloadgstreamer-plugins-bad-22dfd9aef361c6e630fe32d6b7f6c07588a2dff9.tar.gz
mpegts: Unify API : GstMpegts / gst_mpegts_ / GST_*_MPEGTS_
It was previously a mix and match of both variants, introducing just too much confusion. The prefix are from now on: * GstMpegts for structures and type names (and not GstMpegTs) * gst_mpegts_ for functions (and not gst_mpeg_ts_) * GST_MPEGTS_ for enums/flags (and not GST_MPEG_TS_) * GST_TYPE_MPEGTS_ for types (and not GST_TYPE_MPEG_TS_) The rationale for chosing that is: * the namespace is shorter/direct (it's mpegts, not mpeg_ts nor mpeg-ts) * the namespace is one word under Gst * it's shorter (yah)
Diffstat (limited to 'gst/mpegtsmux')
-rw-r--r--gst/mpegtsmux/mpegtsmux.c2
-rw-r--r--gst/mpegtsmux/tsmux/tsmux.c18
-rw-r--r--gst/mpegtsmux/tsmux/tsmux.h4
-rw-r--r--gst/mpegtsmux/tsmux/tsmuxstream.c4
-rw-r--r--gst/mpegtsmux/tsmux/tsmuxstream.h2
5 files changed, 15 insertions, 15 deletions
diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c
index 6b7662fd2..af246a20d 100644
--- a/gst/mpegtsmux/mpegtsmux.c
+++ b/gst/mpegtsmux/mpegtsmux.c
@@ -1737,7 +1737,7 @@ mpegtsmux_change_state (GstElement * element, GstStateChange transition)
static gboolean
mpegtsmux_send_event (GstElement * element, GstEvent * event)
{
- GstMpegTsSection *section;
+ GstMpegtsSection *section;
MpegTsMux *mux = GST_MPEG_TSMUX (element);
g_return_val_if_fail (event != NULL, FALSE);
diff --git a/gst/mpegtsmux/tsmux/tsmux.c b/gst/mpegtsmux/tsmux/tsmux.c
index 6a1c06435..7eb7b8667 100644
--- a/gst/mpegtsmux/tsmux/tsmux.c
+++ b/gst/mpegtsmux/tsmux/tsmux.c
@@ -263,14 +263,14 @@ tsmux_get_si_interval (TsMux * mux)
/**
* tsmux_add_mpegts_si_section:
* @mux: a #TsMux
- * @section: (transfer full): a #GstMpegTsSection to add
+ * @section: (transfer full): a #GstMpegtsSection to add
*
- * Add a Service Information #GstMpegTsSection to the stream
+ * Add a Service Information #GstMpegtsSection to the stream
*
* Returns: #TRUE on success, #FALSE otherwise
*/
gboolean
-tsmux_add_mpegts_si_section (TsMux * mux, GstMpegTsSection * section)
+tsmux_add_mpegts_si_section (TsMux * mux, GstMpegtsSection * section)
{
TsMuxSection *tsmux_section;
@@ -842,7 +842,7 @@ tsmux_write_ts_header (guint8 * buf, TsMuxPacketInfo * pi,
}
static gboolean
-tsmux_section_write_packet (GstMpegTsSectionType * type,
+tsmux_section_write_packet (GstMpegtsSectionType * type,
TsMuxSection * section, TsMux * mux)
{
GstBuffer *section_buffer;
@@ -872,7 +872,7 @@ tsmux_section_write_packet (GstMpegTsSectionType * type,
payload_written = 0;
/* Wrap section data in a buffer without free function.
- The data will be freed when the GstMpegTsSection is destroyed. */
+ The data will be freed when the GstMpegtsSection is destroyed. */
section_buffer = gst_buffer_new_wrapped_full (GST_MEMORY_FLAG_READONLY,
data, data_size, 0, data_size, NULL, NULL);
@@ -1138,7 +1138,7 @@ tsmux_write_pat (TsMux * mux)
pat = gst_mpegts_pat_new ();
for (cur = mux->programs; cur; cur = cur->next) {
- GstMpegTsPatProgram *pat_pgm;
+ GstMpegtsPatProgram *pat_pgm;
TsMuxProgram *program = (TsMuxProgram *) cur->data;
pat_pgm = gst_mpegts_pat_program_new ();
@@ -1187,8 +1187,8 @@ tsmux_write_pmt (TsMux * mux, TsMuxProgram * program)
* }
* }
*/
- GstMpegTsDescriptor *descriptor;
- GstMpegTsPMT *pmt;
+ GstMpegtsDescriptor *descriptor;
+ GstMpegtsPMT *pmt;
guint8 desc[] = { 0x0F, 0xFF, 0xFC, 0xFC };
guint i;
@@ -1207,7 +1207,7 @@ tsmux_write_pmt (TsMux * mux, TsMuxProgram * program)
/* Write out the entries */
for (i = 0; i < program->streams->len; i++) {
- GstMpegTsPMTStream *pmt_stream;
+ GstMpegtsPMTStream *pmt_stream;
TsMuxStream *stream = g_array_index (program->streams, TsMuxStream *, i);
pmt_stream = gst_mpegts_pmt_stream_new ();
diff --git a/gst/mpegtsmux/tsmux/tsmux.h b/gst/mpegtsmux/tsmux/tsmux.h
index 236837896..dd1185a65 100644
--- a/gst/mpegtsmux/tsmux/tsmux.h
+++ b/gst/mpegtsmux/tsmux/tsmux.h
@@ -105,7 +105,7 @@ typedef void (*TsMuxAllocFunc) (GstBuffer ** buf, void *user_data);
struct TsMuxSection {
TsMuxPacketInfo pi;
- GstMpegTsSection *section;
+ GstMpegtsSection *section;
};
/* Information for the streams associated with one program */
@@ -200,7 +200,7 @@ guint tsmux_get_pmt_interval (TsMuxProgram *program);
/* SI table management */
void tsmux_set_si_interval (TsMux *mux, guint interval);
guint tsmux_get_si_interval (TsMux *mux);
-gboolean tsmux_add_mpegts_si_section (TsMux * mux, GstMpegTsSection * section);
+gboolean tsmux_add_mpegts_si_section (TsMux * mux, GstMpegtsSection * section);
/* stream management */
TsMuxStream * tsmux_create_stream (TsMux *mux, TsMuxStreamType stream_type, guint16 pid, gchar *language);
diff --git a/gst/mpegtsmux/tsmux/tsmuxstream.c b/gst/mpegtsmux/tsmux/tsmuxstream.c
index 7a4605e55..2cbbf765b 100644
--- a/gst/mpegtsmux/tsmux/tsmuxstream.c
+++ b/gst/mpegtsmux/tsmux/tsmuxstream.c
@@ -697,9 +697,9 @@ tsmux_stream_add_data (TsMuxStream * stream, guint8 * data, guint len,
*/
void
tsmux_stream_get_es_descrs (TsMuxStream * stream,
- GstMpegTsPMTStream * pmt_stream)
+ GstMpegtsPMTStream * pmt_stream)
{
- GstMpegTsDescriptor *descriptor;
+ GstMpegtsDescriptor *descriptor;
g_return_if_fail (stream != NULL);
g_return_if_fail (pmt_stream != NULL);
diff --git a/gst/mpegtsmux/tsmux/tsmuxstream.h b/gst/mpegtsmux/tsmux/tsmuxstream.h
index 33d5eaf39..5640df68b 100644
--- a/gst/mpegtsmux/tsmux/tsmuxstream.h
+++ b/gst/mpegtsmux/tsmux/tsmuxstream.h
@@ -228,7 +228,7 @@ void tsmux_stream_pcr_unref (TsMuxStream *stream);
gboolean tsmux_stream_is_pcr (TsMuxStream *stream);
gboolean tsmux_stream_at_pes_start (TsMuxStream *stream);
-void tsmux_stream_get_es_descrs (TsMuxStream *stream, GstMpegTsPMTStream *pmt_stream);
+void tsmux_stream_get_es_descrs (TsMuxStream *stream, GstMpegtsPMTStream *pmt_stream);
gint tsmux_stream_bytes_in_buffer (TsMuxStream *stream);
gint tsmux_stream_bytes_avail (TsMuxStream *stream);