From patchwork Thu Feb 4 19:09:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25434 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 E808744A960 for ; Thu, 4 Feb 2021 21:17:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDEDC68AA54; Thu, 4 Feb 2021 21:17:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 551C168A3A3 for ; Thu, 4 Feb 2021 21:17:18 +0200 (EET) Received: by mail-qt1-f182.google.com with SMTP id d15so3209990qtw.12 for ; Thu, 04 Feb 2021 11:17:18 -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=XdKSUHYe1VK+0sNt3PAUoKmXied7fVkOdX9OgaNp+QA=; b=shlprPBssmNwwk43Qkn1Ik6U+acGKjtK+LAUZvalCwQpKl9f6J83MogN9w9xtDYZfO ZWHJVFkwWkVXf10owHLRoOFYD88vj02ChTt54Cv+UyTkLEzBL0vNnQ4aBM7PPlQooPQT ACoZfpb99mMtKF02upWoR/A0PAb2Z03zf2nM8coMHVxl9SVX/1o1Q+hOf9WdAFnEO+ZZ I+UOUh1kz0ANg5YxfyZWGGBzHjx7mtvtNnPX/I9vUiKVa0K3+Kl4t1xnChgMR+qRnjYL ZHCcI8WyCDCoNoRsKVOrW5JccSIcmxXNychKgUdEaHjfocK4VhKVRuQp7qsXOk81e96t MGdQ== 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=XdKSUHYe1VK+0sNt3PAUoKmXied7fVkOdX9OgaNp+QA=; b=V02ApPIBsOYE7UdixyRDjT7FZHwur75NU+PXd1A5tTSVf7LbbRpFPE89dkaklyfI0Z reI+JjkOaLzw/WgKIyZVPBPQcVBxDVtBeDo3LJKII7vB6lRksACxqfboS8MCdzQcseAQ L2ZkyQhq4MeNi9B9pQi3+ERNoiS3E84Mb++AzwXZoDNGlEhjamwXqx/D0+xN659Yjo++ EpZUJ+Zwgfa+rKxBsSlDO5On/cz+JtjQR2+uMq6Spzfypu4maxucFPfJ6ZgRcatYf/yT rBBeMEpvEvOz/tPhAZql1BNx1gbXeTRit0XXapSOXcMe9iqNqsTkqeLFg/EShLOd2JL+ XqhA== X-Gm-Message-State: AOAM532fgNbrzLNuvxFOk/qbYitao3nhUaFAvy6eLcLnvNlm89gU13rP xJu6FYW3giO7yCV+0CayFZJ5Y4aE4k8= X-Google-Smtp-Source: ABdhPJz7xNshrcMMIsxqteoRe8KG056IPHruClpxKLVcPSrX1O10iGlzMuWmSdmUwqPiXrMWTp+QTw== X-Received: by 2002:ac8:58c5:: with SMTP id u5mr1078747qta.94.1612465846382; Thu, 04 Feb 2021 11:10:46 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.10.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:10:45 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:23 -0300 Message-Id: <20210204191005.48190-9-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 08/50] avcodec/tdsc: 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/tdsc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/tdsc.c b/libavcodec/tdsc.c index 7c888b6ec8..9e7381c2bb 100644 --- a/libavcodec/tdsc.c +++ b/libavcodec/tdsc.c @@ -53,6 +53,7 @@ typedef struct TDSCContext { GetByteContext gbc; AVFrame *refframe; // full decoded frame (without cursor) + AVPacket *jpkt; // encoded JPEG tile AVFrame *jpgframe; // decoded JPEG tile uint8_t *tilebuffer; // buffer containing tile data @@ -80,6 +81,7 @@ static av_cold int tdsc_close(AVCodecContext *avctx) av_frame_free(&ctx->refframe); av_frame_free(&ctx->jpgframe); + av_packet_free(&ctx->jpkt); av_freep(&ctx->deflatebuffer); av_freep(&ctx->tilebuffer); av_freep(&ctx->cursor); @@ -111,7 +113,8 @@ static av_cold int tdsc_init(AVCodecContext *avctx) /* Allocate reference and JPEG frame */ ctx->refframe = av_frame_alloc(); ctx->jpgframe = av_frame_alloc(); - if (!ctx->refframe || !ctx->jpgframe) + ctx->jpkt = av_packet_alloc(); + if (!ctx->refframe || !ctx->jpgframe || !ctx->jpkt) return AVERROR(ENOMEM); /* Prepare everything needed for JPEG decoding */ @@ -342,15 +345,14 @@ static int tdsc_decode_jpeg_tile(AVCodecContext *avctx, int tile_size, int x, int y, int w, int h) { TDSCContext *ctx = avctx->priv_data; - AVPacket jpkt; int ret; /* Prepare a packet and send to the MJPEG decoder */ - av_init_packet(&jpkt); - jpkt.data = ctx->tilebuffer; - jpkt.size = tile_size; + av_packet_unref(ctx->jpkt); + ctx->jpkt->data = ctx->tilebuffer; + ctx->jpkt->size = tile_size; - ret = avcodec_send_packet(ctx->jpeg_avctx, &jpkt); + ret = avcodec_send_packet(ctx->jpeg_avctx, ctx->jpkt); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error submitting a packet for decoding\n"); return ret;