return nuh_layer_id == 0;
}
+static int h264_parse_nal_header(H2645NAL *nal, void *logctx)
+{
+ GetBitContext *gb = &nal->gb;
+
+ if (get_bits1(gb) != 0)
+ return AVERROR_INVALIDDATA;
+
+ nal->ref_idc = get_bits(gb, 2);
+ nal->type = get_bits(gb, 5);
+
+ av_log(logctx, AV_LOG_DEBUG,
+ "nal_unit_type: %d, nal_ref_idc: %d\n",
+ nal->type, nal->ref_idc);
+
+ return 1;
+}
int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
- void *logctx, int is_nalff, int nal_length_size)
+ void *logctx, int is_nalff, int nal_length_size,
+ enum AVCodecID codec_id)
{
int consumed, ret = 0;
if (ret < 0)
return ret;
- ret = hevc_parse_nal_header(nal, logctx);
+ if (codec_id == AV_CODEC_ID_HEVC)
+ ret = hevc_parse_nal_header(nal, logctx);
+ else
+ ret = h264_parse_nal_header(nal, logctx);
if (ret <= 0) {
if (ret < 0) {
av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit %d, skipping.\n",
GetBitContext gb;
+ /**
+ * NAL unit type
+ */
int type;
+
+ /**
+ * HEVC only, nuh_temporal_id_plus_1 - 1
+ */
int temporal_id;
+
+ /**
+ * H264 only, nal_ref_idc
+ */
+ int ref_idc;
} H2645NAL;
/* an input packet split into unescaped NAL units */
* Split an input packet into NAL units.
*/
int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
- void *logctx, int is_nalff, int nal_length_size);
+ void *logctx, int is_nalff, int nal_length_size,
+ enum AVCodecID codec_id);
/**
* Free all the allocated memory in the packet.
/* split the input packet into NAL units, so we know the upper bound on the
* number of slices in the frame */
ret = ff_h2645_packet_split(&s->pkt, buf, length, s->avctx, s->is_nalff,
- s->nal_length_size);
+ s->nal_length_size, s->avctx->codec_id);
if (ret < 0) {
av_log(s->avctx, AV_LOG_ERROR,
"Error splitting the input into NAL units.\n");
HEVCParserContext *ctx = s->priv_data;
int ret, i;
- ret = ff_h2645_packet_split(&ctx->pkt, buf, buf_size, avctx, 0, 0);
+ ret = ff_h2645_packet_split(&ctx->pkt, buf, buf_size, avctx, 0, 0,
+ AV_CODEC_ID_HEVC);
if (ret < 0)
return ret;