int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, AVPacket *pkt,
const uint8_t *buf, int len,
- int start_skip, int *nal_counters,
+ int skip_between, int *nal_counters,
int nal_mask)
{
int pass = 0;
const uint8_t *src = buf;
int src_len = len;
- src += start_skip;
- src_len -= start_skip;
-
while (src_len > 2) {
uint16_t nal_size = AV_RB16(src);
}
// eat what we handled
- src += nal_size + start_skip;
- src_len -= nal_size + start_skip;
+ src += nal_size + skip_between;
+ src_len -= nal_size + skip_between;
}
if (pass == 0) {
buf += RTP_HEVC_PAYLOAD_HEADER_SIZE;
len -= RTP_HEVC_PAYLOAD_HEADER_SIZE;
+ /* pass the HEVC DONL field */
+ if (rtp_hevc_ctx->using_donl_field) {
+ buf += RTP_HEVC_DONL_FIELD_SIZE;
+ len -= RTP_HEVC_DONL_FIELD_SIZE;
+ }
+
res = ff_h264_handle_aggregated_packet(ctx, pkt, buf, len,
rtp_hevc_ctx->using_donl_field ?
- RTP_HEVC_DONL_FIELD_SIZE : 0,
+ RTP_HEVC_DOND_FIELD_SIZE : 0,
NULL, 0);
if (res < 0)
return res;