mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 19:50:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Mark Nauwelaerts 2012-02-15 17:14:34 +01:00
commit ca5010cc4b
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst-libs/gst/codecparsers/gsth264parser.c
View file

@ -1938,13 +1938,11 @@ gst_h264_parser_parse_sei (GstH264NalParser * nalparser, GstH264NalUnit * nalu,
sei->payloadType, payload_size); sei->payloadType, payload_size);
if (sei->payloadType == GST_H264_SEI_BUF_PERIOD) { if (sei->payloadType == GST_H264_SEI_BUF_PERIOD) {
/* Set the nal reader size properly */ /* size not set; might depend on emulation_prevention_three_byte */
nr.size = payload_size;
res = gst_h264_parser_parse_buffering_period (nalparser, res = gst_h264_parser_parse_buffering_period (nalparser,
&sei->buffering_period, &nr); &sei->buffering_period, &nr);
} else if (sei->payloadType == GST_H264_SEI_PIC_TIMING) { } else if (sei->payloadType == GST_H264_SEI_PIC_TIMING) {
/* Set the nal reader size properly */ /* size not set; might depend on emulation_prevention_three_byte */
nr.size = payload_size;
res = gst_h264_parser_parse_pic_timing (nalparser, &sei->pic_timing, &nr); res = gst_h264_parser_parse_pic_timing (nalparser, &sei->pic_timing, &nr);
} else } else
res = GST_H264_PARSER_OK; res = GST_H264_PARSER_OK;

4
gst/videoparsers/gsth264parse.c
View file

@ -520,7 +520,7 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
if (h264parse->format == GST_H264_PARSE_FORMAT_AVC) if (h264parse->format == GST_H264_PARSE_FORMAT_AVC)
h264parse->sei_pos = gst_adapter_available (h264parse->frame_out); h264parse->sei_pos = gst_adapter_available (h264parse->frame_out);
else else
h264parse->sei_pos = nalu->offset - 4; h264parse->sei_pos = nalu->sc_offset;
GST_DEBUG_OBJECT (h264parse, "marking SEI in frame at offset %d", GST_DEBUG_OBJECT (h264parse, "marking SEI in frame at offset %d",
h264parse->sei_pos); h264parse->sei_pos);
} }
@ -563,7 +563,7 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
if (h264parse->format == GST_H264_PARSE_FORMAT_AVC) if (h264parse->format == GST_H264_PARSE_FORMAT_AVC)
h264parse->idr_pos = gst_adapter_available (h264parse->frame_out); h264parse->idr_pos = gst_adapter_available (h264parse->frame_out);
else else
h264parse->idr_pos = nalu->offset - 4; h264parse->idr_pos = nalu->sc_offset;
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);
} }