From patchwork Mon Feb 8 12:23:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25506 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 2507D44A631 for ; Mon, 8 Feb 2021 14:24:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F2BAB689A8D; Mon, 8 Feb 2021 14:24:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF0A768832B for ; Mon, 8 Feb 2021 14:24:05 +0200 (EET) Received: by mail-ej1-f43.google.com with SMTP id w2so24224552ejk.13 for ; Mon, 08 Feb 2021 04:24:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=0BTUUzaA7XC36OjxrxcUm/LRpGt/f9x1ap+xaatKCtI=; b=vRMeSAIJHs3dkzO+NVwLWsP1+uWZZeHduZ9hl9mQERJa7IuU6A+lCBvwH6ZZ7bRlCn afVqE04sqUL53zvv94kQKjRpiYlVwO83aYMYbFR/XJqg/5pH/8K4/N+MIAtl+ZfCnHuy Yr0qHO35IwbJbpMh1SbZN2ATrhc8KAyjDNhN9L+K/Y6yZeDjBGfTA8qFyeyLCITCWpF3 r17a+IQNGR+oEAAfAni30OnuRMzQ0KTZkTJQ4qSlQA2NdvxZTn0+gGCg6UcBFWVO1La3 VjY7Wv2DcD2o9of+0KsPCq1FSKap4JvoyuiIzXww8qFhZlWyKYciBvul8HBsjyX4Hab2 cW9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=0BTUUzaA7XC36OjxrxcUm/LRpGt/f9x1ap+xaatKCtI=; b=fByYBd+6+Pm3sjEI0YQ//OTPZEY6vC56tnQjzqLTZ7i/NaLQbpE51eg5pPuUQNySFZ JQjsLN95i9INEdKv8aU7m7HcDmjAbYVin8niT/4wfDLEdCcJ1vaDJUwOxlzj57qyRBBj D7Xp9913MtAe65lpXIm23kz9scp6acB1r56ijK0sCJK4EvDZdMx8YHxLrvDC+v3Vlvp3 gW4bo6wCRRDS/soJp4Hjk099D+TSyU511T6uxeFTjqJog/3e6g4I1JSpBWRLf2N+1inE ODMS26ip93uhQqLEwBf4lG2/RaiiXnrqzAHxGmX3hGR1JoeH8iacGxolgfQnQI2bLErT aJag== X-Gm-Message-State: AOAM530urTCfAsUQaqYB1YfSz987FU9KrkFyV6Lsp8tzCgYIP+3d1Ag7 JRlIGL20Fdr3WOVddsiIlPoe5Ykc3Q0= X-Google-Smtp-Source: ABdhPJxt/Yyn9QFdfGFMlTYUsOH4uXFq5yolfaYbtAmq+kvB/ItDesQyOL1t0HIQCc7c/t2t4RAU7A== X-Received: by 2002:a17:906:4c4b:: with SMTP id d11mr16904964ejw.387.1612787045086; Mon, 08 Feb 2021 04:24:05 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id ah20sm8486820ejc.99.2021.02.08.04.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:24:04 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Feb 2021 13:23:26 +0100 Message-Id: <20210208122330.555354-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210208122330.555354-1-andreas.rheinhardt@gmail.com> References: <20210208122330.555354-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/8] avcodec/frame_thread_encoder: Avoid creating reference to frame 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/encode.c | 4 ++++ libavcodec/frame_thread_encoder.c | 11 ++++------- libavcodec/frame_thread_encoder.h | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 29f41c3f92..282337e453 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -152,6 +152,10 @@ static int encode_simple_internal(AVCodecContext *avctx, AVPacket *avpkt) if (CONFIG_FRAME_THREAD_ENCODER && avci->frame_thread_encoder && (avctx->active_thread_type & FF_THREAD_FRAME)) + /* This might modify frame, but it doesn't matter, because + * the frame properties used below are not used for video + * (due to the delay inherent in frame threaded encoding, it makes + * no sense to use the properties of the current frame anyway). */ ret = ff_thread_video_encode_frame(avctx, avpkt, frame, &got_packet); else { ret = avctx->codec->encode2(avctx, avpkt, frame, &got_packet); diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index bcd3c94f8b..7c2894c933 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -286,10 +286,11 @@ void ff_frame_thread_encoder_free(AVCodecContext *avctx){ av_freep(&avctx->internal->frame_thread_encoder); } -int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet_ptr){ +int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, + AVFrame *frame, int *got_packet_ptr) +{ ThreadContext *c = avctx->internal->frame_thread_encoder; Task *outtask, task; - int ret; av_assert1(!*got_packet_ptr); @@ -297,11 +298,7 @@ int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVF AVFrame *new = av_frame_alloc(); if(!new) return AVERROR(ENOMEM); - ret = av_frame_ref(new, frame); - if(ret < 0) { - av_frame_free(&new); - return ret; - } + av_frame_move_ref(new, frame); task.index = c->task_index; task.indata = (void*)new; diff --git a/libavcodec/frame_thread_encoder.h b/libavcodec/frame_thread_encoder.h index 1f79553f20..c400d6b32c 100644 --- a/libavcodec/frame_thread_encoder.h +++ b/libavcodec/frame_thread_encoder.h @@ -25,6 +25,7 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options); void ff_frame_thread_encoder_free(AVCodecContext *avctx); -int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet_ptr); +int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, + AVFrame *frame, int *got_packet_ptr); #endif /* AVCODEC_FRAME_THREAD_ENCODER_H */