mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264parse: also mind SEI position for config data insertion

Browse source 
Fixes #668627.
This commit is contained in:
Mark Nauwelaerts 2012-02-01 12:23:23 +01:00
parent 136f42974d
commit 283f97cb79
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/videoparsers/gsth264parse.c
View file

@ -186,6 +186,7 @@ gst_h264_parse_reset_frame (GstH264Parse * h264parse)
h264parse->picture_start = FALSE; h264parse->picture_start = FALSE;
h264parse->update_caps = FALSE; h264parse->update_caps = FALSE;
h264parse->idr_pos = -1; h264parse->idr_pos = -1;
h264parse->sei_pos = -1;
h264parse->keyframe = FALSE; h264parse->keyframe = FALSE;
h264parse->frame_start = FALSE; h264parse->frame_start = FALSE;
gst_adapter_clear (h264parse->frame_out); gst_adapter_clear (h264parse->frame_out);
@ -504,6 +505,15 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
GST_TIME_ARGS (h264parse->ts_trn_nb)); GST_TIME_ARGS (h264parse->ts_trn_nb));
break; break;
} }
/* mark SEI pos */
if (h264parse->sei_pos == -1) {
if (h264parse->format == GST_H264_PARSE_FORMAT_AVC)
h264parse->sei_pos = gst_adapter_available (h264parse->frame_out);
else
h264parse->sei_pos = nalu->offset - 4;
GST_DEBUG_OBJECT (h264parse, "marking SEI in frame at offset %d",
h264parse->sei_pos);
}
break; break;
case GST_H264_NAL_SLICE: case GST_H264_NAL_SLICE:
@ -547,6 +557,12 @@ 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);
} }
/* if SEI preceeds (faked) IDR, then we have to insert config there */
if (h264parse->sei_pos >= 0 && h264parse->idr_pos > h264parse->sei_pos) {
h264parse->idr_pos = h264parse->sei_pos;
GST_DEBUG_OBJECT (h264parse, "moved IDR mark to SEI position %d",
h264parse->idr_pos);
}
break; break;
default: default:
gst_h264_parser_parse_nal (nalparser, nalu); gst_h264_parser_parse_nal (nalparser, nalu);

2
gst/videoparsers/gsth264parse.h
View file

@ -98,7 +98,7 @@ struct _GstH264Parse
/* frame parsing */ /* frame parsing */
/*guint last_nal_pos;*/ /*guint last_nal_pos;*/
/*guint next_sc_pos;*/ /*guint next_sc_pos;*/
gint idr_pos; gint idr_pos, sei_pos;
gboolean update_caps; gboolean update_caps;
GstAdapter *frame_out; GstAdapter *frame_out;
gboolean keyframe; gboolean keyframe;