From patchwork Thu Feb 4 19:09:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25431 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 6EAF444A6BE for ; Thu, 4 Feb 2021 21:16:22 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5164E68A9F3; Thu, 4 Feb 2021 21:16:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A94DD68A98A for ; Thu, 4 Feb 2021 21:16:20 +0200 (EET) Received: by mail-qk1-f182.google.com with SMTP id a7so4413457qkb.13 for ; Thu, 04 Feb 2021 11:16:20 -0800 (PST) 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=ZoW/66agalCTMm5TPOz7KadFnh21rMYER3UA2o/UBYs=; b=TRT+Yw8d1/UwgrlqmRfNlxvLEU/FqZE0icIPQeTGRxVmDoJAiDGkqpKDDajVzUFQW1 wxDZ+GtcnDW/6DrsEk6M3v2xTGD3lIOsM71DQy5WgTko2/r6TAHq4/aT2H6L1+vdFS8P XFDSZvfnYBYoLVeezGbIfqv19R1kuAGleNgUOz3RTFqfGIgToJPXfib0IheaeVgpix0o oXFvF3IRveuaMY+6R5EFXWcT3mUJDxpQQSxHpSpMgefLaFtrrtGWWx/BBdyVovNCM+kh FI6DIHevYToxZNQAghrRa0Eg3nx0nNhKxbRb+/d5PBIG+wmevwLUO7UMFji8cyvjiYJ3 xasQ== 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=ZoW/66agalCTMm5TPOz7KadFnh21rMYER3UA2o/UBYs=; b=a2tELUDRHWvwkEf85iIENImXmbA/bhStK3CiMKodO+P/yVytcWaC0rDZb4c90VnPmF iVIKY5ee5co3dDtCMvgynjx0x2ifqowj1XMuYuUkboE07gIcjVZfBTlH8IyIm36h7feR oQWjPheP2g3PbW3XSwT5SVWKzVoXcfaHZww4djFl0m+UerakEBV1Xfm8ZuHvcQ/pYuP5 +RHECqUlQfeM1fVyegMf9GkzmHBLGYLZAK7WupCwP7qLe8UbQh4m3H2oBQaZ6sECjLqj otGPPh4/ZzlH9bJ3k6FSoYoFfCMmtq79e+E4z4TvYiD40uRSqB33QPsPunzH7Ci6jPpx 5v/g== X-Gm-Message-State: AOAM532Ssx4ALjF299v1xxvGBN5d+aruV8uV9J1/gGKfgfmQZr7wEzGq OoZ5r5u6dluTVe5l9xmvPWIJ44KVScQ= X-Google-Smtp-Source: ABdhPJwYJVtpGUqBCIA2V8WEcH+MWAxC+7W4s+/0idR98IEQ4JPz6RRFnrffgT0lQ+GwQ5e36r4hLA== X-Received: by 2002:ac8:7257:: with SMTP id l23mr1024786qtp.264.1612465849321; Thu, 04 Feb 2021 11:10:49 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.10.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:10:48 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:25 -0300 Message-Id: <20210204191005.48190-11-jamrial@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204191005.48190-1-jamrial@gmail.com> References: <20210204191005.48190-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/50] avcodec/webp: use av_packet_alloc() to allocate packets 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" Signed-off-by: James Almer --- libavcodec/webp.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 6de6a5c036..5a7aebc587 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -189,6 +189,7 @@ typedef struct WebPContext { VP8Context v; /* VP8 Context used for lossy decoding */ GetBitContext gb; /* bitstream reader for main image chunk */ AVFrame *alpha_frame; /* AVFrame for alpha data decompressed from VP8L */ + AVPacket *pkt; /* AVPacket to be passed to the underlying VP8 decoder */ AVCodecContext *avctx; /* parent AVCodecContext */ int initialized; /* set once the VP8 context is initialized */ int has_alpha; /* has a separate alpha chunk */ @@ -1290,7 +1291,6 @@ static int vp8_lossy_decode_frame(AVCodecContext *avctx, AVFrame *p, unsigned int data_size) { WebPContext *s = avctx->priv_data; - AVPacket pkt; int ret; if (!s->initialized) { @@ -1306,11 +1306,11 @@ static int vp8_lossy_decode_frame(AVCodecContext *avctx, AVFrame *p, return AVERROR_PATCHWELCOME; } - av_init_packet(&pkt); - pkt.data = data_start; - pkt.size = data_size; + av_packet_unref(s->pkt); + s->pkt->data = data_start; + s->pkt->size = data_size; - ret = ff_vp8_decode_frame(avctx, p, got_frame, &pkt); + ret = ff_vp8_decode_frame(avctx, p, got_frame, s->pkt); if (ret < 0) return ret; @@ -1527,10 +1527,23 @@ exif_end: return avpkt->size; } +static av_cold int webp_decode_init(AVCodecContext *avctx) +{ + WebPContext *s = avctx->priv_data; + + s->pkt = av_packet_alloc(); + if (!s->pkt) + return AVERROR(ENOMEM); + + return 0; +} + static av_cold int webp_decode_close(AVCodecContext *avctx) { WebPContext *s = avctx->priv_data; + av_packet_free(&s->pkt); + if (s->initialized) return ff_vp8_decode_free(avctx); @@ -1543,6 +1556,7 @@ AVCodec ff_webp_decoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WEBP, .priv_data_size = sizeof(WebPContext), + .init = webp_decode_init, .decode = webp_decode_frame, .close = webp_decode_close, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,