diff options
| -rw-r--r-- | gst-libs/gst/video/gstvideometa.c | 2 | ||||
| -rw-r--r-- | gst-libs/gst/video/video-anc.h | 24 |
2 files changed, 17 insertions, 9 deletions
diff --git a/gst-libs/gst/video/gstvideometa.c b/gst-libs/gst/video/gstvideometa.c index d74a675a8..816f4905b 100644 --- a/gst-libs/gst/video/gstvideometa.c +++ b/gst-libs/gst/video/gstvideometa.c @@ -1153,9 +1153,9 @@ gst_buffer_add_video_caption_meta (GstBuffer * buffer, switch (caption_type) { case GST_VIDEO_CAPTION_TYPE_CEA608_RAW: + case GST_VIDEO_CAPTION_TYPE_CEA608_IN_CEA708_RAW: case GST_VIDEO_CAPTION_TYPE_CEA708_RAW: case GST_VIDEO_CAPTION_TYPE_CEA708_CDP: - case GST_VIDEO_CAPTION_TYPE_DTVCC_GA94: break; default: GST_ERROR ("Unknown caption type !"); diff --git a/gst-libs/gst/video/video-anc.h b/gst-libs/gst/video/video-anc.h index efb5b1691..046a0d15d 100644 --- a/gst-libs/gst/video/video-anc.h +++ b/gst-libs/gst/video/video-anc.h @@ -76,15 +76,23 @@ typedef enum { /** * GstVideoCaptionType: * @GST_VIDEO_CAPTION_TYPE_UNKNOWN: Unknown type of CC - * @GST_VIDEO_CAPTION_TYPE_CEA608_RAW: CEA-608 as byte pairs. - * @GST_VIDEO_CAPTION_TYPE_CEA708_RAW: CEA-708 as byte pairs (not recommended) + * @GST_VIDEO_CAPTION_TYPE_CEA608_RAW: CEA-608 as byte pairs. Note that + * this format is not recommended since is does not specify to + * which field the caption comes from and therefore assumes + * it comes from the first field (and that there is no information + * on the second field). Use @@GST_VIDEO_CAPTION_TYPE_CEA608_IN_CEA708_RAW + * if you wish to store CEA-608 from two fields. + * @GST_VIDEO_CAPTION_TYPE_CEA608_IN_CEA708_RAW: CEA-608 as byte triplets. + * The first byte of each triplet shall specify the field as in CEA-708 + * (i.e: 0xFC for the first field or 0xFD for the second field.). The 2nd + * and 3rd byte of each triplet at the cc1 and cc2 bytes. Use this if + * there is *only* CEA-608 caption. If there is also CEA-708 caption, + * use @GST_VIDEO_CAPTION_TYPE_CEA708_RAW. + * @GST_VIDEO_CAPTION_TYPE_CEA708_RAW: CEA-708 as cc_data byte triplets. They + * can also contain 608-in-708. * @GST_VIDEO_CAPTION_TYPE_CEA708_CDP: CEA-708 (and optionally CEA-608) in * a CDP (Caption Distribution Packet) defined by SMPTE S-334-2. * Contains the whole CDP (starting with 0x9669). - * @GST_VIDEO_CAPTION_TYPE_DTVCC_GA94: DTV packets contained in - * User-data of type GA94 (defined in SCTE21 and SCTE 128). - * Contains the whole user_data content (i.e. starting with header - * 'GA94'). * * The various know types of Closed Caption (CC). * @@ -93,9 +101,9 @@ typedef enum { typedef enum { GST_VIDEO_CAPTION_TYPE_UNKNOWN = 0, GST_VIDEO_CAPTION_TYPE_CEA608_RAW = 1, + GST_VIDEO_CAPTION_TYPE_CEA608_IN_CEA708_RAW = 2, GST_VIDEO_CAPTION_TYPE_CEA708_RAW = 3, - GST_VIDEO_CAPTION_TYPE_CEA708_CDP = 4, - GST_VIDEO_CAPTION_TYPE_DTVCC_GA94 = 5, + GST_VIDEO_CAPTION_TYPE_CEA708_CDP = 4 } GstVideoCaptionType; /** |