int global_pic_init_qp;
int current_pic_init_qp;
+ int extradata_pic_init_qp;
} H264RedundantPPSContext;
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)
- return err;
+ goto fail;
au_has_sps = 0;
for (i = 0; i < au->nb_units; i++) {
if (nal->type == H264_NAL_SPS)
au_has_sps = 1;
if (nal->type == H264_NAL_PPS) {
- h264_redundant_pps_fixup_pps(ctx, nal->content);
+ err = h264_redundant_pps_fixup_pps(ctx, nal->content);
+ if (err < 0)
+ goto fail;
if (!au_has_sps) {
- av_log(ctx, AV_LOG_VERBOSE, "Deleting redundant PPS "
- "at %"PRId64".\n", in->pts);
+ av_log(bsf, AV_LOG_VERBOSE, "Deleting redundant PPS "
+ "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);
+ err = ff_cbs_write_packet(ctx->output, pkt, au);
if (err < 0)
- return err;
+ goto fail;
- ff_cbs_fragment_uninit(ctx->output, au);
-
- err = av_packet_copy_props(out, in);
+ err = 0;
+fail:
+ ff_cbs_fragment_reset(ctx->output, au);
if (err < 0)
- return err;
+ av_packet_unref(pkt);
- av_packet_free(&in);
-
- return 0;
+ return err;
}
static int h264_redundant_pps_init(AVBSFContext *bsf)
err = ff_cbs_read_extradata(ctx->input, au, bsf->par_in);
if (err < 0) {
av_log(bsf, AV_LOG_ERROR, "Failed to read extradata.\n");
- return err;
+ goto fail;
}
for (i = 0; i < au->nb_units; i++) {
- if (au->units[i].type == H264_NAL_PPS)
- h264_redundant_pps_fixup_pps(ctx, au->units[i].content);
+ if (au->units[i].type == H264_NAL_PPS) {
+ err = h264_redundant_pps_fixup_pps(ctx, au->units[i].content);
+ if (err < 0)
+ goto fail;
+ }
}
+ ctx->extradata_pic_init_qp = ctx->current_pic_init_qp;
err = ff_cbs_write_extradata(ctx->output, bsf->par_out, au);
if (err < 0) {
av_log(bsf, AV_LOG_ERROR, "Failed to write extradata.\n");
- return err;
+ goto fail;
}
-
- ff_cbs_fragment_uninit(ctx->output, au);
}
- return 0;
+ err = 0;
+fail:
+ ff_cbs_fragment_reset(ctx->output, au);
+ return err;
+}
+
+static void h264_redundant_pps_flush(AVBSFContext *bsf)
+{
+ H264RedundantPPSContext *ctx = bsf->priv_data;
+ ctx->current_pic_init_qp = ctx->extradata_pic_init_qp;
}
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);
}
.name = "h264_redundant_pps",
.priv_data_size = sizeof(H264RedundantPPSContext),
.init = &h264_redundant_pps_init,
+ .flush = &h264_redundant_pps_flush,
.close = &h264_redundant_pps_close,
.filter = &h264_redundant_pps_filter,
.codec_ids = h264_redundant_pps_codec_ids,