summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--Android.mk4
-rwxr-xr-xntsc_decode/am_vbi.c26
-rw-r--r--src/caption.c656
-rw-r--r--src/cc.h15
-rw-r--r--src/dtvcc.c893
-rw-r--r--src/dtvcc.h45
-rwxr-xr-x[-rw-r--r--]src/event.h26
-rw-r--r--src/exp-gfx.c65
-rwxr-xr-x[-rw-r--r--]src/libzvbi.h20
-rwxr-xr-x[-rw-r--r--]src/vbi.c2
10 files changed, 1393 insertions, 359 deletions
diff --git a/src/event.h b/src/event.h
index 7b699a3..1ba71ee 100644..100755
--- a/src/event.h
+++ b/src/event.h
@@ -128,6 +128,9 @@ typedef struct {
/** Private. */
int cycle;
+
+ /** Transmission Signal ID */
+ int ts_id;
} vbi_network;
/*
@@ -414,7 +417,16 @@ typedef enum {
*/
VBI_AUDIO_MODE_UNKNOWN
} vbi_audio_mode;
-
+typedef struct vbi_rating{
+ /*
+ * For details STFW for "v-chip"
+ * If unknown rating_auth == VBI_RATING_NONE
+ */
+ vbi_rating_auth auth;
+ int id;
+ /* Only valid when auth == VBI_RATING_TV_US */
+ int dlsv;
+}vbi_rating;
/**
* @ingroup Event
*
@@ -470,16 +482,7 @@ typedef struct vbi_program_info {
int type_id[33];
/* 05 Program rating */
-
- /*
- * For details STFW for "v-chip"
- * If unknown rating_auth == VBI_RATING_NONE
- */
- vbi_rating_auth rating_auth;
- int rating_id;
-
- /* Only valid when auth == VBI_RATING_TV_US */
- int rating_dlsv;
+ vbi_rating rating;
/* 06 Program Audio Services */
@@ -652,6 +655,7 @@ extern void vbi_reset_prog_info(vbi_program_info *pi);
* @since 0.2.20
*/
#define VBI_EVENT_NETWORK_ID 0x0100
+#define VBI_EVENT_RATING 0x0200
/** @} */
/**