From patchwork Fri Mar 5 16:32:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26119 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 1ACB344B9E2 for ; Fri, 5 Mar 2021 18:35:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F22FA68AA90; Fri, 5 Mar 2021 18:35:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 693E968A7E9 for ; Fri, 5 Mar 2021 18:35:31 +0200 (EET) Received: by mail-qv1-f53.google.com with SMTP id t1so1267528qvj.8 for ; Fri, 05 Mar 2021 08:35:31 -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=3DptBbuAl+WhhFwFgAbpEV/0NE7/PDxUNbZYZv326VM=; b=ckD5H5x7A1pPunRrfZZUq0bRVZELBV5ywBKeTMsy5Af2ha/vJB8eacbB3l3HJRfeIb HduvorFl/zTXucJlTk8Y8ht5YcYXrctGvWXcWhxC/Z6XBvykVbUcoOuORxzYSk8vbSUZ HufvM7eeZzrjvD4xUbzHp9blvCLOIPwtcwOXJBDk0I5QW4hk8nRdD5K6Z5kFAwy5yuxL MmQH5gfVc40n6daUwte1wVMdtKFatuz6l3XE/9USLhfLAR/OnceKRwlQQUjjwjAFbGYW kPz9yR4WIc7AKJGm7+J9uAengvgIpfUXyxUUON1mofJhgLcQoJPmr0KHt0pxOvlHEdD0 PZXg== 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=3DptBbuAl+WhhFwFgAbpEV/0NE7/PDxUNbZYZv326VM=; b=pdxFYQLj3GX7we+mRLg6UbeVEzj6PlRQ8zyr492p0K4seyW8p1h829mYvppjNZ/K4A ICWGob85/17GUZuxyShW/pb+O9zubPjJgZDaXa7BPeVli4mttAGwJ+lJR37hMsivyYkR KW/nJgcxjC01uZdVUzXAdxXmwqJQ/GsVBDIittmLU6kwGcmYwLleej6m9/JJszKayMyQ 91mdCJpDpQgH2eTRR/VHw5E8OVCRWo74bJG6PH0RM5xYfUEiiX73vUgX0+5kdrof1JRA IxV99oHt1qPxlgbNlZ3BqqRnwg07j8/xKhTxrx66woUBDBsxcFRwO7S0bQZhAeZW5/r0 NP/w== X-Gm-Message-State: AOAM532zqVacO9TbflOjf44QUC4TGSR4QIAAd40zDIFnPvU6NOJ69G9e mOg7uYc2jCFytwKlJrXshV7plik/YEKQ5A== X-Google-Smtp-Source: ABdhPJy68dmmViUAqVWe1CaHDhdtMpeo2+6qvvdUqKBI/CC6WfFOQbEg6R37aiG6J4JQDOBdkzlj7Q== X-Received: by 2002:a0c:b49f:: with SMTP id c31mr9686285qve.35.1614962129755; Fri, 05 Mar 2021 08:35:29 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.35.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:35:29 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:32:54 -0300 Message-Id: <20210305163339.63164-4-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 03/48] avcodec/cri: 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/cri.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libavcodec/cri.c b/libavcodec/cri.c index 3312606b75..0558d0c8dd 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -37,6 +37,7 @@ typedef struct CRIContext { AVCodecContext *jpeg_avctx; // wrapper context for MJPEG + AVPacket *jpkt; // encoded JPEG tile AVFrame *jpgframe; // decoded JPEG tile GetByteContext gb; @@ -56,6 +57,10 @@ static av_cold int cri_decode_init(AVCodecContext *avctx) if (!s->jpgframe) return AVERROR(ENOMEM); + s->jpkt = av_packet_alloc(); + if (!s->jpkt) + return AVERROR(ENOMEM); + codec = avcodec_find_decoder(AV_CODEC_ID_MJPEG); if (!codec) return AVERROR_BUG; @@ -345,13 +350,11 @@ skip: unsigned offset = 0; for (int tile = 0; tile < 4; tile++) { - AVPacket jpkt; - - av_init_packet(&jpkt); - jpkt.data = (uint8_t *)s->data + offset; - jpkt.size = s->tile_size[tile]; + av_packet_unref(s->jpkt); + s->jpkt->data = (uint8_t *)s->data + offset; + s->jpkt->size = s->tile_size[tile]; - ret = avcodec_send_packet(s->jpeg_avctx, &jpkt); + ret = avcodec_send_packet(s->jpeg_avctx, s->jpkt); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error submitting a packet for decoding\n"); return ret; @@ -415,6 +418,7 @@ static av_cold int cri_decode_close(AVCodecContext *avctx) CRIContext *s = avctx->priv_data; av_frame_free(&s->jpgframe); + av_packet_free(&s->jpkt); avcodec_free_context(&s->jpeg_avctx); return 0;