@@ -32,6 +32,7 @@
#include "parser.h"
#define START_CODE 0x000001 ///< start_code_prefix_one_3bytes
+#define START_CODE_4 0x00000001 ///< start_code_4bytes
#define IS_IRAP_NAL(nal) (nal->type >= 16 && nal->type <= 23)
#define IS_IDR_NAL(nal) (nal->type == HEVC_NAL_IDR_W_RADL || nal->type == HEVC_NAL_IDR_N_LP)
@@ -239,7 +240,7 @@ static int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf,
}
}
/* didn't find a picture! */
- av_log(avctx, AV_LOG_ERROR, "missing picture in access unit\n");
+ av_log(avctx, AV_LOG_ERROR, "missing picture in access unit with size %d\n", buf_size);
return -1;
}
@@ -267,8 +268,7 @@ static int hevc_find_frame_end(AVCodecParserContext *s, const uint8_t *buf,
if ((nut >= HEVC_NAL_VPS && nut <= HEVC_NAL_EOB_NUT) || nut == HEVC_NAL_SEI_PREFIX ||
(nut >= 41 && nut <= 44) || (nut >= 48 && nut <= 55)) {
if (pc->frame_start_found) {
- pc->frame_start_found = 0;
- return i - 5;
+ goto found;
}
} else if (nut <= HEVC_NAL_RASL_R ||
(nut >= HEVC_NAL_BLA_W_LP && nut <= HEVC_NAL_CRA_NUT)) {
@@ -277,14 +277,19 @@ static int hevc_find_frame_end(AVCodecParserContext *s, const uint8_t *buf,
if (!pc->frame_start_found) {
pc->frame_start_found = 1;
} else { // First slice of next frame found
- pc->frame_start_found = 0;
- return i - 5;
+ goto found;
}
}
}
}
return END_NOT_FOUND;
+
+found:
+ pc->frame_start_found = 0;
+ if (((pc->state64 >> 3 * 8) & 0xFFFFFFFF) == START_CODE_4)
+ return i - 6;
+ return i - 5;
}
static int hevc_parse(AVCodecParserContext *s, AVCodecContext *avctx,
The startcode before VPS,SPS,PPS and the first NALU in an AU is 4 bytes. Blindly taking the startcode as 3 bytes will leave 0x00 in last packet and may lead to some warnings in parse_nal_units when s->flags is set to PARSER_FLAG_COMPLETE_FRAMES. Add 4 bytes startcode condition in hevc_find_frame_end. Modify the code to print the buf_size like in H264 and reduce the duplication. Signed-off-by: Linjie Fu <linjie.fu@intel.com> --- libavcodec/hevc_parser.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)