From patchwork Sat May 30 16:05:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20012 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 B6B4B44AA6F for ; Sat, 30 May 2020 19:10:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AC8A68AE2D; Sat, 30 May 2020 19:07:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1D8968B162 for ; Sat, 30 May 2020 19:06:55 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id f5so7145671wmh.2 for ; Sat, 30 May 2020 09:06:55 -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=b0yv26UOKtr2fXtdbEKf+1AZ/CXV04FoXy42f7QFrMw=; b=s6X7vvnf7VrFAMBdymjaDTco8nN0TnqwAJxxTiFD5KRUFeM+1RN/LhTr8FAOvw+i7b 2t/ngHjf0oHLNoTQ+1iIpJYp0mp0G7S9VZO3pMFrRWtVT25HsbmObbhUz/7eebf0LbnV Skwa1iFUrFMQ/i5dR6djWyYZ7JKV7ny+ZOQG0Re4E5znymGmVafuEWx+YSL7pBybonve OJXrAWX5q8q9C05fkbkSU9SvUHgae+QxmO5/bjoXbVtsxwOxMhHLwOFLoV4nsnwVR+pl NQuZHgnra59PvvVqt/ff+psazoHRVQsTO75fmpdxDpiCsaLUS6j+jrwjlIaEd+tXr3P0 3j6g== 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=b0yv26UOKtr2fXtdbEKf+1AZ/CXV04FoXy42f7QFrMw=; b=ahDFp1X0zLUsMIiekw6quwpfiqtgh1Nkokb6irUbBAVu52VZe6J9qO1toYycymMQ2X 8UdSXhtTncelGlFqzwYOCn1ESEleqDcd7sOcRQ6E6Pfckm5ZWQrVd+mPV5Q+ShiGVuEu YzfsyAcyYDAHU03DF0xtlmhyVbTL8JUtN+tjKt1c3tHJkm8g/vBm4sbnY/QQUBnhkVgG 0xADoDiNuKAvmg468AciLzVS5+cJUeNobbBDrhshxxxhJVMDOVKupGNLosf4EtQD01GX ONBk5SxvuBFTKa5TrJYwhkx/Nf9mxc6WN2GnOv7dEa804XhLkrwKyFmguIv/OGa7IRMz LLIQ== X-Gm-Message-State: AOAM530fOuQPeYo7Q33/lvkPLkt+uM6FwQtlPJeJmz90dlwAyM8MmlA5 qZ9bRJASl51+EK74XqeyNTqICuLB X-Google-Smtp-Source: ABdhPJzssn8Fu0BvgNsVIOus9p7BigSPJHvTJqD8MA/uL4nlm+WgUM85ea+P4G7fKiSbOWM2rTpRYQ== X-Received: by 2002:a1c:a444:: with SMTP id n65mr12826462wme.99.1590854814677; Sat, 30 May 2020 09:06:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:53 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:40 +0200 Message-Id: <20200530160541.29517-35-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 35/36] avcodec/vp9_superframe_bsf: Only store what is needed later 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" This commit ends storing all the packets for later use. Instead the only part that is actually needed later is kept: The buffer. This avoids copies of packet structures and also makes the init function superfluous. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9_superframe_bsf.c | 45 +++++++++++++-------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/libavcodec/vp9_superframe_bsf.c b/libavcodec/vp9_superframe_bsf.c index 29d1c759c7..6d6b2c57de 100644 --- a/libavcodec/vp9_superframe_bsf.c +++ b/libavcodec/vp9_superframe_bsf.c @@ -27,8 +27,8 @@ #define MAX_CACHE 8 typedef struct VP9BSFContext { + AVBufferRef *cache[MAX_CACHE]; int n_cache; - AVPacket *cache[MAX_CACHE]; } VP9BSFContext; static void vp9_superframe_flush(AVBSFContext *ctx) @@ -37,11 +37,11 @@ static void vp9_superframe_flush(AVBSFContext *ctx) // unref cached data for (int n = 0; n < s->n_cache; n++) - av_packet_unref(s->cache[n]); + av_buffer_unref(&s->cache[n]); s->n_cache = 0; } -static void stats(AVPacket * const *in, int n_in, +static void stats(AVBufferRef * const *in, int n_in, unsigned *_max, uint64_t *_sum) { int n; @@ -60,10 +60,11 @@ static void stats(AVPacket * const *in, int n_in, *_sum = sum; } -static int merge_superframe(AVPacket * const *in, int n_in, AVPacket *out) +static int merge_superframe(AVBufferRef * const *in, int n_in, AVPacket *pkt) { unsigned max, mag, marker, n; uint64_t sum; + AVBufferRef *out = NULL; uint8_t *ptr; int res; @@ -73,7 +74,7 @@ static int merge_superframe(AVPacket * const *in, int n_in, AVPacket *out) sum += 2 + (mag + 1) * n_in; if (sum > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) return AVERROR(ERANGE); - res = av_new_packet(out, sum); + res = ff_buffer_padded_realloc(&out, sum); if (res < 0) return res; ptr = out->data; @@ -107,7 +108,9 @@ static int merge_superframe(AVPacket * const *in, int n_in, AVPacket *out) break; } *ptr++ = marker; - av_assert0(ptr == &out->data[out->size]); + + ff_packet_replace_buffer(pkt, out); + av_assert0(ptr == &pkt->data[pkt->size]); return 0; } @@ -166,19 +169,21 @@ static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *pkt) av_assert0(s->n_cache < MAX_CACHE); - av_packet_move_ref(s->cache[s->n_cache++], pkt); + // move the packet's buffer into the cache + pkt->buf->data = pkt->data; + pkt->buf->size = pkt->size; + s->cache[s->n_cache++] = pkt->buf; + pkt->buf = NULL; if (invisible) { - return AVERROR(EAGAIN); + res = AVERROR(EAGAIN); + goto done; } av_assert0(s->n_cache > 0); // build superframe res = merge_superframe(s->cache, s->n_cache, pkt); - if (res >= 0) - res = av_packet_copy_props(pkt, s->cache[s->n_cache - 1]); - vp9_superframe_flush(ctx); done: @@ -187,21 +192,6 @@ done: return res; } -static int vp9_superframe_init(AVBSFContext *ctx) -{ - VP9BSFContext *s = ctx->priv_data; - int n; - - // alloc cache packets - for (n = 0; n < MAX_CACHE; n++) { - s->cache[n] = av_packet_alloc(); - if (!s->cache[n]) - return AVERROR(ENOMEM); - } - - return 0; -} - static void vp9_superframe_close(AVBSFContext *ctx) { VP9BSFContext *s = ctx->priv_data; @@ -209,7 +199,7 @@ static void vp9_superframe_close(AVBSFContext *ctx) // free cached data for (n = 0; n < MAX_CACHE; n++) - av_packet_free(&s->cache[n]); + av_buffer_unref(&s->cache[n]); } static const enum AVCodecID codec_ids[] = { @@ -220,7 +210,6 @@ const AVBitStreamFilter ff_vp9_superframe_bsf = { .name = "vp9_superframe", .priv_data_size = sizeof(VP9BSFContext), .filter = vp9_superframe_filter, - .init = vp9_superframe_init, .flush = vp9_superframe_flush, .close = vp9_superframe_close, .codec_ids = codec_ids,