mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-20 02:50:16 +00:00
1650471da3
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.
95 lines
4 KiB
Diff
95 lines
4 KiB
Diff
From b1974b68fac0dad1c76ab74f0b6b3d9ff99b6f27 Mon Sep 17 00:00:00 2001
|
|
From: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
|
|
Date: Tue, 19 Mar 2013 14:23:00 +0200
|
|
Subject: [PATCH 8/8] h264parse: add initial support for MVC NAL units.
|
|
|
|
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>
|
|
---
|
|
gst/vaapi/gsth264parse.c | 20 +++++++++++++++-----
|
|
1 file changed, 15 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
|
|
index 413a227..b4f20f7 100644
|
|
--- a/gst/vaapi/gsth264parse.c
|
|
+++ b/gst/vaapi/gsth264parse.c
|
|
@@ -433,7 +433,7 @@ gst_h264_parser_store_nal (GstH264Parse * h264parse, guint id,
|
|
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);
|
|
@@ -551,10 +551,16 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
|
|
nal_type, _nal_name (nal_type), nalu->size);
|
|
|
|
switch (nal_type) {
|
|
+ case GST_H264_NAL_SUBSET_SPS:
|
|
+ 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:
|
|
pres = gst_h264_parser_parse_sps (nalparser, nalu, &sps, TRUE);
|
|
/* arranged for a fallback sps.id, so use that one and only warn */
|
|
if (pres != GST_H264_PARSER_OK) {
|
|
@@ -631,6 +637,7 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
|
|
case GST_H264_NAL_SLICE_DPB:
|
|
case GST_H264_NAL_SLICE_DPC:
|
|
case GST_H264_NAL_SLICE_IDR:
|
|
+ case GST_H264_NAL_SLICE_EXT:
|
|
/* expected state: got-sps|got-pps (valid picture headers) */
|
|
h264parse->state &= GST_H264_PARSE_STATE_VALID_PICTURE_HEADERS;
|
|
if (!GST_H264_PARSE_STATE_VALID (h264parse,
|
|
@@ -638,13 +645,15 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
|
|
return FALSE;
|
|
|
|
/* 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;
|
|
|
|
@@ -741,8 +750,9 @@ gst_h264_parse_collect_nal (GstH264Parse * h264parse, const guint8 * data,
|
|
* 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));
|
|
@@ -750,7 +760,7 @@ gst_h264_parse_collect_nal (GstH264Parse * h264parse, const guint8 * data,
|
|
|| 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
|
|
|