From patchwork Sat Nov 13 21:09:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 31403 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp3679475iob; Sat, 13 Nov 2021 13:11:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJypJf2O98s1LhXY5N3R/7tvunnNbkKUMZ0tEz72jFpxXTwq8jn1H/ys7WyfnAUHKnQklsvf X-Received: by 2002:a05:6402:5156:: with SMTP id n22mr17007466edd.222.1636837899498; Sat, 13 Nov 2021 13:11:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636837899; cv=none; d=google.com; s=arc-20160816; b=o+s3pWcMra0SPGHR5ga7bdVuvjcZvI2nqq+Xp57uV21qM/SVz3xPTnOvDUGe87Jr/s 38qLqR0ClE7u/hTmVr+4qAiKJ7Lq70ZsDuqJZrTImkqlvclF/0fcNa0dKtCbz/jAkFR6 vzxLtzs6RmFJM6lABP92hNv/9Ll0fafn7QarxnJOJdmU8VVmIOI4LLp9tDAxF8ivlsS+ pGuFdyJx0a8aXzgKkaZTMMzrPPljdrQFgC7ILx42nJvSGiHUMC3WpP/tBjGIPq5HLyI1 qDXNzAy48n3/3A5GkB/rNd2HYAFxFvaQAe03S0cJTgCw9pG+UigMqYyWVBB1k0HfiGoP hapg== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=TeUeZVZsZsX7Cj4EKyWJOSu0We5VvU6yxINJhvffV38=; b=QzMWfg6WEmX9xM4RK+R0iKj6cJ0aRRUQ21tBwhfk48CmOZei0BkicOWUYdMKiFR/NM /iJJUDWMYPN1xWmFhurc6kSFiFzmJTTBnblAqYpx65XITg7HmMLVaH6UWv4WfW7ajFYT YPMdbjhbvJxbwbgBkzgtHlaQ3Mvt8162CgEm+L13d9jr1q8LRxdYk69R7itNU8BcOGps vqxhCqHwR7yVyaHzOTRFmu9KO2z8mdc/s/ELJ8cCVd4owLZCv9bnomQPOs+Xte8lU27F 65+FvvyuFiKDqYT/wVgr8b7fZt9pqf1S1GzqObKRs0q6YWp/UiyY4uViuBmDAW2zL8SK RmvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=VR79kMZa; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id js5si24232119ejc.656.2021.11.13.13.11.39; Sat, 13 Nov 2021 13:11:39 -0800 (PST) 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=@rcombs.me header.s=google header.b=VR79kMZa; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F0C468AE9E; Sat, 13 Nov 2021 23:09:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1E5568AE5B for ; Sat, 13 Nov 2021 23:09:29 +0200 (EET) Received: by mail-il1-f169.google.com with SMTP id k1so12430975ilo.7 for ; Sat, 13 Nov 2021 13:09:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=If/cn0iWWMo1oSL3h2KdtZ1kjrMcwTtM+rnB+I+Ngxw=; b=VR79kMZathmAR4yfwESFWm4F5J+0RMHzJBJJgK+dj3zHOXbpCONBYhNcupaBmCHjX7 Ag4vzmEaYDfDrzj4I0QeQhKHir67UnnS9BB1dl9XpFzDrBY8OdeQooBwW2b7VzF5TgTZ TItGLTIoKl1gwJvNnAYYLAfhi0Qkr82J8IV0pKMfTJhOvQ0JMScuiCpxfWLacbloovUU Zrgqy+7jdE7uozkVx52IxOR17Ts1i/VLf6QrX4vmw6LyLRD6XC4VzP0/iGXAXZqE3w6a 1HNmRuhrlZigjiQ9eDJdaLe3BU9rFMY8aRsMa+ydyyFINcx4t2ht637R3wuXXrXgrGgY xlVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=If/cn0iWWMo1oSL3h2KdtZ1kjrMcwTtM+rnB+I+Ngxw=; b=s0gGjan8S97PVniSCSVM4g9GOlMyKp8kt3/4mzspO6FgYbyW06vu/KnolPOJQCkUIP RU3qlNi1xTQubD5rDUbh9drbRwFSVadg2UyyRq4GVPGGF0SBPEa5KqTF76iHNy4cVgi9 3rYKzdp1anAwe1PZRty6TE1jXmqyxHDQ+HAK6iyfwpYimDQPWSRYafHvNiKxlx22+3Hr niN2+DvPPJDUe1QbSiQ+SaLvhYLnWfA0iSsgnH7UXWqfRep7pl2FyrJVmo+8gTg+nKR0 F9c3VdyCiUUgQqTSE9QyodIvTsXzgdZ6BXLe8PxXA8XVbPmxm/v/sQkYKnwU2mm2nbkQ epSg== X-Gm-Message-State: AOAM5329NdilML275iPCtR9bDgJ4hbs60FtprOJndUiK7HVso4oNuvqB KiqW7hqYAKilJo7WY2mX0fetJo49jXONnwA= X-Received: by 2002:a05:6e02:218b:: with SMTP id j11mr14428811ila.264.1636837768213; Sat, 13 Nov 2021 13:09:28 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:516:f322:7db9:ae0a]) by smtp.gmail.com with ESMTPSA id j23sm5243896iog.53.2021.11.13.13.09.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Nov 2021 13:09:27 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Nov 2021 15:09:10 -0600 Message-Id: <20211113210916.49167-9-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211113210916.49167-1-rcombs@rcombs.me> References: <20211113210916.49167-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/15] lavc/hevcdec: support all color formats in videotoolbox hwaccel 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: TW5ixqfgCriQ --- libavcodec/hevcdec.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 246ffd7d80..f47e360935 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -401,6 +401,10 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) CONFIG_HEVC_VDPAU_HWACCEL) enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; +#if CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL + *fmt++ = AV_PIX_FMT_VIDEOTOOLBOX; +#endif + switch (sps->pix_fmt) { case AV_PIX_FMT_YUV420P: case AV_PIX_FMT_YUVJ420P: @@ -419,9 +423,6 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) #endif #if CONFIG_HEVC_NVDEC_HWACCEL *fmt++ = AV_PIX_FMT_CUDA; -#endif -#if CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL - *fmt++ = AV_PIX_FMT_VIDEOTOOLBOX; #endif break; case AV_PIX_FMT_YUV420P10: @@ -435,9 +436,6 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) #if CONFIG_HEVC_VAAPI_HWACCEL *fmt++ = AV_PIX_FMT_VAAPI; #endif -#if CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL - *fmt++ = AV_PIX_FMT_VIDEOTOOLBOX; -#endif #if CONFIG_HEVC_VDPAU_HWACCEL *fmt++ = AV_PIX_FMT_VDPAU; #endif