summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2014-06-24 15:41:36 +0200
committerEdward Hervey <bilboed@bilboed.com>2014-06-24 16:06:01 +0200
commit0607756e24aa0725c9d9f9bd93f7427a4e3f1709 (patch)
tree61185b4e9d896c4e6a1808e3df720f26375f940b
parent7c884374eb33dca619a35ae01ca9dfcca67b0b20 (diff)
downloadgstreamer-plugins-bad-0607756e24aa0725c9d9f9bd93f7427a4e3f1709.tar.gz
mpegts: more annotation fixes
-rw-r--r--gst-libs/gst/mpegts/gst-atsc-section.h21
-rw-r--r--gst-libs/gst/mpegts/gst-dvb-descriptor.c2
-rw-r--r--gst-libs/gst/mpegts/gst-dvb-descriptor.h14
-rw-r--r--gst-libs/gst/mpegts/gst-dvb-section.h6
-rw-r--r--gst-libs/gst/mpegts/gstmpegtssection.h4
5 files changed, 33 insertions, 14 deletions
diff --git a/gst-libs/gst/mpegts/gst-atsc-section.h b/gst-libs/gst/mpegts/gst-atsc-section.h
index 7851d01da..84ba22071 100644
--- a/gst-libs/gst/mpegts/gst-atsc-section.h
+++ b/gst-libs/gst/mpegts/gst-atsc-section.h
@@ -75,6 +75,7 @@ typedef struct _GstMpegTsAtscVCT GstMpegTsAtscVCT;
/**
* GstMpegTsAtscVCTSource:
+ * @descriptors: (element-type GstMpegTsDescriptor): descriptors
*
* Source from a @GstMpegTsAtscVCT, can be used both for TVCT and CVCT tables
*/
@@ -102,6 +103,8 @@ struct _GstMpegTsAtscVCTSource
/**
* GstMpegTsAtscVCT:
+ * @sources: (element-type GstMpegTsAtscVCTSource): sources
+ * @descriptors: (element-type GstMpegTsDescriptor): descriptors
*
* Represents both:
* Terrestrial Virtual Channel Table (A65)
@@ -138,6 +141,7 @@ typedef enum {
/**
* GstMpegTsAtscMGTTable:
+ * @descriptors: (element-type GstMpegTsDescriptor): descriptors
*
* Source from a @GstMpegTsAtscMGT
*/
@@ -152,8 +156,10 @@ struct _GstMpegTsAtscMGTTable
/**
* GstMpegTsAtscMGT:
+ * @tables: (element-type GstMpegTsAtscMGTTable): the tables
+ * @descriptors: (element-type GstMpegTsDescriptor): descriptors
*
- * Terrestrial Virtual Channel Table (A65)
+ * Master Guide Table (A65)
*
*/
struct _GstMpegTsAtscMGT
@@ -188,6 +194,11 @@ struct _GstMpegTsAtscStringSegment {
const gchar * gst_mpegts_atsc_string_segment_get_string (GstMpegTsAtscStringSegment * seg);
+/**
+ * GstMpegTsAtscMultString:
+ * @segments: (element-type GstMpegTsAtscStringSegment)
+ *
+ */
struct _GstMpegTsAtscMultString {
gchar iso_639_langcode[4];
GPtrArray *segments;
@@ -204,6 +215,13 @@ GType gst_mpegts_atsc_mult_string_get_type (void);
typedef struct _GstMpegTsAtscEITEvent GstMpegTsAtscEITEvent;
typedef struct _GstMpegTsAtscEIT GstMpegTsAtscEIT;
+/**
+ * GstMpegTsAtscEITEvent:
+ * @titles: (element-type GstMpegTsAtscMultString): the titles
+ * @descriptors: (element-type GstMpegTsDescriptor): descriptors
+ *
+ * An ATSC EIT Event
+ */
struct _GstMpegTsAtscEITEvent {
guint16 event_id;
guint32 start_time;
@@ -267,6 +285,7 @@ typedef struct _GstMpegTsAtscSTT GstMpegTsAtscSTT;
/**
* GstMpegTsAtscSTT:
+ * @descriptors: (element-type GstMpegTsDescriptor): descriptors
*
* System Time Table (A65)
*
diff --git a/gst-libs/gst/mpegts/gst-dvb-descriptor.c b/gst-libs/gst/mpegts/gst-dvb-descriptor.c
index 92df085e7..60eeb4acf 100644
--- a/gst-libs/gst/mpegts/gst-dvb-descriptor.c
+++ b/gst-libs/gst/mpegts/gst-dvb-descriptor.c
@@ -80,7 +80,7 @@ gst_mpegts_descriptor_parse_dvb_network_name (const GstMpegTsDescriptor *
* gst_mpegts_descriptor_from_dvb_network_name:
* @name: the network name to set
*
- * Fills a #GstMpegTsDescriptor to be a %GST_MTS_DESC_DVB_NETWORK_NAME,
+ * Creates a #GstMpegTsDescriptor to be a %GST_MTS_DESC_DVB_NETWORK_NAME,
* with the network name @name. The data field of the #GstMpegTsDescriptor
* will be allocated, and transferred to the caller.
*
diff --git a/gst-libs/gst/mpegts/gst-dvb-descriptor.h b/gst-libs/gst/mpegts/gst-dvb-descriptor.h
index d2ffd3335..1b174a229 100644
--- a/gst-libs/gst/mpegts/gst-dvb-descriptor.h
+++ b/gst-libs/gst/mpegts/gst-dvb-descriptor.h
@@ -521,7 +521,7 @@ struct _GstMpegTsComponentDescriptor
guint8 component_type;
guint8 component_tag;
gchar *language_code;
- gchar *text;
+ gchar *text;
};
GType gst_mpegts_component_descriptor_get_type (void);
@@ -555,7 +555,7 @@ typedef enum {
typedef struct _GstMpegTsContent GstMpegTsContent;
struct _GstMpegTsContent
{
- guint8 content_nibble_1;
+ GstMpegTsContentNibbleHi content_nibble_1;
guint8 content_nibble_2;
guint8 user_byte;
};
@@ -590,11 +590,11 @@ gboolean gst_mpegts_descriptor_parse_dvb_parental_rating (const GstMpegTsDescrip
* As specified in Table 100 of ETSI EN 300 468 v1.13.1
*/
typedef enum {
- INITIAL_PAGE = 0x01,
- SUBTITLE_PAGE,
- ADDITIONAL_INFO_PAGE,
- PROGRAMME_SCHEDULE_PAGE,
- HEARING_IMPAIRED_PAGE
+ INITIAL_PAGE = 0x01,
+ SUBTITLE_PAGE,
+ ADDITIONAL_INFO_PAGE,
+ PROGRAMME_SCHEDULE_PAGE,
+ HEARING_IMPAIRED_PAGE
} GstMpegTsDVBTeletextType;
gboolean gst_mpegts_descriptor_parse_dvb_teletext_idx (const GstMpegTsDescriptor *
diff --git a/gst-libs/gst/mpegts/gst-dvb-section.h b/gst-libs/gst/mpegts/gst-dvb-section.h
index aba057adf..24031e59e 100644
--- a/gst-libs/gst/mpegts/gst-dvb-section.h
+++ b/gst-libs/gst/mpegts/gst-dvb-section.h
@@ -197,7 +197,7 @@ struct _GstMpegTsBATStream
*/
struct _GstMpegTsBAT
{
- GPtrArray *descriptors;
+ GPtrArray *descriptors;
GPtrArray *streams;
};
@@ -289,7 +289,7 @@ struct _GstMpegTsEITEvent
GstMpegTsRunningStatus running_status;
gboolean free_CA_mode;
- GPtrArray *descriptors;
+ GPtrArray *descriptors;
};
/**
@@ -335,7 +335,7 @@ struct _GstMpegTsTOT
{
GstDateTime *utc_time;
- GPtrArray *descriptors;
+ GPtrArray *descriptors;
};
GType gst_mpegts_tot_get_type (void);
diff --git a/gst-libs/gst/mpegts/gstmpegtssection.h b/gst-libs/gst/mpegts/gstmpegtssection.h
index 291caacac..351526e91 100644
--- a/gst-libs/gst/mpegts/gstmpegtssection.h
+++ b/gst-libs/gst/mpegts/gstmpegtssection.h
@@ -340,7 +340,7 @@ struct _GstMpegTsPMTStream
guint8 stream_type;
guint16 pid;
- GPtrArray *descriptors;
+ GPtrArray *descriptors;
};
/**
@@ -359,7 +359,7 @@ struct _GstMpegTsPMT
guint16 pcr_pid;
guint16 program_number;
- GPtrArray *descriptors;
+ GPtrArray *descriptors;
GPtrArray *streams;
};