From patchwork Mon Aug 10 18:55:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 21593 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 07D9244A764 for ; Mon, 10 Aug 2020 21:56:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D26C868A494; Mon, 10 Aug 2020 21:56:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1750C6883D0 for ; Mon, 10 Aug 2020 21:56:38 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id x12so7616400qtp.1 for ; Mon, 10 Aug 2020 11:56:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=KRn+0E4t6ohHt6BPtPPr+LMtyjE/D4QLkuypB1mBwIY=; b=UEAnYhDKuycXskPLlRiXzJzs5P50UTjBwmdTopqBQncUanD+Z3ZotL03sMoF1GT5n1 63gJU/xzUDRt9ZY3BEhZSfgQTbKNKxlwyx0F53BageNd1F3dUyrtxOsVWwDquIMlWyuZ Qfd+zJhl9ttWBRS5R/yHP1RlQiO6NT54lGd3cocRvA5rg8WPqbLYCOGAnF9z7BDTfu6+ D9qlzRNd6vUjOrktfki3vNrofXZA+dnj4XCmQUDcbR7QytifGyYEebBIEs2WCR0oNi72 v+XnbsxerIjY1Nt78cWmbe0rcmkQ1WKlKtloyjtD//Vk9oTbIKD8MADz0H1sXDQMy/gs cB2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KRn+0E4t6ohHt6BPtPPr+LMtyjE/D4QLkuypB1mBwIY=; b=qKH842VsDsdOeH+joeLd8++EFwls6SCy2RmNOBvKYe3OCYA2gjepceQ64zYC9Dl0rt /FzFEg2X3osY9m06qdlQyO96QjSWjmXc3EXV6oLkHot9aQTHQs11oPCbzEd+e/vH1YsG TNpgfaerE4e457WEIf82xccj6y86Migma63OqiEva5dUDkosf70rHMNNQss9dtkO7mbO DmQJbeQXc/yL2dauugGy8AfCnjXOVF2gvceCMaOB460AVeyGxtGoPwV06ZoOZscGghcC QKNo+MUpvtuH/cp01XZpfZWONzbSf0bP8pEaFn3dm5k8BWRYJn4Rl0pOWXS+uf5tmmt3 MaOQ== X-Gm-Message-State: AOAM5308oP5zLqedzamCXNJJf+CHXeg2mllmsTtYSvcsnexnj65nnxi7 vgcwEp66kKCHw2ytOQ/e9N8JSael X-Google-Smtp-Source: ABdhPJwEnoHH85uF/+jpgRLI9mRhjToZOK9yDZwt83NHiWNCwFzyShzkExUXqFMZ+WvphITMfps1ng== X-Received: by 2002:ac8:450c:: with SMTP id q12mr28453516qtn.292.1597085796405; Mon, 10 Aug 2020 11:56:36 -0700 (PDT) Received: from localhost.localdomain ([181.23.72.45]) by smtp.gmail.com with ESMTPSA id c205sm14630594qkg.98.2020.08.10.11.56.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2020 11:56:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Aug 2020 15:55:30 -0300 Message-Id: <20200810185530.5306-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <81ae1e7a-a4d5-eaac-57cd-f91b135f70f9@gmail.com> References: <81ae1e7a-a4d5-eaac-57cd-f91b135f70f9@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3 v2] avcodec/bsf: add av_bsf_close() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This function lets the API user reuse an AVBSFContext in case of stream parameter changes. Signed-off-by: James Almer --- libavcodec/bsf.c | 26 ++++++++++++++++++++++++++ libavcodec/bsf.h | 14 ++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index d71bc32584..c8acd40ec0 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -29,6 +29,7 @@ #include "bsf_internal.h" #include "codec_desc.h" #include "codec_par.h" +#include "internal.h" #define IS_EMPTY(pkt) (!(pkt)->data && !(pkt)->side_data_elems) @@ -197,6 +198,31 @@ void av_bsf_flush(AVBSFContext *ctx) ctx->filter->flush(ctx); } +void av_bsf_close(AVBSFContext *ctx) +{ + AVBSFInternal *bsfi = ctx->internal; + + if (ctx->filter->close) + ctx->filter->close(ctx); + if (ctx->priv_data) { + if (ctx->filter->priv_class) + av_opt_free(ctx->priv_data); + memset(ctx->priv_data, 0, ctx->filter->priv_data_size); + if (ctx->filter->priv_class) { + *(const AVClass **)ctx->priv_data = ctx->filter->priv_class; + av_opt_set_defaults(ctx->priv_data); + } + } + + bsfi->eof = 0; + av_packet_unref(bsfi->buffer_pkt); + + ctx->time_base_out = ctx->time_base_in = (AVRational){ 0, 0 }; + + ff_codec_parameters_reset(ctx->par_in); + ff_codec_parameters_reset(ctx->par_out); +} + int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt) { AVBSFInternal *bsfi = ctx->internal; diff --git a/libavcodec/bsf.h b/libavcodec/bsf.h index 3b5faa85cb..f72c45f7e5 100644 --- a/libavcodec/bsf.h +++ b/libavcodec/bsf.h @@ -216,12 +216,26 @@ int av_bsf_receive_packet(AVBSFContext *ctx, AVPacket *pkt); /** * Reset the internal bitstream filter state. Should be called e.g. when seeking. + * + * @see av_bsf_close(). */ void av_bsf_flush(AVBSFContext *ctx); +/** + * Close a bitstream filter context, leaving it in the same state as when it was + * freshly allocated. May be called e.g. to reuse the context in case of stream + * parameter changes. + * + * @see av_bsf_flush(). + * @see av_bsf_free(). + */ +void av_bsf_close(AVBSFContext *ctx); + /** * Free a bitstream filter context and everything associated with it; write NULL * into the supplied pointer. + * + * @see av_bsf_close(). */ void av_bsf_free(AVBSFContext **ctx);