From patchwork Fri Mar 5 16:32:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26127 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 0E70F44B9E2 for ; Fri, 5 Mar 2021 18:35:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F0BAF68AB90; Fri, 5 Mar 2021 18:35:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9314D68AAEA for ; Fri, 5 Mar 2021 18:35:37 +0200 (EET) Received: by mail-qk1-f176.google.com with SMTP id a9so2506290qkn.13 for ; Fri, 05 Mar 2021 08:35:37 -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=kTg7YbFp0VUhWPEZGtOdBrikP5m8fxJ+LBz2gx5mIAA=; b=nYMg3W6RlH1ZEIb+09oGbCPtn2e2vEx4NDtrAC/KjNFfOAzV+Q8mNAVYZChfO7O4Iy ICBmwj65rkWNMzaaXJdKHm+fpV7acsRyAk2tLGBcMtlzoO2OGMRNP8mxpiuwbO+uYSea nXbg9J2XU7WrR8pb6VPEfTCojomrHf3i1gKUfCpdy4NQadF7Q/TK7rhmXl+j/9qvyuRe pB7WNKgwTqXXTsCSbb8W/GiRVXf0sO/KNQFtVNd3P0g5a4i/R0tDY69yTw/CVPd4i6sF LBxoNvcHOqqH4TLcB4CU9DIuuOrEtZh06QfgNkRcZBnXyZN09evZnZv1kHGYnxlpa/WY Ch7g== 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=kTg7YbFp0VUhWPEZGtOdBrikP5m8fxJ+LBz2gx5mIAA=; b=m+CUVN5rubtOFm91l3e3rh1jwifAn5FfDQRepnUQ1TZb/JxJDaOoWxEr7cyMcmub/b 52uJvRjsjuGFmclhVWtKx0fwS4th0fEWnWSvn5Pge0njzgDYzjEPWJB5ZHKN8rugXfyp +qzBPtw+0MuSsOTwo3BJTJIcW9oiyJ8bNwLIvyz12/vKFl+Lh2NWud9Dy06tFN5auICx g0JV2hVeq+S3wDNVpLK7tvo9qCxTeYzTlcJQ4q4b+wo7DeUfDsGR07wvNh+5sgYsStX+ dUBrTS9E2L1lT4ZTyvJZ6DIBUUo6tUIpTvTi7v9nRguCRuoF3Frz/tBbaBytKXk2c7zd E3SQ== X-Gm-Message-State: AOAM531Ra691pLbX0R/vqgEHusTDyLQFRrVnfG8ro8Pmf0n4hfP1aspB 0dkjAAv8dE1sNe2qsk/SJk4wXqSj/dxsTg== X-Google-Smtp-Source: ABdhPJxpdI/lwmINN4kr2v8YtQPhLXxfhT+MGQ3nmSYh3yyhKVAABxKRo5msTk85dnimMwIXL+/pqA== X-Received: by 2002:a37:4e01:: with SMTP id c1mr9885796qkb.16.1614962136139; Fri, 05 Mar 2021 08:35:36 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.35.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:35:35 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:32:59 -0300 Message-Id: <20210305163339.63164-9-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 08/48] 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;