return 0;
}
-static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out)
+static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *pkt)
{
H264RedundantPPSContext *ctx = bsf->priv_data;
- AVPacket *in;
CodedBitstreamFragment *au = &ctx->access_unit;
int au_has_sps;
int err, i;
- err = ff_bsf_get_packet(bsf, &in);
+ err = ff_bsf_get_packet_ref(bsf, pkt);
if (err < 0)
return err;
- err = ff_cbs_read_packet(ctx->input, au, in);
+ err = ff_cbs_read_packet(ctx->input, au, pkt);
if (err < 0)
goto fail;
goto fail;
if (!au_has_sps) {
av_log(bsf, AV_LOG_VERBOSE, "Deleting redundant PPS "
- "at %"PRId64".\n", in->pts);
- err = ff_cbs_delete_unit(ctx->input, au, i);
- if (err < 0)
- goto fail;
+ "at %"PRId64".\n", pkt->pts);
+ ff_cbs_delete_unit(ctx->input, au, i);
+ i--;
+ continue;
}
}
if (nal->type == H264_NAL_SLICE ||
}
}
- err = ff_cbs_write_packet(ctx->output, out, au);
- if (err < 0)
- goto fail;
-
-
- err = av_packet_copy_props(out, in);
+ err = ff_cbs_write_packet(ctx->output, pkt, au);
if (err < 0)
goto fail;
err = 0;
fail:
- ff_cbs_fragment_uninit(ctx->output, au);
- av_packet_free(&in);
+ ff_cbs_fragment_reset(ctx->output, au);
if (err < 0)
- av_packet_unref(out);
+ av_packet_unref(pkt);
return err;
}
err = 0;
fail:
- ff_cbs_fragment_uninit(ctx->output, au);
+ ff_cbs_fragment_reset(ctx->output, au);
return err;
}
static void h264_redundant_pps_close(AVBSFContext *bsf)
{
H264RedundantPPSContext *ctx = bsf->priv_data;
+
+ ff_cbs_fragment_free(ctx->input, &ctx->access_unit);
ff_cbs_close(&ctx->input);
ff_cbs_close(&ctx->output);
}