avcodec/bsf: Avoid allocation for AVBSFInternal

Do this by allocating AVBSFContext together with the data that is currently in AVBSFInternal; or rather: Put AVBSFContext at the beginning of a new structure called FFBSFContext (which encompasses more than just the internal fields and is a proper context in its own right, hence the name) and remove the AVBSFInternal altogether.

Andreas Rheinhardt committed 5 years ago

Commit afeefb31 parent 52bd3992 files · +24 −34Browse files

Showing the changes to libavcodec (2 of 2 files). Show all

Unified · Split

2 files

libavcodec/bsf.c +24 −26
libavcodec/bsf.h +0 −8

libavcodec/bsf.c+24−26

 #define IS_EMPTY(pkt) (!(pkt)->data && !(pkt)->side_data_elems)
-struct AVBSFInternal {
+typedef struct FFBSFContext {
+    AVBSFContext pub;
     AVPacket *buffer_pkt;
     int eof;
-};
+} FFBSFContext;
+static av_always_inline FFBSFContext *ffbsfcontext(AVBSFContext *ctx)
+{
+    return (FFBSFContext *)ctx;
+}
 void av_bsf_free(AVBSFContext **pctx)
 {
     AVBSFContext *ctx;
+    FFBSFContext *bsfi;
     if (!pctx || !*pctx)
         return;
-    ctx = *pctx;
+    ctx  = *pctx;
+    bsfi = ffbsfcontext(ctx);
-    if (ctx->internal) {
+    if (ctx->priv_data) {
         if (ctx->filter->close)
             ctx->filter->close(ctx);
-        av_packet_free(&ctx->internal->buffer_pkt);
+        if (ctx->filter->priv_class)
-        av_freep(&ctx->internal);
+            av_opt_free(ctx->priv_data);
+        av_freep(&ctx->priv_data);
     }
-    if (ctx->filter->priv_class && ctx->priv_data)
+    av_packet_free(&bsfi->buffer_pkt);
-        av_opt_free(ctx->priv_data);
-    av_freep(&ctx->priv_data);
     avcodec_parameters_free(&ctx->par_in);
     avcodec_parameters_free(&ctx->par_out);
 int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx)
 {
     AVBSFContext *ctx;
-    AVBSFInternal *bsfi;
+    FFBSFContext *bsfi;
     int ret;
-    ctx = av_mallocz(sizeof(*ctx));
+    bsfi = av_mallocz(sizeof(*bsfi));
-    if (!ctx)
+    if (!bsfi)
         return AVERROR(ENOMEM);
+    ctx  = &bsfi->pub;
     ctx->av_class = &bsf_class;
     ctx->filter   = filter;
             av_opt_set_defaults(ctx->priv_data);
         }
     }
-    /* Allocate AVBSFInternal; must happen after priv_data has been allocated
-     * so that a filter->close needing priv_data is never called without. */
-    bsfi = av_mallocz(sizeof(*bsfi));
-    if (!bsfi) {
-        ret = AVERROR(ENOMEM);
-        goto fail;
-    }
-    ctx->internal = bsfi;
     bsfi->buffer_pkt = av_packet_alloc();
     if (!bsfi->buffer_pkt) {
         ret = AVERROR(ENOMEM);
 void av_bsf_flush(AVBSFContext *ctx)
 {
-    AVBSFInternal *bsfi = ctx->internal;
+    FFBSFContext *const bsfi = ffbsfcontext(ctx);
     bsfi->eof = 0;
 int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt)
 {
-    AVBSFInternal *bsfi = ctx->internal;
+    FFBSFContext *const bsfi = ffbsfcontext(ctx);
     int ret;
     if (!pkt || IS_EMPTY(pkt)) {
 int ff_bsf_get_packet(AVBSFContext *ctx, AVPacket **pkt)
 {
-    AVBSFInternal *bsfi = ctx->internal;
+    FFBSFContext *const bsfi = ffbsfcontext(ctx);
     AVPacket *tmp_pkt;
     if (bsfi->eof)
 int ff_bsf_get_packet_ref(AVBSFContext *ctx, AVPacket *pkt)
 {
-    AVBSFInternal *bsfi = ctx->internal;
+    FFBSFContext *const bsfi = ffbsfcontext(ctx);
     if (bsfi->eof)
         return AVERROR_EOF;

libavcodec/bsf.h+0−8

  * @{
  */
-typedef struct AVBSFInternal AVBSFInternal;
 /**
  * The bitstream filter state.
  *
      */
     const struct AVBitStreamFilter *filter;
-    /**
-     * Opaque libavcodec internal data. Must not be touched by the caller in any
-     * way.
-     */
-    AVBSFInternal *internal;
     /**
      * Opaque filter-specific private data. If filter->priv_class is non-NULL,
      * this is an AVOptions-enabled struct.

avcodec/bsf: Avoid allocation for AVBSFInternal

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code