From 269ab891c574263cb5fdf48de8e396b8418be1f4 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Thu, 7 May 2020 11:06:45 -0400 Subject: [PATCH] h264/h265parse: Fix initial skip Account for start codes possibly be 4 bytes. For HEVC, also take into account that we might be missing only one of the two identification bytes. Part-of: --- gst/videoparsers/gsth264parse.c | 3 ++- gst/videoparsers/gsth265parse.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c index 8f12151967..83c985393a 100644 --- a/gst/videoparsers/gsth264parse.c +++ b/gst/videoparsers/gsth264parse.c @@ -1384,7 +1384,8 @@ gst_h264_parse_handle_frame (GstBaseParse * parse, } break; case GST_H264_PARSER_NO_NAL: - *skipsize = size - 3; + /* Start code may have up to 4 bytes */ + *skipsize = size - 4; goto skip; break; default: diff --git a/gst/videoparsers/gsth265parse.c b/gst/videoparsers/gsth265parse.c index 0c4ca177bd..849e743633 100644 --- a/gst/videoparsers/gsth265parse.c +++ b/gst/videoparsers/gsth265parse.c @@ -1208,7 +1208,10 @@ gst_h265_parse_handle_frame (GstBaseParse * parse, } break; case GST_H265_PARSER_NO_NAL: - *skipsize = size - 3; + /* start code may have up to 4 bytes, and we may also get that return + * value if only one of the two header bytes are present, make sure + * not to skip too much */ + *skipsize = size - 5; goto skip; default: /* should not really occur either */