[FFmpeg-cvslog] avcodec/filter_units: Fix extradata and packets can have different bitstream format

[Zhao Zhili]

ffmpeg | branch: master | Zhao Zhili <zhilizhao at tencent.com> | Wed Aug 14 21:32:30 2024 +0800| [40dda881d6ad761b4589c3078b925e0d849546b3] | committer: Zhao Zhili

avcodec/filter_units: Fix extradata and packets can have different bitstream format

Filter init can change extradata from avcc/hvcc to annexb format.
With different passthrough logic, packets can still in avcc/hvcc
format. Use same passthrough logic for init and filter.

Signed-off-by: Zhao Zhili <zhilizhao at tencent.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40dda881d6ad761b4589c3078b925e0d849546b3
---

 libavcodec/bsf/filter_units.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/bsf/filter_units.c b/libavcodec/bsf/filter_units.c
index 029c86048b..336331733f 100644
--- a/libavcodec/bsf/filter_units.c
+++ b/libavcodec/bsf/filter_units.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdbool.h>
 #include <stdlib.h>
 
 #include "libavutil/mem.h"
@@ -44,6 +45,7 @@ typedef struct FilterUnitsContext {
     } mode;
     CodedBitstreamUnitType *type_list;
     int nb_types;
+    bool passthrough;
 } FilterUnitsContext;
 
 
@@ -111,7 +113,7 @@ static int filter_units_filter(AVBSFContext *bsf, AVPacket *pkt)
     if (err < 0)
         return err;
 
-    if (ctx->mode == NOOP && ctx->discard <= AVDISCARD_DEFAULT)
+    if (ctx->passthrough)
         return 0;
 
     err = ff_cbs_read_packet(ctx->cbc, frag, pkt);
@@ -181,6 +183,7 @@ static int filter_units_init(AVBSFContext *bsf)
             return err;
         }
     } else if (ctx->discard == AVDISCARD_NONE) {
+        ctx->passthrough = true;
         return 0;
     }