avcodec/ac3enc_template: Perform compile-time checks at compile-time

[ffmpeg] / libavcodec / h264_redundant_pps_bsf.c

diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c
index db8717d69a061d1718b55ebe165d86112bd8b907..cf41abe96cd23d4d4d991818b66695611380579e 100644 (file)
--- a/libavcodec/h264_redundant_pps_bsf.c
+++ b/libavcodec/h264_redundant_pps_bsf.c
@@ -22,6 +22,7 @@
 #include "libavutil/mem.h"
 
 #include "bsf.h"
+#include "bsf_internal.h"
 #include "cbs.h"
 #include "cbs_h264.h"
 #include "h264.h"
@@ -40,8 +41,19 @@ typedef struct H264RedundantPPSContext {
 
 
 static int h264_redundant_pps_fixup_pps(H264RedundantPPSContext *ctx,
-                                        H264RawPPS *pps)
+                                        CodedBitstreamUnit *unit)
 {
+    H264RawPPS *pps;
+    int err;
+
+    // The changes we are about to perform affect the parsing process,
+    // so we must make sure that the PPS is writable, otherwise the
+    // parsing of future slices will be incorrect and even raise errors.
+    err = ff_cbs_make_unit_writable(ctx->input, unit);
+    if (err < 0)
+        return err;
+    pps = unit->content;
+
     // Record the current value of pic_init_qp in order to fix up
     // following slices, then overwrite with the global value.
     ctx->current_pic_init_qp = pps->pic_init_qp_minus26 + 26;
@@ -66,19 +78,18 @@ static int h264_redundant_pps_fixup_slice(H264RedundantPPSContext *ctx,
     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;
 
@@ -89,15 +100,15 @@ static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out)
         if (nal->type == H264_NAL_SPS)
             au_has_sps = 1;
         if (nal->type == H264_NAL_PPS) {
-            err = h264_redundant_pps_fixup_pps(ctx, nal->content);
+            err = h264_redundant_pps_fixup_pps(ctx, nal);
             if (err < 0)
                 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(au, i);
+                i--;
+                continue;
             }
         }
         if (nal->type == H264_NAL_SLICE ||
@@ -107,21 +118,15 @@ static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out)
         }
     }
 
-    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_reset(ctx->output, au);
-    av_packet_free(&in);
+    ff_cbs_fragment_reset(au);
     if (err < 0)
-        av_packet_unref(out);
+        av_packet_unref(pkt);
 
     return err;
 }
@@ -151,7 +156,7 @@ static int h264_redundant_pps_init(AVBSFContext *bsf)
 
         for (i = 0; i < au->nb_units; i++) {
             if (au->units[i].type == H264_NAL_PPS) {
-                err = h264_redundant_pps_fixup_pps(ctx, au->units[i].content);
+                err = h264_redundant_pps_fixup_pps(ctx, &au->units[i]);
                 if (err < 0)
                     goto fail;
             }
@@ -167,7 +172,7 @@ static int h264_redundant_pps_init(AVBSFContext *bsf)
 
     err = 0;
 fail:
-    ff_cbs_fragment_reset(ctx->output, au);
+    ff_cbs_fragment_reset(au);
     return err;
 }
 
@@ -181,7 +186,7 @@ static void h264_redundant_pps_close(AVBSFContext *bsf)
 {
     H264RedundantPPSContext *ctx = bsf->priv_data;
 
-    ff_cbs_fragment_free(ctx->input, &ctx->access_unit);
+    ff_cbs_fragment_free(&ctx->access_unit);
     ff_cbs_close(&ctx->input);
     ff_cbs_close(&ctx->output);
 }