Commit 9604342a authored by Mark Nauwelaerts's avatar Mark Nauwelaerts

h264parse: reflow slice nal processing

parent ef24518b
...@@ -407,7 +407,6 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu) ...@@ -407,7 +407,6 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
GstH264PPS pps; GstH264PPS pps;
GstH264SPS sps; GstH264SPS sps;
GstH264SEIMessage sei; GstH264SEIMessage sei;
gboolean slcparsed = FALSE, complete = FALSE;
GstH264NalParser *nalparser = h264parse->nalparser; GstH264NalParser *nalparser = h264parse->nalparser;
/* nothing to do for broken input */ /* nothing to do for broken input */
...@@ -472,38 +471,33 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu) ...@@ -472,38 +471,33 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
case GST_H264_NAL_SLICE_DPA: case GST_H264_NAL_SLICE_DPA:
case GST_H264_NAL_SLICE_DPB: case GST_H264_NAL_SLICE_DPB:
case GST_H264_NAL_SLICE_DPC: case GST_H264_NAL_SLICE_DPC:
slcparsed = TRUE; case GST_H264_NAL_SLICE_IDR:
/* don't need to parse the whole slice (header) here */ /* don't need to parse the whole slice (header) here */
if (*(nalu->data + nalu->offset + 1) & 0x80) { if (*(nalu->data + nalu->offset + 1) & 0x80) {
/* first_mb_in_slice == 0 completes a picture */ /* means first_mb_in_slice == 0 */
complete = TRUE; /* 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);
#ifndef GST_DISABLE_GST_DEBUG
{
GstH264SliceHdr slice;
GstH264ParserResult pres;
/* real frame data */ pres = gst_h264_parser_parse_slice_hdr (nalparser, nalu, &slice,
h264parse->frame_start |= complete; FALSE, FALSE);
GST_DEBUG_OBJECT (h264parse,
"parse result %d, first MB: %u, slice type: %u",
pres, slice.first_mb_in_slice, slice.type);
}
#endif
if (G_LIKELY (nal_type != GST_H264_NAL_SLICE_IDR &&
!h264parse->push_codec))
break;
/* if we need to sneak codec NALs into the stream, /* if we need to sneak codec NALs into the stream,
* this is a good place, so fake it as IDR * this is a good place, so fake it as IDR
* (which should be at start anyway) */ * (which should be at start anyway) */
GST_DEBUG_OBJECT (h264parse,
"frame start: %i, first_mb_in_slice == 0: %d",
h264parse->frame_start, complete);
if (G_LIKELY (!h264parse->push_codec))
break;
/* fall-through */
case GST_H264_NAL_SLICE_IDR:
if (!slcparsed) {
/* don't need to parse the whole slice (header) here */
if (*(nalu->data + nalu->offset + 1) & 0x80) {
/* first_mb_in_slice == 0 completes a picture */
complete = TRUE;
}
GST_DEBUG_OBJECT (h264parse,
"frame start: %i, first_mb_in_slice == 0: %d",
h264parse->frame_start, complete);
}
/* real frame data */
h264parse->frame_start |= complete;
/* mark where config needs to go if interval expired */ /* mark where config needs to go if interval expired */
/* mind replacement buffer if applicable */ /* mind replacement buffer if applicable */
if (h264parse->idr_pos == -1) { if (h264parse->idr_pos == -1) {
...@@ -514,18 +508,6 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu) ...@@ -514,18 +508,6 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
GST_DEBUG_OBJECT (h264parse, "marking IDR in frame at offset %d", GST_DEBUG_OBJECT (h264parse, "marking IDR in frame at offset %d",
h264parse->idr_pos); h264parse->idr_pos);
} }
#ifndef GST_DISABLE_GST_DEBUG
{
GstH264SliceHdr slice;
GstH264ParserResult pres;
pres = gst_h264_parser_parse_slice_hdr (nalparser, nalu, &slice,
FALSE, FALSE);
GST_DEBUG_OBJECT (h264parse,
"parse result %d, first MB: %u, slice type: %u",
pres, slice.first_mb_in_slice, slice.type);
}
#endif
break; break;
default: default:
gst_h264_parser_parse_nal (nalparser, nalu); gst_h264_parser_parse_nal (nalparser, nalu);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment