From patchwork Thu Aug 25 17:16:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 37489 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp473943pzh; Thu, 25 Aug 2022 10:16:44 -0700 (PDT) X-Google-Smtp-Source: AA6agR7LwKrA1eLNtJEPldfvhQ2c9o4Jg/NqSd6NKOh+/MMUosUuSA1unE+1zMdn7lP+1ERncJkM X-Received: by 2002:a17:906:3197:b0:73d:5e1a:44ac with SMTP id 23-20020a170906319700b0073d5e1a44acmr3105248ejy.512.1661447804077; Thu, 25 Aug 2022 10:16:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661447804; cv=none; d=google.com; s=arc-20160816; b=vG7fx7XG0KQm0vMHRf2z2QqN3FY4BJPUVykJAPOtwgqM+KGp5rQ+QoHJwhzEN8hUGU eEgaM2iCm2mm9SaLT3zO8gkjMa8Xt+68seM97CwP2h7OFNSTmSqsw2lI5X9aP7XpDJ37 z2sS/YtlQVT58sFwSuh7OOpw9M2+l5XmjpwV+dLWfMwimGpVdzRGJ4xqdctqFNe1Oy8g W74cXUG4jrBIt0dgILJGbYpBsbGQgVM4C92AhjOURen5Ey2xupOm0t5hQ+iAb6XmUAS9 eAtfV6HYe6XVJI6MP02Hzu32yHYP4UKW5yJoJnwsoysTUsIYz8CVz/V0++BIpWFzDj4c c9TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=cMGt8yxLpxttG9RIM/ab8TaePfzwqUM6WSVkMSjpXmM=; b=daV+Rhoi+q+r8ILlK3yPdNliaXfIGpkdoBRJwGFhiwmnANNjvkP5DwVcyaCc9hwITi ZHklp8rHM3BZQry5MQgctM8Q9Vmug073+4JKcaNwBLWhZHMX32YZeynQm3/k2sByzeTX vK0uJYPOlevxsSd2qs8iVqKoTkgLdaaoea6dSatSG9NackcflDgB3N6U8qu90CZjWk8v HSmKTBFbsOR3ZS84JNUjDPK1PZGbWvVP87rGojh1ofltfyZPgBoBacZ9M1+OfUnWiJgN 8NHNQwoyaDKar+HCP3RnEBL6/VNR9DD1a6xTaKuCV1ETfYRs5BXhcdxJ8zO7df552dus y9bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QrWc9pqq; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h17-20020a05640250d100b00446c0ce86ddsi6989edb.424.2022.08.25.10.16.43; Thu, 25 Aug 2022 10:16:44 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QrWc9pqq; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A4E868B93E; Thu, 25 Aug 2022 20:16:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f41.google.com (mail-vs1-f41.google.com [209.85.217.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BAAC6880B3 for ; Thu, 25 Aug 2022 20:16:33 +0300 (EEST) Received: by mail-vs1-f41.google.com with SMTP id p6so21179722vsr.9 for ; Thu, 25 Aug 2022 10:16:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=2U3SJb9KGZSVEN/sClyFjiRuBGuEKu/x1EUC56cAP5s=; b=QrWc9pqqVm1bvNxZr8KdhXCrakuLNqpExWV36ZhLlcAKCqaA+Zy3xrGzkJvhVc9sM6 EgCQuJU6WkTkTQ9ykLL/iACjAAhTBPKYZmIWdaF//a/jABDxr2kiCX0G2pH2/5xKbgo+ RH5SjIi3qN8qgRH9UpI3Bex0daxBBcMBqzNxDBgpsIs1d6YDaJDQ31y0BFmU7if89Gka xIWDn23bFNqrghZzniEJhhan36kvC9k3xk+0hObJ9AJG20OE1Q0qJ3g2WrKFxnMoBvkd tJtrU2JYSWtHzWfkLv5gu9DzUXp/W9JvP5JB+zgikb33gFX268DOVcOd0m05vyw6h17L o0cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=2U3SJb9KGZSVEN/sClyFjiRuBGuEKu/x1EUC56cAP5s=; b=Q7ogNfbrDktR2TnRMcSkd+3p5FhUI0HpgcuG9ekGZb9K/RxfazGcg9tBJFFYXBeBKa eBCyBvcPXFJwvmQibxoFrt81vDyNV173uG8dmQnTwI7CKgEElMQSxsHM8D6jALNJmQnQ 9PjOFdeSJ/LeoQuED6P+LF8wt0UJwW6kvCrE0gBbr6yMESgE2Emw0aXDtmN8ZvcVkV8f seZ6oLguOex0AXkaywPm5mMK1iKizHs4N6oOg2XwA2VMhAwb2eCvvg/um1dURAbDFyN/ JTPn/KBxRy+nq6nHtEHFjwno2yU3xIGGEtN4qDAZqPc4udpBzXYNGQ+VWqamwOkF/1rW WygA== X-Gm-Message-State: ACgBeo2OVRv2SHVjTkmHIBLQ7H+iIOsR1YylSzTE/WypwQXAYPIlg65f wLk3fqvUjEP54nqte/x0gdA3j3p2rNI= X-Received: by 2002:a67:dc0f:0:b0:388:cdb5:db17 with SMTP id x15-20020a67dc0f000000b00388cdb5db17mr2145119vsj.87.1661447792038; Thu, 25 Aug 2022 10:16:32 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id c2-20020a056102318200b00388859a325asm14044826vsh.30.2022.08.25.10.16.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Aug 2022 10:16:31 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Aug 2022 14:16:18 -0300 Message-Id: <20220825171618.1264-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libaomenc: add init cleanup flag X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: kTGBEeJhKwKf Signed-off-by: James Almer --- There doesn't seem to be any proper API to check if an encoder is open. libavcodec/libaomenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 485f554165..fb9a6ff8b2 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -400,7 +400,7 @@ static av_cold int aom_free(AVCodecContext *avctx) #if defined(AOM_CTRL_AV1E_GET_NUM_OPERATING_POINTS) && \ defined(AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX) && \ defined(AOM_CTRL_AV1E_GET_TARGET_SEQ_LEVEL_IDX) - if (!(avctx->flags & AV_CODEC_FLAG_PASS1)) { + if (ctx->encoder->iface && !(avctx->flags & AV_CODEC_FLAG_PASS1)) { int num_operating_points; int levels[32]; int target_levels[32]; @@ -1544,6 +1544,7 @@ FFCodec ff_libaom_av1_encoder = { FF_CODEC_ENCODE_CB(aom_encode), .close = aom_free, .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS, .defaults = defaults, .init_static_data = av1_init_static,