From patchwork Fri Mar 5 16:32:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26125 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 2E67E44B9E2 for ; Fri, 5 Mar 2021 18:35:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B27768AAE6; Fri, 5 Mar 2021 18:35:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1790068A9ED for ; Fri, 5 Mar 2021 18:35:36 +0200 (EET) Received: by mail-qt1-f181.google.com with SMTP id v64so2167664qtd.5 for ; Fri, 05 Mar 2021 08:35:36 -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=YyQ/ZQMg+zl2VLpO8Yr0XgMspy/CUhX/qBa32zUvZZQ=; b=MhWoFlLwlWujgIBx5CvCCLfM6hDlmrWHonCWINDSqPX7CBBsW1fb47C4TaKdazZraR jqr+QKsykP9vIQAEgFAtdTUZ7k0WWKiWONEPK3I6uKZhC0Zkpz0yExDi3gdBFOzLXvOs YvnArJlqHonCQuS+SxJ5+idbymMOUS2PyQIuIr9090voWDJkWq/6wDUbeTaNEKUwX5l4 ze2KYo4jYa+Ely/sA37nfVHcc1DU1n0VkLTdHqpDKX4qTpfJBLLAW+yHc311TDUo4JfH K94AdpdZjLzS3pyd/iniV0qez3B8zxzXzp+U3zbTV6zTHzL85DEozIiL14RPi2kLa9lc Mchw== 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=YyQ/ZQMg+zl2VLpO8Yr0XgMspy/CUhX/qBa32zUvZZQ=; b=JoqnMnYuKinX3KU0ZjLstKQgDHW7IxABTcga8IRhcgMjuXwv/4W8xLE4PNAJFfGyBD 6dmGUyMYRWYkPMkYYcVu9LZCPxoUqCZEKH7xuR//XiAjpKGvEhoCJl7NsS8zFgMCuE7O ObGNKdH99zqJRf+k2A2qfU5JBsi7eEMQmP8ryd79V9ExByr6dpUHb4FJhJ94vXhl/raN G/Fwe+DQ79g+4CyOejX7mh/eHrwi3BjulzFHsMDjGOCBUur6BRtJNCn9BHUahQjvx5as xWe/ynYyFCiCZ6IsSb4lt7Sb5JUCl3JBZLZu8uZ7dHBU4Tua64Awd8W2Hf7S2b4+dTCL AV/w== X-Gm-Message-State: AOAM530lT5VQR3s5V6yXrwbW94kiKMEYT/NI5uCZ8dLgXVWl+300Yghc yEsT4hl1dLkvjUhkwcGiNpc8ILBQ6RQPVg== X-Google-Smtp-Source: ABdhPJwXWxyXrDyl0VYXyyenpr03X6H0pO7HntQuGthRQRalG9ZRqYBaaENQpNV6Ph1qbhO/6vMgnQ== X-Received: by 2002:ac8:740a:: with SMTP id p10mr9339012qtq.273.1614962134659; Fri, 05 Mar 2021 08:35:34 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.35.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:35:34 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:32:58 -0300 Message-Id: <20210305163339.63164-8-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 07/48] avcodec/pthread_frame: 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/pthread_frame.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 4429a4d59c..7bcb9a7bcc 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -81,7 +81,7 @@ typedef struct PerThreadContext { AVCodecContext *avctx; ///< Context used to decode packets passed to this thread. - AVPacket avpkt; ///< Input packet (for decoding) or output (for encoding). + AVPacket *avpkt; ///< Input packet (for decoding) or output (for encoding). AVFrame *frame; ///< Output frame (for decoding) or input (for encoding). int got_frame; ///< The output of got_picture_ptr from the last avcodec_decode_video() call. @@ -208,7 +208,7 @@ FF_ENABLE_DEPRECATION_WARNINGS av_frame_unref(p->frame); p->got_frame = 0; - p->result = codec->decode(avctx, p->frame, &p->got_frame, &p->avpkt); + p->result = codec->decode(avctx, p->frame, &p->got_frame, p->avpkt); if ((p->result < 0 || !p->got_frame) && p->frame->buf[0]) { if (avctx->codec->caps_internal & FF_CODEC_CAP_ALLOCATE_PROGRESS) @@ -438,8 +438,8 @@ static int submit_packet(PerThreadContext *p, AVCodecContext *user_avctx, } } - av_packet_unref(&p->avpkt); - ret = av_packet_ref(&p->avpkt, avpkt); + av_packet_unref(p->avpkt); + ret = av_packet_ref(p->avpkt, avpkt); if (ret < 0) { pthread_mutex_unlock(&p->mutex); av_log(p->avctx, AV_LOG_ERROR, "av_packet_ref() failed in submit_packet()\n"); @@ -550,7 +550,7 @@ int ff_thread_decode_frame(AVCodecContext *avctx, av_frame_move_ref(picture, p->frame); *got_picture_ptr = p->got_frame; - picture->pkt_dts = p->avpkt.dts; + picture->pkt_dts = p->avpkt->dts; err = p->result; /* @@ -725,7 +725,7 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count) pthread_cond_destroy(&p->input_cond); pthread_cond_destroy(&p->progress_cond); pthread_cond_destroy(&p->output_cond); - av_packet_unref(&p->avpkt); + av_packet_free(&p->avpkt); #if FF_API_THREAD_SAFE_CALLBACKS for (int j = 0; j < p->released_buffers_allocated; j++) @@ -822,6 +822,12 @@ int ff_frame_thread_init(AVCodecContext *avctx) err = AVERROR(ENOMEM); goto error; } + p->avpkt = av_packet_alloc(); + if (!p->avpkt) { + av_freep(©); + err = AVERROR(ENOMEM); + goto error; + } p->parent = fctx; p->avctx = copy; @@ -841,7 +847,7 @@ int ff_frame_thread_init(AVCodecContext *avctx) } *copy->internal = *src->internal; copy->internal->thread_ctx = p; - copy->internal->last_pkt_props = &p->avpkt; + copy->internal->last_pkt_props = p->avpkt; copy->delay = avctx->delay;