From patchwork Sun Aug 29 16:43:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 29848 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3250327iov; Sun, 29 Aug 2021 09:43:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGx8OVlaGx9Bm/i28C433TpdB+YnIPN8Wd2prfGn2DdktXi1bLQIBDnL9nqPIuSp03mI6E X-Received: by 2002:a05:6402:5107:: with SMTP id m7mr19964134edd.63.1630255419903; Sun, 29 Aug 2021 09:43:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630255419; cv=none; d=google.com; s=arc-20160816; b=LXrlaSJD28a2xUD6WV2sd4M/mUYws8iq7FjCnF7NZzXiPARIOP4DeobK2eGg1fOOAE 1Gaa/xIvGktIlWU3W3VPsskA0pH7UsmLWecNk4Lo6XET64nGROOJG/RWreboruLaxTXj T9OAmv1N+cRS9V0DPATVguMGSCiJa+TJ6ANPW2CzcF5ui4J4Quc6Gdt/66aexqdFdv6y zHKcYVyCHGCn5dlwbxShk1fEaa1o/V1CSwoCwK5q7JFQ0Z7V8wGRoEIa2aKA55mNEwZw pzYfR/igqEqAxeERc1HoMbXjVqLdhtf55V0Jxlks60ar6vGx2kLekaPoY2si0lN7wpg0 zfpw== 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=aMgCXFYt0XEWh6ohNEMriW6SZtdHRWA/94c+jXgnOaU=; b=qK+pUxYhyx5YPuhMoZ4KBK8J0ctbiUdGjngsL7aseNh6fzB4dIzpiuTO8QLs41HCw5 jg77wBI+kvxEYfdZdrlkXEd3TMBZY5c87bCqW+EnDG9UCsiAiop2UCRPDQyp+/fm+8U3 +3Pj5GEgrPJyT20OH5pzOpb7xGXAm4zRSIMq7CRUMpZaa0r3OxWjQOQqc8QxJP7HA1qy lzlhHYQfu3IjMLgSOIIhNWfM30pnOHFyq9WvAEwFdn5D2j8HxcT4BQd26P3TdE2Sayfa DryfZ+1cHV7RXZxNtONZaHCM2eitVKLXp1+4Zw+JRnJMDMj/tlpOgusJnhFPlq1X9fZw tvsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Op0mh+6M; 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 ar22si10494594ejc.536.2021.08.29.09.43.39; Sun, 29 Aug 2021 09:43:39 -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=20161025 header.b=Op0mh+6M; 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 67E9A68A0BB; Sun, 29 Aug 2021 19:43:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8FC1680394 for ; Sun, 29 Aug 2021 19:43:29 +0300 (EEST) Received: by mail-lf1-f45.google.com with SMTP id c8so13539101lfi.3 for ; Sun, 29 Aug 2021 09:43:29 -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=gfsHsrH0J/k8Qyb7JQmfuH14siFNJ52EFWn/q4FURcw=; b=Op0mh+6MhmmxOXJr7Iwux9KYeBjGOKG96MUXpfzU7Esl/fpPiQoDvyONmut4HKa/qd gZcJdX1+N1lcYkJTIBOiErUhm3pDNXD/DNO4nS5+Lsn1Ub5lxjGhQ1GaA5K+TGFO2CYY Rdyvi2yBKfuAbrZ2Nip8/EpmGb08/VjERrlBoPdjg7ef2Hv2ptrkrVcTmKdGDORgZ6ol gK1KRF1PHfiY3jfsvJYr1hHGlVa2uuFm97KUcjjZx3q/FoSnZVmjC+HtOT+hwq/gzOJ4 OGTqaCXuLaekZaQ95NqaWc/W1qPcOpUMlvPrB9ICuLwNZiGm6/wcNwd1g+eWxRRtNCoC fRyw== 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=gfsHsrH0J/k8Qyb7JQmfuH14siFNJ52EFWn/q4FURcw=; b=WpUXfqH7pgmal2MWcFywDyrjRGlfv7B0bxLEZyELU0BgpzIqalSK+np7vSwtt30bTo 6dTQYEPzaofu+h4CUEpWkBpjlASJGgRVa8WjcuK1DX9yzfrmTMbdABc+5NCXkco/weqe 8i8ODwIVYWTMMC6lzAQQSyN22CIEqdxPbdqDJNPL4lO8lkUflmgsOJ1jZQ/k2DgtwBrp W+BTbEBzD7Irvy7MEBZ0OfhEw7Lj+DfXbFPfC/MZgIkGETvN1Xph6OGKqH8TEC12Mp7J jWwBU1woar81GI+TbKLUOQ46XoRzAyYeKDuXq1fWpZjUjWyWhw1D1X/rMp1L2srdgF9g t0bw== X-Gm-Message-State: AOAM532mWpYuz0fdx6mJaNQcVmSwOtAWqIIfsiXcJzqaiB3sAyXWQvfR QNm+tUFHPwMa8G+thRvmWR0CfjFQUjs= X-Received: by 2002:a19:5059:: with SMTP id z25mr14337658lfj.437.1630255409081; Sun, 29 Aug 2021 09:43:29 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id b12sm1170863lfb.42.2021.08.29.09.43.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Aug 2021 09:43:28 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Aug 2021 19:43:22 +0300 Message-Id: <20210829164323.62565-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/libx265: only call av_pix_fmt_desc_get once in init 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: rg3bXDEiPnvR Now both current usages utilize an already found descriptor. --- libavcodec/libx265.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index b5c94b64a3..71affbf61b 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -124,9 +124,10 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) { libx265Context *ctx = avctx->priv_data; AVCPBProperties *cpb_props = NULL; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); int ret; - ctx->api = x265_api_get(av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth); + ctx->api = x265_api_get(desc->comp[0].depth); if (!ctx->api) ctx->api = x265_api_get(0); @@ -186,7 +187,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) avctx->color_range == AVCOL_RANGE_JPEG; else ctx->params->vui.bEnableVideoFullRangeFlag = - (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & AV_PIX_FMT_FLAG_RGB) || + (desc->flags & AV_PIX_FMT_FLAG_RGB) || avctx->pix_fmt == AV_PIX_FMT_YUVJ420P || avctx->pix_fmt == AV_PIX_FMT_YUVJ422P || avctx->pix_fmt == AV_PIX_FMT_YUVJ444P;