From patchwork Sat May 30 16:05:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20019 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 1878244AD87 for ; Sat, 30 May 2020 19:12:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 33E6268B20F; Sat, 30 May 2020 19:07:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C002768B1CA for ; Sat, 30 May 2020 19:06:56 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id k26so7139754wmi.4 for ; Sat, 30 May 2020 09:06:56 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=5/BVTGaeR51tH9kYHaGtoaqztdUamc4uRhagnwPXzko=; b=HPAeDJOF+M2WiHtx8GC68X+zsoI6xdrZcMF/YWqHJlFq3ROKb+WjKE18t77ZoE0+47 veuzuycIv08P+HPO9xpy691nAZpRL2MSfSz+oS6nmqcPALiByCxIsVQ+FM1OIaHpDYd3 2YTo8aNFFL97sfvHiE4S7IDzv06XeOlaVOq+6w//NPbZesmdMG1Dc0srPUc8ErUgs4AL mDtu6u/gLGcz4D5uGuAWeAHQtibg+fircG2agYoAhzB+3ANrNz19cKLeDQuaitsswVFe 6B+8nG/USKvkalamCgAwEyRZi4JCG1oCdl9UtWoyLqSAgXH+ACEYFzDLmrXQlrvIIago 96Xw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=5/BVTGaeR51tH9kYHaGtoaqztdUamc4uRhagnwPXzko=; b=A1pH+zIHm4n58pNK8Ux0P9txgzEHfv0wLzKG1YO2GG28RcfuAIkA/gRR+x+pfkuS0l 2d9rlIpLwlme7Es10y3f45DHwGC36rJKPyDnPUXEYbNaQI4mvH2juGRYO4BKCO1xLp2W mo4KXiN3DFqvPx4R7p9XDohoXGVDpX2w4ulcFUm6YULaeEKwvOXWAvdYyiPibA9O4OYg NMuNT0r0GsYDChT1izmsJGBlMuXugBXEZkpsT7X6lXuk58sFrMKy4mhMmuiADpioLxny pgav2iohS4uD8Y95VN7vn3UzstblVr+lET7FOtssJVx/bzVxjPIobc9P0/H9Ure/7bDH /oLQ== X-Gm-Message-State: AOAM530UawpRq18nuyzvBBDAJYjDuTrmABIkkiBt+eGVQB/aUWinaouh 51z0QVgE0+gsOQGzFALcWQYn2d4D X-Google-Smtp-Source: ABdhPJw5ErLIaCPq591Nrm5yDnyulRCiqJTDRH7Diei7esz11qfOJ0yKZREB8C23/6oQ4M4//l50Ag== X-Received: by 2002:a7b:cae2:: with SMTP id t2mr13854341wml.150.1590854815869; Sat, 30 May 2020 09:06:55 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v27sm15186517wrv.81.2020.05.30.09.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:55 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:41 +0200 Message-Id: <20200530160541.29517-36-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> References: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 36/36] avcodec/vp9_superframe_bsf: Merge close and flush 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" They are essentially identical now. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9_superframe_bsf.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/libavcodec/vp9_superframe_bsf.c b/libavcodec/vp9_superframe_bsf.c index 6d6b2c57de..278f5a47a6 100644 --- a/libavcodec/vp9_superframe_bsf.c +++ b/libavcodec/vp9_superframe_bsf.c @@ -31,7 +31,7 @@ typedef struct VP9BSFContext { int n_cache; } VP9BSFContext; -static void vp9_superframe_flush(AVBSFContext *ctx) +static void vp9_superframe_close_flush(AVBSFContext *ctx) { VP9BSFContext *s = ctx->priv_data; @@ -184,7 +184,7 @@ static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *pkt) // build superframe res = merge_superframe(s->cache, s->n_cache, pkt); - vp9_superframe_flush(ctx); + vp9_superframe_close_flush(ctx); done: if (res < 0) @@ -192,16 +192,6 @@ done: return res; } -static void vp9_superframe_close(AVBSFContext *ctx) -{ - VP9BSFContext *s = ctx->priv_data; - int n; - - // free cached data - for (n = 0; n < MAX_CACHE; n++) - av_buffer_unref(&s->cache[n]); -} - static const enum AVCodecID codec_ids[] = { AV_CODEC_ID_VP9, AV_CODEC_ID_NONE, }; @@ -210,7 +200,7 @@ const AVBitStreamFilter ff_vp9_superframe_bsf = { .name = "vp9_superframe", .priv_data_size = sizeof(VP9BSFContext), .filter = vp9_superframe_filter, - .flush = vp9_superframe_flush, - .close = vp9_superframe_close, + .flush = vp9_superframe_close_flush, + .close = vp9_superframe_close_flush, .codec_ids = codec_ids, };