From patchwork Mon May 18 13:56:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 19741 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 C276444353A for ; Mon, 18 May 2020 16:57:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9DD1C68980D; Mon, 18 May 2020 16:57:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43A80687F2C for ; Mon, 18 May 2020 16:57:15 +0300 (EEST) Received: by mail-qk1-f194.google.com with SMTP id r187so7217668qkf.6 for ; Mon, 18 May 2020 06:57:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=/AWmjpMpx6HvQp/g2ZAWE/tHNthGlG1pfx8WvQzMMF8=; b=fETGr40bM/O6A1RL40pVAdjlkRJP+t9ij7weNuxPLhTzSzWoOHZHqiBdDHBiaxJBng YgTqQTCd5fnWM2l3Yd2HXp3VLW1bv4vnEFx2ALje2wRcK4slFf+HSIsi7wlUI+wwufFK AqMMtCNBOdwNrbDtnjpmDzkts4smojZ8+wqJcGu4et4OM+wo2hSEo23TnPk97Z9p1l+z BcEPr4ZdR+6TqAztQg/ttsUc3pwlJzIgU0bx+spjw93kUlkQxHUFKto7eYQDEH0JhiYC 03wIb8sENd4S/eKeMMEuzrwiHYplq96rgEoMJbHk9MWXUp4DXrG62iV1uvZlAb7hCXuy mAzg== 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:mime-version :content-transfer-encoding; bh=/AWmjpMpx6HvQp/g2ZAWE/tHNthGlG1pfx8WvQzMMF8=; b=ZERoV93lwd6ge71bOBmPxwpIOZvVW7UMVB0OhHdCOR1O/CFLW4jS2DIRiNzLqGREh6 7zlIQ433Drwn9kstSdV0/AfuuuhKRiPWhHsxqW6I1JboyWIhRR8I13nRmF2dhfCjMwsH G8l+XCHn9xR/YH4VedtpHlP66V+jfTfDbGUqKJT1nlo/2xeMTxJvFPKJMSZdU3ew5lHn TJ+JAmpq5MV41OjBiaxUg7q6Jjlk7wkTO+CLm2NVUkAEnueouR6ipD5pxCC8350e3FuD LHCmHe+oY3lc3KA9X7kUVwG6YgEkmVsrN9eqlZ/vy6hZWQ21AZK7+FnlufEvoLd30i4n NSQA== X-Gm-Message-State: AOAM530aJtO+ACDjnf7GD4TCHZ5g9vl7KcsP5MpgGcRR547q2ItQCu1p CFCgYMmUmvBYBlctdbngQYR/8E+r X-Google-Smtp-Source: ABdhPJwdIwTX511ijhCUvbXFDXOGpXwcmNkGKz1KS/7khQ7sx781vB5Qg9tb7o++tYT3+YCk2WgGLw== X-Received: by 2002:a37:aa93:: with SMTP id t141mr15123742qke.65.1589810232648; Mon, 18 May 2020 06:57:12 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.22]) by smtp.gmail.com with ESMTPSA id 88sm9491304qth.9.2020.05.18.06.57.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2020 06:57:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 10:56:36 -0300 Message-Id: <20200518135636.1424-1-jamrial@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/frame_thread_encoder: check for frame threading codec cap instead of intra only 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" It's the correct dedicated capability reported by supported encoders. Otherwise, the frame thread path will be used for unsupported encoders like r210 for no gain. Signed-off-by: James Almer --- libavcodec/frame_thread_encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 949bc69f81..bb4b5d7341 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -120,7 +120,7 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){ if( !(avctx->thread_type & FF_THREAD_FRAME) - || !(avctx->codec->capabilities & AV_CODEC_CAP_INTRA_ONLY)) + || !(avctx->codec->capabilities & AV_CODEC_CAP_FRAME_THREADS)) return 0; if( !avctx->thread_count