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/libzvbi.h b/src/libzvbi.h
index 4f562ee..2e251bf 100644..100755
--- a/src/libzvbi.h
+++ b/src/libzvbi.h
@@ -275,6 +275,7 @@ typedef struct {
int cycle;
+ int ts_id;
} vbi_network;
/*
@@ -384,6 +385,18 @@ 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;
+
+
typedef struct vbi_program_info {
/*
* Refers to the current or next program.
@@ -439,11 +452,7 @@ typedef struct vbi_program_info {
* 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 */
@@ -508,6 +517,7 @@ extern void vbi_reset_prog_info(vbi_program_info *pi);
#define VBI_EVENT_ASPECT 0x0040
#define VBI_EVENT_PROG_INFO 0x0080
#define VBI_EVENT_NETWORK_ID 0x0100
+#define VBI_EVENT_RATING 0x0200