mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 18:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity
gstreamer/patches/videoparsers/0003-h264parse-add-initial-support-for-MVC-NAL-units.patch

96 lines
4 KiB
Diff
Raw Normal View History

h264parse: fix detection of access unit boundaries for MVC. The gst_h264_parse_collect_nal() function is a misnomer. In reality, this function is used to determine access unit boundaries, i.e. that is the key function for alignment=au output format generation.
2014-06-26 12:51:32 +00:00
From b1974b68fac0dad1c76ab74f0b6b3d9ff99b6f27 Mon Sep 17 00:00:00 2001
plugins: add built-in video parsers as "vaapiparse" element. The built-in video parsers elements are built into a single DSO named libgstvaapi_parse.so. The various video parsers could be accessed as vaapiparse_CODEC. For now, this only includes a modified version of h264parse so that to support H.264 MVC encoded streams.
2014-04-28 15:44:03 +00:00
From: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
Date: Tue, 19 Mar 2013 14:23:00 +0200
h264parse: fix detection of access unit boundaries for MVC. The gst_h264_parse_collect_nal() function is a misnomer. In reality, this function is used to determine access unit boundaries, i.e. that is the key function for alignment=au output format generation.
2014-06-26 12:51:32 +00:00
Subject: [PATCH 8/8] h264parse: add initial support for MVC NAL units.
plugins: add built-in video parsers as "vaapiparse" element. The built-in video parsers elements are built into a single DSO named libgstvaapi_parse.so. The various video parsers could be accessed as vaapiparse_CODEC. For now, this only includes a modified version of h264parse so that to support H.264 MVC encoded streams.
2014-04-28 15:44:03 +00:00
Initial support for MVC NAL units. It is only needed to propagate the
complete set of NAL units downstream at this time.
https://bugzilla.gnome.org/show_bug.cgi?id=696135
Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
---
h264parse: fix detection of access unit boundaries for MVC. The gst_h264_parse_collect_nal() function is a misnomer. In reality, this function is used to determine access unit boundaries, i.e. that is the key function for alignment=au output format generation.
2014-06-26 12:51:32 +00:00
gst/vaapi/gsth264parse.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
plugins: add built-in video parsers as "vaapiparse" element. The built-in video parsers elements are built into a single DSO named libgstvaapi_parse.so. The various video parsers could be accessed as vaapiparse_CODEC. For now, this only includes a modified version of h264parse so that to support H.264 MVC encoded streams.
2014-04-28 15:44:03 +00:00
diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
h264parse: fix detection of access unit boundaries for MVC. The gst_h264_parse_collect_nal() function is a misnomer. In reality, this function is used to determine access unit boundaries, i.e. that is the key function for alignment=au output format generation.
2014-06-26 12:51:32 +00:00
index 413a227..b4f20f7 100644
plugins: add built-in video parsers as "vaapiparse" element. The built-in video parsers elements are built into a single DSO named libgstvaapi_parse.so. The various video parsers could be accessed as vaapiparse_CODEC. For now, this only includes a modified version of h264parse so that to support H.264 MVC encoded streams.
2014-04-28 15:44:03 +00:00
--- a/gst/vaapi/gsth264parse.c
+++ b/gst/vaapi/gsth264parse.c
h264parse: fix detection of access unit boundaries for MVC. The gst_h264_parse_collect_nal() function is a misnomer. In reality, this function is used to determine access unit boundaries, i.e. that is the key function for alignment=au output format generation.
2014-06-26 12:51:32 +00:00
@@ -433,7 +433,7 @@ gst_h264_parser_store_nal (GstH264Parse * h264parse, guint id,
plugins: add built-in video parsers as "vaapiparse" element. The built-in video parsers elements are built into a single DSO named libgstvaapi_parse.so. The various video parsers could be accessed as vaapiparse_CODEC. For now, this only includes a modified version of h264parse so that to support H.264 MVC encoded streams.
2014-04-28 15:44:03 +00:00
GstBuffer *buf, **store;
guint size = nalu->size, store_size;
- if (naltype == GST_H264_NAL_SPS) {
+ if (naltype == GST_H264_NAL_SPS || naltype == GST_H264_NAL_SUBSET_SPS) {
store_size = GST_H264_MAX_SPS_COUNT;
store = h264parse->sps_nals;
GST_DEBUG_OBJECT (h264parse, "storing sps %u", id);
h264parse: introduce new state tracking variables. Improve parser state tracking by introducing new flags reflecting it: "got-sps", "got-pps" and "got-slice". This is an addition for robustness purposes. Older have_sps and have_pps variables are kept because they have a different meaning. i.e. they are used for deciding on when to submit updated caps or not, and rather mean "have new SPS/PPS to be submitted?"
2014-06-26 12:45:34 +00:00
@@ -551,10 +551,16 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
nal_type, _nal_name (nal_type), nalu->size);
plugins: add built-in video parsers as "vaapiparse" element. The built-in video parsers elements are built into a single DSO named libgstvaapi_parse.so. The various video parsers could be accessed as vaapiparse_CODEC. For now, this only includes a modified version of h264parse so that to support H.264 MVC encoded streams.
2014-04-28 15:44:03 +00:00
switch (nal_type) {
+ case GST_H264_NAL_SUBSET_SPS:
h264parse: introduce new state tracking variables. Improve parser state tracking by introducing new flags reflecting it: "got-sps", "got-pps" and "got-slice". This is an addition for robustness purposes. Older have_sps and have_pps variables are kept because they have a different meaning. i.e. they are used for deciding on when to submit updated caps or not, and rather mean "have new SPS/PPS to be submitted?"
2014-06-26 12:45:34 +00:00
+ if (!GST_H264_PARSE_STATE_VALID (h264parse, GST_H264_PARSE_STATE_GOT_SPS))
+ return FALSE;
+ goto process_sps;
+
case GST_H264_NAL_SPS:
/* reset state, everything else is obsolete */
h264parse->state = 0;
+ process_sps:
plugins: add built-in video parsers as "vaapiparse" element. The built-in video parsers elements are built into a single DSO named libgstvaapi_parse.so. The various video parsers could be accessed as vaapiparse_CODEC. For now, this only includes a modified version of h264parse so that to support H.264 MVC encoded streams.
2014-04-28 15:44:03 +00:00
pres = gst_h264_parser_parse_sps (nalparser, nalu, &sps, TRUE);
/* arranged for a fallback sps.id, so use that one and only warn */
h264parse: introduce new state tracking variables. Improve parser state tracking by introducing new flags reflecting it: "got-sps", "got-pps" and "got-slice". This is an addition for robustness purposes. Older have_sps and have_pps variables are kept because they have a different meaning. i.e. they are used for deciding on when to submit updated caps or not, and rather mean "have new SPS/PPS to be submitted?"
2014-06-26 12:45:34 +00:00
if (pres != GST_H264_PARSER_OK) {
@@ -631,6 +637,7 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
plugins: add built-in video parsers as "vaapiparse" element. The built-in video parsers elements are built into a single DSO named libgstvaapi_parse.so. The various video parsers could be accessed as vaapiparse_CODEC. For now, this only includes a modified version of h264parse so that to support H.264 MVC encoded streams.
2014-04-28 15:44:03 +00:00
case GST_H264_NAL_SLICE_DPB:
case GST_H264_NAL_SLICE_DPC:
case GST_H264_NAL_SLICE_IDR:
+ case GST_H264_NAL_SLICE_EXT:
h264parse: improve conditions for skipping NAL units. Carefully track cases when skipping broken or invalid NAL units is necessary. In particular, always allow NAL units to be processed and let that gst_h264_parse_process_nal() function decide on whether the current NAL needs to be dropped or not. This fixes parsing of streams with SEI NAL buffering_period() message inserted between SPS and PPS, or SPS-Ext NAL following a traditional SPS NAL unit, among other cases too. Practical examples from the H.264 AVC conformance suite include alphaconformanceG, CVSE2_Sony_B, CVSE3_Sony_H, CVSEFDFT3_Sony_E when parsing in stream-format=byte-stream,alignment=au mode. https://bugzilla.gnome.org/show_bug.cgi?id=732203
2014-06-26 12:48:08 +00:00
/* expected state: got-sps|got-pps (valid picture headers) */
h264parse: introduce new state tracking variables. Improve parser state tracking by introducing new flags reflecting it: "got-sps", "got-pps" and "got-slice". This is an addition for robustness purposes. Older have_sps and have_pps variables are kept because they have a different meaning. i.e. they are used for deciding on when to submit updated caps or not, and rather mean "have new SPS/PPS to be submitted?"
2014-06-26 12:45:34 +00:00
h264parse->state &= GST_H264_PARSE_STATE_VALID_PICTURE_HEADERS;
h264parse: improve conditions for skipping NAL units. Carefully track cases when skipping broken or invalid NAL units is necessary. In particular, always allow NAL units to be processed and let that gst_h264_parse_process_nal() function decide on whether the current NAL needs to be dropped or not. This fixes parsing of streams with SEI NAL buffering_period() message inserted between SPS and PPS, or SPS-Ext NAL following a traditional SPS NAL unit, among other cases too. Practical examples from the H.264 AVC conformance suite include alphaconformanceG, CVSE2_Sony_B, CVSE3_Sony_H, CVSEFDFT3_Sony_E when parsing in stream-format=byte-stream,alignment=au mode. https://bugzilla.gnome.org/show_bug.cgi?id=732203
2014-06-26 12:48:08 +00:00
if (!GST_H264_PARSE_STATE_VALID (h264parse,
h264parse: introduce new state tracking variables. Improve parser state tracking by introducing new flags reflecting it: "got-sps", "got-pps" and "got-slice". This is an addition for robustness purposes. Older have_sps and have_pps variables are kept because they have a different meaning. i.e. they are used for deciding on when to submit updated caps or not, and rather mean "have new SPS/PPS to be submitted?"
2014-06-26 12:45:34 +00:00
@@ -638,13 +645,15 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
return FALSE;
plugins: add built-in video parsers as "vaapiparse" element. The built-in video parsers elements are built into a single DSO named libgstvaapi_parse.so. The various video parsers could be accessed as vaapiparse_CODEC. For now, this only includes a modified version of h264parse so that to support H.264 MVC encoded streams.
2014-04-28 15:44:03 +00:00
/* don't need to parse the whole slice (header) here */
- if (*(nalu->data + nalu->offset + 1) & 0x80) {
+ if (*(nalu->data + nalu->offset + nalu->header_bytes) & 0x80) {
/* means first_mb_in_slice == 0 */
/* real frame data */
GST_DEBUG_OBJECT (h264parse, "first_mb_in_slice = 0");
h264parse->frame_start = TRUE;
}
GST_DEBUG_OBJECT (h264parse, "frame start: %i", h264parse->frame_start);
+ if (nal_type == GST_H264_NAL_SLICE_EXT && !GST_H264_IS_MVC_NALU (nalu))
+ break;
{
GstH264SliceHdr slice;
h264parse: fix detection of access unit boundaries for MVC. The gst_h264_parse_collect_nal() function is a misnomer. In reality, this function is used to determine access unit boundaries, i.e. that is the key function for alignment=au output format generation.
2014-06-26 12:51:32 +00:00
@@ -741,8 +750,9 @@ gst_h264_parse_collect_nal (GstH264Parse * h264parse, const guint8 * data,
plugins: add built-in video parsers as "vaapiparse" element. The built-in video parsers elements are built into a single DSO named libgstvaapi_parse.so. The various video parsers could be accessed as vaapiparse_CODEC. For now, this only includes a modified version of h264parse so that to support H.264 MVC encoded streams.
2014-04-28 15:44:03 +00:00
* and also works with broken frame_num in NAL
* (where spec-wise would fail) */
nal_type = nnalu.type;
- complete = h264parse->picture_start && (nal_type >= GST_H264_NAL_SEI &&
- nal_type <= GST_H264_NAL_AU_DELIMITER);
+ complete = h264parse->picture_start && ((nal_type >= GST_H264_NAL_SEI &&
+ nal_type <= GST_H264_NAL_AU_DELIMITER) ||
+ (nal_type >= 14 && nal_type <= 18));
GST_LOG_OBJECT (h264parse, "next nal type: %d %s", nal_type,
_nal_name (nal_type));
h264parse: fix detection of access unit boundaries for MVC. The gst_h264_parse_collect_nal() function is a misnomer. In reality, this function is used to determine access unit boundaries, i.e. that is the key function for alignment=au output format generation.
2014-06-26 12:51:32 +00:00
@@ -750,7 +760,7 @@ gst_h264_parse_collect_nal (GstH264Parse * h264parse, const guint8 * data,
plugins: add built-in video parsers as "vaapiparse" element. The built-in video parsers elements are built into a single DSO named libgstvaapi_parse.so. The various video parsers could be accessed as vaapiparse_CODEC. For now, this only includes a modified version of h264parse so that to support H.264 MVC encoded streams.
2014-04-28 15:44:03 +00:00
|| nal_type == GST_H264_NAL_SLICE_DPA
|| nal_type == GST_H264_NAL_SLICE_IDR) &&
/* first_mb_in_slice == 0 considered start of frame */
- (nnalu.data[nnalu.offset + 1] & 0x80);
+ (nnalu.data[nnalu.offset + nnalu.header_bytes] & 0x80);
GST_LOG_OBJECT (h264parse, "au complete: %d", complete);
--
1.7.9.5
Reference in a new issue Copy permalink