From patchwork Fri Mar 5 16:33:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26124 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 4DB7744B9E2 for ; Fri, 5 Mar 2021 18:35:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 37E2568AB48; Fri, 5 Mar 2021 18:35:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E92B68AA67 for ; Fri, 5 Mar 2021 18:35:40 +0200 (EET) Received: by mail-qk1-f180.google.com with SMTP id z128so2504840qkc.12 for ; Fri, 05 Mar 2021 08:35:40 -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=JzPaKNp/C4hrLOQUHfij7tAezD12v5bib+rRrWfU3uI=; b=CU6b4ueSSmvrW/ltVN49bbiEnNXu3Po8arZPFJzTH1TnKV5jVraB81I2+sndiMwnm8 OhD3CM8GzG11b5ORodCbNVrY920NhI+ziD35zeaarix/E9apq798KJ9f/KjhLxt4B3YH eR9gxOI0FWgQOtV0RwvsLyXaV4KjloED+5JpCfEZfpGMn1RnpIlp8hzAhL9PEHJR8g5g TkPHug4aHFSWEXIBcgEkdj3kt3w86r0Uwqgm51QDsRpR7+dxuvf7CUZz+bLIqQm/Bdjl 4hS7taac/f/mPzFG52gj3gkbHC05Zz718K6/Hm0cgfv1WuN9lKBc8At7i4d5aqYPKPRs D83g== 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=JzPaKNp/C4hrLOQUHfij7tAezD12v5bib+rRrWfU3uI=; b=VaPwoZv+sx2YLt3RwWQHSEBqIJIHKljwVcZCiu6gvEE+23YNrimvJgeuqOEIkJ5id3 tLLNtp6qhCnc9cXFeRgwo4wOc9dYG54t9Nez2LNDYXYO4nDwYkJP+K+Op/R7jThV/UzP AGHcfDAyUz9IwYYlhWe+CERVlwrf5GwsuKGGO8rpqdDEGt5vR+bVLvBhhIzGCLbtkYvg ukJTd2zCpWemPbdSJnAe+a4etb9vWPalCcmg8YJHjKgBydymy418lVXoI4/QJ+E8QJfT Gt0DJELPqs5DO3q5z71xcMOp4nn5XdeQRmFbk/xoG2xfEDiIZcn/5x4nk6CLytvP9bUc Kgrw== X-Gm-Message-State: AOAM533xla6yOkwTZcSSeBiJf6bIqpVg9ipOkYGNBmoqCMhUYsxmatNh foRRqRpZrJDWGm9e+ZPRcGX0HGt7cTxtxg== X-Google-Smtp-Source: ABdhPJyVGq7AMfn1xjlkKg17XfawMYr1lNf1XS9Wjtblre2Qd64t2wE2prqDGov37FZOTeUv7d8jsQ== X-Received: by 2002:a37:7006:: with SMTP id l6mr9837249qkc.137.1614962138645; Fri, 05 Mar 2021 08:35:38 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.35.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:35:38 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:01 -0300 Message-Id: <20210305163339.63164-11-jamrial@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305163339.63164-1-jamrial@gmail.com> References: <20210305163339.63164-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/48] 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,