Merge branch 'tsdemux-vvc' into 'main'

Draft: tsdemux: add basic VVC support

See merge request gstreamer/gstreamer!4940
This commit is contained in:
Carlos Bentzen 2024-05-03 17:25:55 +00:00
commit aab0262374
2 changed files with 10 additions and 1 deletions

View file

@ -350,6 +350,8 @@ typedef struct _GstMpegtsPMT GstMpegtsPMT;
* profiles defined in Annex A for service-compatible stereoscopic 3D services
* @GST_MPEGTS_STREAM_TYPE_VIDEO_HEVC: Rec. ITU-T H.265 | ISO/IEC 23008-2 video
* stream or an HEVC temporal video sub-bitstream
* @GST_MPEGTS_STREAM_TYPE_VIDEO_VVC: Rec. ITU-T H.266 | ISO/IEC 23090-3 video
* stream
* @GST_MPEGTS_STREAM_TYPE_IPMP_STREAM: IPMP stream
*
* Type of MPEG-TS stream type.
@ -398,7 +400,8 @@ typedef enum {
GST_MPEGTS_STREAM_TYPE_VIDEO_MPEG2_STEREO_ADDITIONAL_VIEW = 0x22,
GST_MPEGTS_STREAM_TYPE_VIDEO_H264_STEREO_ADDITIONAL_VIEW = 0x23,
GST_MPEGTS_STREAM_TYPE_VIDEO_HEVC = 0x24,
/* 0x24 - 0x7e : Rec. ITU-T H.222.0 | ISO/IEC 13818-1 Reserved */
GST_MPEGTS_STREAM_TYPE_VIDEO_VVC = 0x33,
/* 0x37 - 0x7e : Rec. ITU-T H.222.0 | ISO/IEC 13818-1 Reserved */
GST_MPEGTS_STREAM_TYPE_IPMP_STREAM = 0x7f,
/* 0x80 - 0xff : User Private (or defined in other specs) */

View file

@ -237,6 +237,7 @@ struct _TSDemuxStream
"systemstream = (boolean) FALSE; " \
"video/x-h264,stream-format=(string)byte-stream;" \
"video/x-h265,stream-format=(string)byte-stream;" \
"video/x-h266,stream-format=(string)byte-stream;" \
"video/x-dirac;" \
"video/x-cavs;" \
"video/x-wmv," \
@ -1771,6 +1772,11 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream,
caps = gst_caps_new_simple ("video/x-h265",
"stream-format", G_TYPE_STRING, "byte-stream", NULL);
break;
case GST_MPEGTS_STREAM_TYPE_VIDEO_VVC:
is_video = TRUE;
caps = gst_caps_new_simple ("video/x-h266",
"stream-format", G_TYPE_STRING, "byte-stream", NULL);
break;
case GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K:
is_video = TRUE;
desc =