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

h265parse: Set PTS/DTS and DISCONT on crafted NAL

Browse source 
When we inject a NAL in the bitstream before another one, make
sure to pass both DTS and PTS. Also make sure to transfer the
DISCONT flag properly.
This commit is contained in:
Nicolas Dufresne 2018-10-03 15:53:23 -04:00 committed by Nicolas Dufresne
parent c52fdf994c
commit 7cba3847ec
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/videoparsers/gsth265parse.c
View file

@ -2339,7 +2339,7 @@ discard:
* No ownership is taken of @nal */ * No ownership is taken of @nal */
static GstFlowReturn static GstFlowReturn
gst_h265_parse_push_codec_buffer (GstH265Parse * h265parse, GstBuffer * nal, gst_h265_parse_push_codec_buffer (GstH265Parse * h265parse, GstBuffer * nal,
GstClockTime ts) GstBuffer * buffer)
{ {
GstMapInfo map; GstMapInfo map;
@ -2348,7 +2348,13 @@ gst_h265_parse_push_codec_buffer (GstH265Parse * h265parse, GstBuffer * nal,
map.data, map.size); map.data, map.size);
gst_buffer_unmap (nal, &map); gst_buffer_unmap (nal, &map);
GST_BUFFER_TIMESTAMP (nal) = ts; if (h265parse->discont) {
GST_BUFFER_FLAG_SET (nal, GST_BUFFER_FLAG_DISCONT);
h265parse->discont = FALSE;
}
GST_BUFFER_PTS (nal) = GST_BUFFER_PTS (buffer);
GST_BUFFER_DTS (nal) = GST_BUFFER_DTS (buffer);
GST_BUFFER_DURATION (nal) = 0; GST_BUFFER_DURATION (nal) = 0;
return gst_pad_push (GST_BASE_PARSE_SRC_PAD (h265parse), nal); return gst_pad_push (GST_BASE_PARSE_SRC_PAD (h265parse), nal);
@ -2462,7 +2468,6 @@ gst_h265_parse_handle_vps_sps_pps_nals (GstH265Parse * h265parse,
GstBuffer *codec_nal; GstBuffer *codec_nal;
gint i; gint i;
gboolean send_done = FALSE; gboolean send_done = FALSE;
GstClockTime timestamp = GST_BUFFER_TIMESTAMP (buffer);
if (h265parse->have_vps_in_frame && h265parse->have_sps_in_frame if (h265parse->have_vps_in_frame && h265parse->have_sps_in_frame
&& h265parse->have_pps_in_frame) { && h265parse->have_pps_in_frame) {
@ -2476,21 +2481,21 @@ gst_h265_parse_handle_vps_sps_pps_nals (GstH265Parse * h265parse,
for (i = 0; i < GST_H265_MAX_VPS_COUNT; i++) { for (i = 0; i < GST_H265_MAX_VPS_COUNT; i++) {
if ((codec_nal = h265parse->vps_nals[i])) { if ((codec_nal = h265parse->vps_nals[i])) {
GST_DEBUG_OBJECT (h265parse, "sending VPS nal"); GST_DEBUG_OBJECT (h265parse, "sending VPS nal");
gst_h265_parse_push_codec_buffer (h265parse, codec_nal, timestamp); gst_h265_parse_push_codec_buffer (h265parse, codec_nal, buffer);
send_done = TRUE; send_done = TRUE;
} }
} }
for (i = 0; i < GST_H265_MAX_SPS_COUNT; i++) { for (i = 0; i < GST_H265_MAX_SPS_COUNT; i++) {
if ((codec_nal = h265parse->sps_nals[i])) { if ((codec_nal = h265parse->sps_nals[i])) {
GST_DEBUG_OBJECT (h265parse, "sending SPS nal"); GST_DEBUG_OBJECT (h265parse, "sending SPS nal");
gst_h265_parse_push_codec_buffer (h265parse, codec_nal, timestamp); gst_h265_parse_push_codec_buffer (h265parse, codec_nal, buffer);
send_done = TRUE; send_done = TRUE;
} }
} }
for (i = 0; i < GST_H265_MAX_PPS_COUNT; i++) { for (i = 0; i < GST_H265_MAX_PPS_COUNT; i++) {
if ((codec_nal = h265parse->pps_nals[i])) { if ((codec_nal = h265parse->pps_nals[i])) {
GST_DEBUG_OBJECT (h265parse, "sending PPS nal"); GST_DEBUG_OBJECT (h265parse, "sending PPS nal");
gst_h265_parse_push_codec_buffer (h265parse, codec_nal, timestamp); gst_h265_parse_push_codec_buffer (h265parse, codec_nal, buffer);
send_done = TRUE; send_done = TRUE;
} }
} }