From patchwork Mon Aug 10 13:55:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21582 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2232444A709 for ; Mon, 10 Aug 2020 16:55:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D831D68AA6D; Mon, 10 Aug 2020 16:55:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05CD1689C95 for ; Mon, 10 Aug 2020 16:55:32 +0300 (EEST) Received: by mail-ej1-f67.google.com with SMTP id qc22so9455912ejb.4 for ; Mon, 10 Aug 2020 06:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=v1xbc/2IE+IEvScNJcrPaPL05zuGOLrk9dhdb9RqeIk=; b=S2pnfFAxHqXijFpcZ+tuFgBKDNyPYjduOHf29g04XFdX/Diryidh7ERAxQ0QRt3k0y uvdqZ1UrgMGpyKBIak0SRAQcIOG5uVaoI3UO7eXlYSPWC0AppwUt8h3Tj/Q9H5Jstndb rLO5mynQs3/A5o96axWtLenDC6+n+i/8bDT7B970OtACGFD+EucVxhX5qBMLU0Bcmp8g LqPUpP16J/OOYWB7rukz/+mdszxRGpHpjweW4/G/ttRRrwD5cTB8+2YsB84SCGHLj+6u EefYRGd8AuhDXeTQAKDAUJCZDZ6v63Qw91ziYvnNVLcw/+VZ9kIlfNDRSHHCT2f7B9+J yf/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=v1xbc/2IE+IEvScNJcrPaPL05zuGOLrk9dhdb9RqeIk=; b=NBjWJlRkkQiv+q2vjSM4WCpdRKb/miXj7ndeF8Xy5XZ0jDjQPvb4OPrrNAaWj7PTT9 wvpLbbP0sOiu9T0QnwEvSYK8AUhXuRlGpbuNPUuHeAXrK3JwDdNK4wWAy86Q9yVmMTKP tiZmqPpleBMRoX/xhvrQsLj0S061sK7LVBvXcs3iKqOeXHWisP1OGGqoRMh7MJ2H864n sTy5lfJpjB0mRrm1qlXYbYRlmaskzoseRCqTKOoHb078DBW+Or4VeATBnVYPn9h94IC6 jCGLGG2Zm3wnVTKiWr+QFlZC7jO3gIOxC9pENxhzUaFboHd7qrZdSxOOiBiUwniKiOi5 Cr7g== X-Gm-Message-State: AOAM533RWBmczahJUSx7cIMq2zxJZgRfcMgY2vqLroqQs5hZOE9eocWK +vxptoLuVni2wN7J7nj14He1TZaM X-Google-Smtp-Source: ABdhPJxf80RyI+ckrxzpMZ6pP3SeRvSe/W+lWFCe+4FVLm9C/b32+rOZ4+qLPIkfxP+mIwqThfdNfg== X-Received: by 2002:a17:906:4f0f:: with SMTP id t15mr21039976eju.337.1597067731210; Mon, 10 Aug 2020 06:55:31 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id g9sm12704615edk.97.2020.08.10.06.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2020 06:55:30 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Aug 2020 15:55:22 +0200 Message-Id: <20200810135522.5972-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/bsf: Avoid allocation for AVBSFInternal X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" by allocating it together with the AVBSFContext. Signed-off-by: Andreas Rheinhardt --- Similar things can of course be done with other structures. I did only this one to see whether everyone is ok with this. libavcodec/bsf.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index d71bc32584..9781be78e7 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -37,6 +37,11 @@ struct AVBSFInternal { int eof; }; +typedef struct AVBSFCombined { + AVBSFContext bsf; + AVBSFInternal internal; +} AVBSFCombined; + void av_bsf_free(AVBSFContext **pctx) { AVBSFContext *ctx; @@ -50,9 +55,8 @@ void av_bsf_free(AVBSFContext **pctx) if (ctx->filter->priv_class && ctx->priv_data) av_opt_free(ctx->priv_data); - if (ctx->internal) - av_packet_free(&ctx->internal->buffer_pkt); - av_freep(&ctx->internal); + av_assert2(ctx->internal); + av_packet_free(&ctx->internal->buffer_pkt); av_freep(&ctx->priv_data); avcodec_parameters_free(&ctx->par_in); @@ -93,14 +97,18 @@ const AVClass *av_bsf_get_class(void) int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx) { + AVBSFCombined *com; AVBSFContext *ctx; AVBSFInternal *bsfi; int ret; - ctx = av_mallocz(sizeof(*ctx)); - if (!ctx) + com = av_mallocz(sizeof(*com)); + if (!com) return AVERROR(ENOMEM); + ctx = &com->bsf; + bsfi = ctx->internal = &com->internal; + ctx->av_class = &bsf_class; ctx->filter = filter; @@ -111,13 +119,6 @@ int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx) goto fail; } - 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);